| -rw-r--r-- | noncore/net/opieirc/ircconnection.cpp | 2 | ||||
| -rw-r--r-- | noncore/net/opieirc/ircmessageparser.cpp | 2 | ||||
| -rw-r--r-- | noncore/net/opieirc/ircservereditor.cpp | 4 | ||||
| -rw-r--r-- | noncore/net/opieirc/ircservertab.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/noncore/net/opieirc/ircconnection.cpp b/noncore/net/opieirc/ircconnection.cpp index 5eb0cf2..2325cca 100644 --- a/noncore/net/opieirc/ircconnection.cpp +++ b/noncore/net/opieirc/ircconnection.cpp @@ -65,5 +65,5 @@ void IRCConnection::dataReady() { for (QStringList::Iterator it = channels.begin(); it != channels.end(); ++it) { QString channelName = (*it).stripWhiteSpace(); - if (channelName.startsWith("#")) { + if (channelName.startsWith("#") || channelName.startsWith("+")) { sendLine("JOIN "+ channelName); } diff --git a/noncore/net/opieirc/ircmessageparser.cpp b/noncore/net/opieirc/ircmessageparser.cpp index 2b77414..a95c64e 100644 --- a/noncore/net/opieirc/ircmessageparser.cpp +++ b/noncore/net/opieirc/ircmessageparser.cpp @@ -184,5 +184,5 @@ void IRCMessageParser::parseLiteralPrivMsg(IRCMessage *message) { output.addParam(person); emit outputReady(output); - } else if (message->param(0).at(0) == '#') { + } else if (message->param(0).at(0) == '#' || message->param(0).at(0) == '+') { /* IRC Channel message detected, verify sender, channel and display it */ IRCChannel *channel = m_session->getChannel(message->param(0).lower()); diff --git a/noncore/net/opieirc/ircservereditor.cpp b/noncore/net/opieirc/ircservereditor.cpp index 5e916ae..f976c84 100644 --- a/noncore/net/opieirc/ircservereditor.cpp +++ b/noncore/net/opieirc/ircservereditor.cpp @@ -55,6 +55,6 @@ void IRCServerEditor::accept() { for (QStringList::Iterator it = channels.begin(); it != channels.end(); ++it) { QString channelName = (*it).stripWhiteSpace(); - if (!channelName.startsWith("#")) { - QMessageBox::critical(this, tr("Error"), tr("The channel list needs to contain a\ncomma separated list of channel\n names which start with '#'")); + if (!channelName.startsWith("#") && !channelName.startsWith("+")) { + QMessageBox::critical(this, tr("Error"), tr("The channel list needs to contain a\ncomma separated list of channel\n names which start with either '#' or '+'")); return; } diff --git a/noncore/net/opieirc/ircservertab.cpp b/noncore/net/opieirc/ircservertab.cpp index aea58a3..d16c05f 100644 --- a/noncore/net/opieirc/ircservertab.cpp +++ b/noncore/net/opieirc/ircservertab.cpp @@ -69,5 +69,5 @@ void IRCServerTab::executeCommand(IRCTab *tab, QString line) { QString channel; stream >> channel; - if (channel.length() > 0 && channel.startsWith("#")) { + if (channel.length() > 0 && (channel.startsWith("#") || channel.startsWith("+"))) { m_session->join(channel); } else { |