merge of '76e1e69496801009ea0aa69c84f76e858978ab99'

     and 'db976a98427dd6a195e2cf167e225de2d0206aea'

1 files changed, 23 insertions, 0 deletions

diff --git a/packages/opie-irc/files/utf8.patch b/packages/opie-irc/files/utf8.patch
new file mode 100644
index 0000000000..cc562838a2
--- /dev/null
+++ b/packages/opie-irc/files/utf8.patch
@@ -0,0 +1,23 @@
+diff --git a/ircconnection.cpp b/ircconnection.cpp
+index 88e63f7..fb7e168 100644
+--- a/ircconnection.cpp
++++ b/ircconnection.cpp
+@@ -29,7 +29,8 @@ 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) {
+@@ -77,7 +78,7 @@ void IRCConnection::login() {
+ /* 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());