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
@@ -26,13 +26,14 @@ void IRCConnection::doConnect() {
/* Send commands to the IRC server */
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) {
sendLine("NOTICE " + nickname + " :\001" + type + " " + args + "\001");
}
@@ -74,13 +75,13 @@ void IRCConnection::login() {
sendLine(loginString);
}
/* 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());
for (QStringList::Iterator it = channels.begin(); it != channels.end(); ++it) {
QString channelName = (*it).stripWhiteSpace();
if (channelName.startsWith("#") || channelName.startsWith("+")) {
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
@@ -664,17 +664,17 @@ void IRCMessageParser::parseNumericalNoSuchNick(IRCMessage *) {
emit outputReady(IRCOutput(OUTPUT_ERROR, tr("No such nickname")));
}
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);
}
}
void IRCMessageParser::parseNumericalTopicWhoTime(IRCMessage *) {