summaryrefslogtreecommitdiff
authorerik <erik>2007-07-09 22:06:00 (UTC)
committer erik <erik>2007-07-09 22:06:00 (UTC)
commita91bbaee9eb419dc985d9f5c3689831c8aa75c1e (patch) (side-by-side diff)
treeba0da224a93f7af1a80a4bef3186edff8dc9483f
parent1ec355e1cc016edd2e322ff7d57469feaa46474b (diff)
downloadopie-a91bbaee9eb419dc985d9f5c3689831c8aa75c1e.zip
opie-a91bbaee9eb419dc985d9f5c3689831c8aa75c1e.tar.gz
opie-a91bbaee9eb419dc985d9f5c3689831c8aa75c1e.tar.bz2
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.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/opieirc/ircconnection.cpp5
-rw-r--r--noncore/net/opieirc/ircmessageparser.cpp4
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
@@ -31,3 +31,4 @@ void IRCConnection::sendLine(QString line) {
line.append("\r\n");
- m_socket->writeBlock(line, line.length());
+ QCString uline = line.utf8();
+ m_socket->writeBlock(uline, uline.length());
}
@@ -79,3 +80,3 @@ 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) {
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
@@ -669,3 +669,3 @@ void IRCMessageParser::parseNumericalTopic(IRCMessage *message) {
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);
@@ -673,3 +673,3 @@ void IRCMessageParser::parseNumericalTopic(IRCMessage *message) {
} 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);