fixed a bug in IrcChannel. Upgrade is strongly advised! Distclean as usual.

[quassel.git] / src / common / ircchannel.cpp

diff --git a/src/common/ircchannel.cpp b/src/common/ircchannel.cpp
index 12f70c2..38959aa 100644 (file)
--- a/src/common/ircchannel.cpp
+++ b/src/common/ircchannel.cpp
@@ -40,7 +40,7 @@ IrcChannel::IrcChannel(const QString &channelname, Network *network)
     _topic(QString()),
     network(network)
 {
-  setObjectName(QString::number(network->networkId()) + "/" +  channelname);
+  setObjectName(QString::number(network->networkId().toInt()) + "/" +  channelname);
 }
 
 IrcChannel::~IrcChannel() {
@@ -73,10 +73,6 @@ bool IrcChannel::isValidChannelUserMode(const QString &mode) const {
   return isvalid;
 }
 
-bool IrcChannel::initialized() const {
-  return _initialized;
-}
-
 QString IrcChannel::name() const {
   return _name;
 }
@@ -168,7 +164,10 @@ void IrcChannel::part(IrcUser *ircuser) {
     //qDebug() << "PART" << name() << ircuser->nick() << ircUsers().count();
     // if you wonder why there is no counterpart to ircUserParted:
     // the joines are propagted by the ircuser. the signal ircUserParted is only for convenience
+    disconnect(ircuser, 0, this, 0);
     emit ircUserParted(ircuser);
+    if(network->isMe(ircuser))
+       deleteLater();
   }
 }
 
@@ -243,6 +242,7 @@ void IrcChannel::initSetUserModes(const QVariantMap &usermodes) {
 }
 
 void IrcChannel::ircUserDestroyed() {
+  qDebug() << "IrcChannel::ircUserDestroyed()";
   IrcUser *ircUser = static_cast<IrcUser *>(sender());
   Q_ASSERT(ircUser);
   _userModes.remove(ircUser);
@@ -256,8 +256,3 @@ void IrcChannel::ircUserNickSet(QString nick) {
   emit ircUserNickSet(ircUser, nick);
 }
 
-void IrcChannel::setInitialized() {
-  _initialized = true;
-  emit initDone();
-}
-