merge of '76e1e69496801009ea0aa69c84f76e858978ab99'

     and 'db976a98427dd6a195e2cf167e225de2d0206aea'

1 files changed, 18 insertions, 0 deletions

diff --git a/packages/opie-irc/files/utf8-topic.patch b/packages/opie-irc/files/utf8-topic.patch
new file mode 100644
index 0000000000..d8d9a52ca9
--- /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);
+     }