X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.cpp;h=17db37d97ea29a457648b29c648aa320345ba88d;hp=8f5680be1a6d21c5599842bbcdc51c0b653f2311;hb=4aca5963302eb2f6dfc41b723df4b362704f1b2b;hpb=6ff5ddb0b82d269df00ceb70e52f65f5fb7f8f60

diff --git a/src/common/network.cpp b/src/common/network.cpp
index 8f5680be..17db37d9 100644
--- a/src/common/network.cpp
+++ b/src/common/network.cpp
@@ -218,7 +218,6 @@ IrcUser *Network::newIrcUser(const QString &hostmask) {
     
     connect(ircuser, SIGNAL(nickSet(QString)), this, SLOT(ircUserNickChanged(QString)));
     connect(ircuser, SIGNAL(initDone()), this, SLOT(ircUserInitDone()));
-    connect(ircuser, SIGNAL(destroyed()), this, SLOT(ircUserDestroyed()));
     _ircUsers[nick] = ircuser;
     emit ircUserAdded(hostmask);
     emit ircUserAdded(ircuser);
@@ -498,17 +497,11 @@ void Network::ircChannelInitDone() {
   emit ircChannelInitDone(ircchannel);
 }
 
-void Network::ircUserDestroyed() {
-  IrcUser *ircuser = static_cast<IrcUser *>(sender());
-  Q_ASSERT(ircuser);
-  removeIrcUser(ircuser);
-}
-
 void Network::channelDestroyed() {
   IrcChannel *channel = static_cast<IrcChannel *>(sender());
   Q_ASSERT(channel);
-  emit ircChannelRemoved(sender());
   _ircChannels.remove(_ircChannels.key(channel));
+  emit ircChannelRemoved(channel);
 }
 
 void Network::requestConnect() const {