Fix for opie bug 1719. This should make opie-irc play nicer with utf-8.

Patches were culled from OE. Thanks to whoever the original patch author
was.

2 files changed, 5 insertions, 4 deletions

diff --git a/noncore/net/opieirc/ircconnection.cpp b/noncore/net/opieirc/ircconnection.cpp
index 88e63f7..fb7e168 100644
--- a/noncore/net/opieirc/ircconnection.cpp
+++ b/noncore/net/opieirc/ircconnection.cpp
@@ -20,25 +20,26 @@ IRCConnection::IRCConnection(IRCServer *server) {
 
 /* Connect to the IRC server */
 void IRCConnection::doConnect() {
     ASSERT(!m_connected);
     m_socket->connectToHost(m_server->hostname(), m_server->port());
 }
 
 /* Send commands to the IRC server */
 void IRCConnection::sendLine(QString line) {
     while((line.right(1) == "\n") || (line.right(1) == "\r"))
         line = line.left(line.length() - 1);
     line.append("\r\n");
-    m_socket->writeBlock(line, line.length());
+    QCString uline = line.utf8();
+    m_socket->writeBlock(uline, uline.length());
 }
 
 void IRCConnection::sendCTCPReply(const QString &nickname, const QString &type, const QString &args) {
     sendLine("NOTICE " + nickname + " :\001" + type + " " + args + "\001"); 
 }
 
 void IRCConnection::sendCTCPRequest(const QString &nickname, const QString &type, const QString &args) {
     sendLine("PRIVMSG " + nickname + " :\001" + type + " " + args + "\001"); 
 }
 
 void IRCConnection::sendCTCPPing(const QString &nickname) {
     QDateTime tm;
@@ -68,25 +69,25 @@ void IRCConnection::login() {
     if (m_server->password().length()>0) {
         loginString += "PASS " + m_server->password() + "\r\n";
     }
     loginString += "NICK " + m_server->nick() + "\r\n" +
                    "USER " + m_server->username() + " " + hostname +
                    " " + m_server->hostname() + " :" + m_server->realname() + "\r\n";
     sendLine(loginString);
 }
 
 /* Called when data arrives on the socket */
 void IRCConnection::dataReady() {
     while(m_socket->canReadLine()) {
-        IRCMessage message(m_socket->readLine());
+        IRCMessage message(QString::fromUtf8(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("#") || 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 c449a65..ae47f69 100644
--- a/noncore/net/opieirc/ircmessageparser.cpp
+++ b/noncore/net/opieirc/ircmessageparser.cpp
@@ -658,26 +658,26 @@ void IRCMessageParser::parseNumericalNicknameInUse(IRCMessage *) {
     
     emit outputReady(IRCOutput(OUTPUT_ERROR, tr("Nickname is in use, please reconnect with a different nickname")));
     m_session->endSession();
 }
 
 void IRCMessageParser::parseNumericalNoSuchNick(IRCMessage *) {
     emit outputReady(IRCOutput(OUTPUT_ERROR, tr("No such nickname")));
 }
 
 void IRCMessageParser::parseNumericalTopic(IRCMessage *message) {
     IRCChannel *channel = m_session->getChannel(message->param(1).lower());
     if (channel) {
-        IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel " + channel->channelname() + " is \"" + message->param(2) + "\""));
+        IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel ") + channel->channelname() + tr(" is \"") + message->param(2) + "\"");
         output.addParam(channel);
         emit outputReady(output);
     } else {
-        IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel " + message->param(1) + " is \"" + message->param(2) + "\""));
+        IRCOutput output(OUTPUT_TOPIC, tr("Topic for channel ") + message->param(1) + tr(" is \"") + message->param(2) + "\"");
         output.addParam(0);
         emit outputReady(output);
     }
 }
 
 void IRCMessageParser::parseNumericalTopicWhoTime(IRCMessage *) {
 }