summaryrefslogtreecommitdiff
authorwazlaf <wazlaf>2002-09-29 21:45:16 (UTC)
committer wazlaf <wazlaf>2002-09-29 21:45:16 (UTC)
commita54430dbebd980109afdf604c7bfc9b0e15c4fdb (patch) (side-by-side diff)
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
@@ -61,13 +61,13 @@ void IRCConnection::dataReady() {
IRCMessage message(m_socket->readLine());
if (!m_loggedIn && message.isNumerical() && message.commandNumber() == 1) {
/* Now autojoin all channels specified inside the server profile */
QStringList channels = QStringList::split(QChar(','), m_server->channels());
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);
}
}
m_loggedIn = TRUE;
emit outputReady(IRCOutput(OUTPUT_CLIENTMESSAGE, tr("Successfully logged in.")));
}
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
@@ -180,13 +180,13 @@ void IRCMessageParser::parseLiteralPrivMsg(IRCMessage *message) {
person = new IRCPerson(message->prefix());
m_session->addPerson(person);
}
IRCOutput output(OUTPUT_QUERYPRIVMSG, message->param(1));
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());
if (channel) {
IRCPerson mask(message->prefix());
IRCChannelPerson *person = channel->getPerson(mask.nick());
if (person) {
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
@@ -51,14 +51,14 @@ void IRCServerEditor::accept() {
QMessageBox::critical(this, tr("Error"), tr("Realname required"));
else {
/* Now verify whether the channel list has a valid format */
QStringList channels = QStringList::split(QChar(','), m_channels->text());
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;
}
}
QDialog::accept();
}
}
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
@@ -65,13 +65,13 @@ void IRCServerTab::executeCommand(IRCTab *tab, QString line) {
stream >> command;
command = command.upper().right(command.length()-1);
if (command == "JOIN") {
QString channel;
stream >> channel;
- if (channel.length() > 0 && channel.startsWith("#")) {
+ if (channel.length() > 0 && (channel.startsWith("#") || channel.startsWith("+"))) {
m_session->join(channel);
} else {
tab->appendText("<font color=\"" + m_errorColor + "\">Unknown channel format!</font><br>");
}
} else if (command == "ME") {
QString text = line.right(line.length()-4);