Mercurial > hg > octave-lyh
changeset 13604:269ef479ecbf
IRC client is now usable again.
| author | Jacob Dawid <jacob.dawid@googlemail.com> |
|---|---|
| date | Mon, 15 Aug 2011 13:57:13 +0200 |
| parents | 3a1ba08ad392 |
| children | ccd17157dabf |
| files | gui/src/IRCWidget.cpp gui/src/MainWindow.cpp gui/src/qirc/IRCClientImpl.cpp |
| diffstat | 3 files changed, 14 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/src/IRCWidget.cpp +++ b/gui/src/IRCWidget.cpp @@ -211,8 +211,6 @@ void IRCWidget::connectToServer () { - showStatusMessage ("<font color=\"#990000\"><b>IMPORTANT: THE BACKEND FOR THE IRC CHAT HAS BEEN REWRITTEN COMPLETELY TO MAKE IT PLATFORM-INDEPENDENT.</b></font>"); - showStatusMessage ("<font color=\"#990000\"><b>IT WILL PROBABLY NOT WORK AS IT SHOULD UNTIL ALL BUGS HAVE BEEN FIXED.</b></font>"); showStatusMessage ("Looking up irc.freenode.net."); QHostInfo hostInfo = QHostInfo::fromName ("irc.freenode.net"); QList<QHostAddress> hostAddresses = hostInfo.addresses();
--- a/gui/src/MainWindow.cpp +++ b/gui/src/MainWindow.cpp @@ -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) {
--- a/gui/src/qirc/IRCClientImpl.cpp +++ b/gui/src/qirc/IRCClientImpl.cpp @@ -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. } } }