X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fircuser.cpp;h=32ff7944e0f9c0d56b7c8c8b7a7296d0242d0558;hp=64f1bcd2d21d0b27b0158328055286cbd8233700;hb=e56629542168c203cac8504085fc96c7f7b73d90;hpb=9d54503555534a2c554f09a33df6afa33d6308ec

diff --git a/src/common/ircuser.cpp b/src/common/ircuser.cpp
index 64f1bcd2..32ff7944 100644
--- a/src/common/ircuser.cpp
+++ b/src/common/ircuser.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -87,7 +87,7 @@ QStringList IrcUser::channels() const
 
 void IrcUser::setCodecForEncoding(const QString &name)
 {
-    setCodecForEncoding(QTextCodec::codecForName(name.toAscii()));
+    setCodecForEncoding(QTextCodec::codecForName(name.toLatin1()));
 }
 
 
@@ -99,7 +99,7 @@ void IrcUser::setCodecForEncoding(QTextCodec *codec)
 
 void IrcUser::setCodecForDecoding(const QString &name)
 {
-    setCodecForDecoding(QTextCodec::codecForName(name.toAscii()));
+    setCodecForDecoding(QTextCodec::codecForName(name.toLatin1()));
 }
 
 
@@ -275,12 +275,13 @@ void IrcUser::updateHostmask(const QString &mask)
 }
 
 
-void IrcUser::joinChannel(IrcChannel *channel)
+void IrcUser::joinChannel(IrcChannel *channel, bool skip_channel_join)
 {
     Q_ASSERT(channel);
     if (!_channels.contains(channel)) {
         _channels.insert(channel);
-        channel->joinIrcUser(this);
+        if (!skip_channel_join)
+            channel->joinIrcUser(this);
     }
 }