[oe-commits] org.oe.dev opie-irc: more fixes for utf-8

[polyonymous commit]

opie-irc: more fixes for utf-8

Author: polyonymous at openembedded.org
Branch: org.openembedded.dev
Revision: b6e5034afa98c96b3b6e37321095037fbd93548c
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b6e5034afa98c96b3b6e37321095037fbd93548c
Files:
1
packages/opie-irc/files/utf8-topic.patch
packages/opie-irc/opie-irc_cvs.bb
Diffs:

#
# mt diff -r95d5e6ffe48405bea2df328dfe8668a6eb76b25c -rb6e5034afa98c96b3b6e37321095037fbd93548c
#
# 
# 
# add_file "packages/opie-irc/files/utf8-topic.patch"
#  content [c456d4d2928784282e0cf198fbdf5fdd58d3bb0e]
# 
# patch "packages/opie-irc/opie-irc_cvs.bb"
#  from [b3c829528d5806ea42d32b81f1d9da91e3f21225]
#    to [cee4fec93573b3ece698d3fd00fb8ebb408da7e8]
# 
============================================================
--- packages/opie-irc/files/utf8-topic.patch	c456d4d2928784282e0cf198fbdf5fdd58d3bb0e
+++ packages/opie-irc/files/utf8-topic.patch	c456d4d2928784282e0cf198fbdf5fdd58d3bb0e
@@ -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);
+     }
============================================================
--- packages/opie-irc/opie-irc_cvs.bb	b3c829528d5806ea42d32b81f1d9da91e3f21225
+++ packages/opie-irc/opie-irc_cvs.bb	cee4fec93573b3ece698d3fd00fb8ebb408da7e8
@@ -1,10 +1,11 @@ PV = "${OPIE_CVS_PV}"
 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-topic.patch;patch=1 "
-	   file://utf8.patch;patch=1 "