# HG changeset patch # User Jacob Dawid # Date 1313409433 -7200 # Node ID 269ef479ecbf49e26580eafc03be012ba5b1ae19 # Parent 3a1ba08ad3923e7c695f7883ed6c50dee11f6ed4 IRC client is now usable again. diff -r 3a1ba08ad392 -r 269ef479ecbf gui/src/IRCWidget.cpp --- a/gui/src/IRCWidget.cpp Mon Aug 15 13:10:38 2011 +0200 +++ b/gui/src/IRCWidget.cpp Mon Aug 15 13:57:13 2011 +0200 @@ -211,8 +211,6 @@ void IRCWidget::connectToServer () { - showStatusMessage ("IMPORTANT: THE BACKEND FOR THE IRC CHAT HAS BEEN REWRITTEN COMPLETELY TO MAKE IT PLATFORM-INDEPENDENT."); - showStatusMessage ("IT WILL PROBABLY NOT WORK AS IT SHOULD UNTIL ALL BUGS HAVE BEEN FIXED."); showStatusMessage ("Looking up irc.freenode.net."); QHostInfo hostInfo = QHostInfo::fromName ("irc.freenode.net"); QList hostAddresses = hostInfo.addresses(); diff -r 3a1ba08ad392 -r 269ef479ecbf gui/src/MainWindow.cpp --- a/gui/src/MainWindow.cpp Mon Aug 15 13:10:38 2011 +0200 +++ b/gui/src/MainWindow.cpp Mon Aug 15 13:57:13 2011 +0200 @@ -28,7 +28,7 @@ #include "SettingsDialog.h" #include "cmd-edit.h" -#define VERSION_STRING "Octave GUI (0.7.6)" +#define VERSION_STRING "Octave GUI (0.8.0)" MainWindow::MainWindow (QWidget * parent):QMainWindow (parent) { diff -r 3a1ba08ad392 -r 269ef479ecbf gui/src/qirc/IRCClientImpl.cpp --- a/gui/src/qirc/IRCClientImpl.cpp Mon Aug 15 13:10:38 2011 +0200 +++ b/gui/src/qirc/IRCClientImpl.cpp Mon Aug 15 13:57:13 2011 +0200 @@ -120,7 +120,11 @@ } if (!buffer.isEmpty ()) - m_parameters.append (buffer); + { + // We need to chop off \r\n here. + buffer.chop (2); + m_parameters.append (buffer); + } } int @@ -388,6 +392,7 @@ case IRCReply::NameReply: QString channel = ircServerMessage.parameter (2); QString nickList = ircServerMessage.parameter (3); + emit debugMessage (nickList); ircChannelProxy (channel)->setNickList (nickList.split (QRegExp ("\\s+"), QString::SkipEmptyParts)); break; } @@ -397,7 +402,7 @@ QString command = ircServerMessage.command (); if (command == IRCCommand::Nick) { - handleNicknameChanged (ircServerMessage.parameter (0), ircServerMessage.parameter (1)); + handleNicknameChanged (ircServerMessage.nick(), ircServerMessage.parameter (0)); } else if (command == IRCCommand::Quit) { @@ -421,24 +426,18 @@ } else if (command == IRCCommand::Topic) { - emit debugMessage ("WRITEME: Received topic."); - //emit topic (ircEvent.getNick ().toStdString ().c_str (), - // ircEvent.getParam (0).toStdString ().c_str (), - // ircEvent.getParam (1).toStdString ().c_str ()); + emit debugMessage + (QString("WRITEME: Received topic: %1") + .arg (ircServerMessage.parameter (0))); } else if (command == IRCCommand::Kick) { - emit debugMessage ("WRITEME: Received kick."); - //emit kick (ircEvent.getNick ().toStdString ().c_str (), - // ircEvent.getParam (0).toStdString ().c_str (), - // ircEvent.getParam (1).toStdString ().c_str (), - // ircEvent.getParam (2).toStdString ().c_str ()); + emit debugMessage ("WRITEME: Received kick command."); } else if (command == IRCCommand::Invite) { - emit debugMessage ("WRITEME: Received invite."); - //emit invite (ircEvent.getNick ().toStdString ().c_str (), - // ircEvent.getParam (1).toStdString ().c_str ()); + emit debugMessage ("WRITEME: Received invite command."); + } else if (command == IRCCommand::PrivateMessage) { @@ -460,7 +459,6 @@ else { emit debugMessage (QString("FIXME: Received unknown reply: %1").arg(command)); - // not recognized. } } }