summaryrefslogtreecommitdiff
authorwazlaf <wazlaf>2002-09-29 21:45:16 (UTC)
committer wazlaf <wazlaf>2002-09-29 21:45:16 (UTC)
commita54430dbebd980109afdf604c7bfc9b0e15c4fdb (patch) (unidiff)
treeb81722f654163301c67e98b4d210b1bcf068c20b
parent75c85d30c3f7de8d2785f70e0f28ef838ea7f419 (diff)
downloadopie-a54430dbebd980109afdf604c7bfc9b0e15c4fdb.zip
opie-a54430dbebd980109afdf604c7bfc9b0e15c4fdb.tar.gz
opie-a54430dbebd980109afdf604c7bfc9b0e15c4fdb.tar.bz2
modeless channel support
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opieirc/ircconnection.cpp2
-rw-r--r--noncore/net/opieirc/ircmessageparser.cpp2
-rw-r--r--noncore/net/opieirc/ircservereditor.cpp4
-rw-r--r--noncore/net/opieirc/ircservertab.cpp2
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
@@ -64,7 +64,7 @@ void IRCConnection::dataReady() {
64 QStringList channels = QStringList::split(QChar(','), m_server->channels()); 64 QStringList channels = QStringList::split(QChar(','), m_server->channels());
65 for (QStringList::Iterator it = channels.begin(); it != channels.end(); ++it) { 65 for (QStringList::Iterator it = channels.begin(); it != channels.end(); ++it) {
66 QString channelName = (*it).stripWhiteSpace(); 66 QString channelName = (*it).stripWhiteSpace();
67 if (channelName.startsWith("#")) { 67 if (channelName.startsWith("#") || channelName.startsWith("+")) {
68 sendLine("JOIN "+ channelName); 68 sendLine("JOIN "+ channelName);
69 } 69 }
70 } 70 }
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
@@ -183,7 +183,7 @@ void IRCMessageParser::parseLiteralPrivMsg(IRCMessage *message) {
183 IRCOutput output(OUTPUT_QUERYPRIVMSG, message->param(1)); 183 IRCOutput output(OUTPUT_QUERYPRIVMSG, message->param(1));
184 output.addParam(person); 184 output.addParam(person);
185 emit outputReady(output); 185 emit outputReady(output);
186 } else if (message->param(0).at(0) == '#') { 186 } else if (message->param(0).at(0) == '#' || message->param(0).at(0) == '+') {
187 /* IRC Channel message detected, verify sender, channel and display it */ 187 /* IRC Channel message detected, verify sender, channel and display it */
188 IRCChannel *channel = m_session->getChannel(message->param(0).lower()); 188 IRCChannel *channel = m_session->getChannel(message->param(0).lower());
189 if (channel) { 189 if (channel) {
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
@@ -54,8 +54,8 @@ void IRCServerEditor::accept() {
54 QStringList channels = QStringList::split(QChar(','), m_channels->text()); 54 QStringList channels = QStringList::split(QChar(','), m_channels->text());
55 for (QStringList::Iterator it = channels.begin(); it != channels.end(); ++it) { 55 for (QStringList::Iterator it = channels.begin(); it != channels.end(); ++it) {
56 QString channelName = (*it).stripWhiteSpace(); 56 QString channelName = (*it).stripWhiteSpace();
57 if (!channelName.startsWith("#")) { 57 if (!channelName.startsWith("#") && !channelName.startsWith("+")) {
58 QMessageBox::critical(this, tr("Error"), tr("The channel list needs to contain a\ncomma separated list of channel\n names which start with '#'")); 58 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 '+'"));
59 return; 59 return;
60 } 60 }
61 } 61 }
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
@@ -68,7 +68,7 @@ void IRCServerTab::executeCommand(IRCTab *tab, QString line) {
68 if (command == "JOIN") { 68 if (command == "JOIN") {
69 QString channel; 69 QString channel;
70 stream >> channel; 70 stream >> channel;
71 if (channel.length() > 0 && channel.startsWith("#")) { 71 if (channel.length() > 0 && (channel.startsWith("#") || channel.startsWith("+"))) {
72 m_session->join(channel); 72 m_session->join(channel);
73 } else { 73 } else {
74 tab->appendText("<font color=\"" + m_errorColor + "\">Unknown channel format!</font><br>"); 74 tab->appendText("<font color=\"" + m_errorColor + "\">Unknown channel format!</font><br>");