opie-irc: more fixes for utf-8

diff --git a/packages/opie-irc/files/utf8-topic.patch b/packages/opie-irc/files/utf8-topic.patch
new file mode 100644 (file)
index 0000000..d8d9a52
--- /dev/null
+++ b/packages/opie-irc/files/utf8-topic.patch
@@ -0,0 +1,18 @@
+diff --git a/ircmessageparser.cpp b/ircmessageparser.cpp
+index c449a65..ae47f69 100644
+--- a/ircmessageparser.cpp
++++ b/ircmessageparser.cpp
+@@ -667,11 +667,11 @@ void IRCMessageParser::parseNumericalNoSuchNick(IRCMessage *) {
+ 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);
+     }

diff --git a/packages/opie-irc/opie-irc_cvs.bb b/packages/opie-irc/opie-irc_cvs.bb
index f7704f5..63e7017 100644 (file)
--- a/packages/opie-irc/opie-irc_cvs.bb
+++ b/packages/opie-irc/opie-irc_cvs.bb
@@ -1,10 +1,11 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opieirc \
            ${HANDHELDS_CVS};module=opie/help \
            ${HANDHELDS_CVS};module=opie/apps \
           ${HANDHELDS_CVS};module=opie/pics \
-          file://utf8.patch;patch=1 "
+          file://utf8.patch;patch=1 \
+          file://utf8-topic.patch;patch=1 "