X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=ded76eff0c7d302cf69cebfa4df9c310c86c08cc;hp=efdad6e4084a859c865282d1210ca141d61a5aa8;hb=5c35ac3ee6f951d39cc052925aa224debfa148a8;hpb=c0c8cea57282c56951562e427bc1acb3ee2028a3

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index efdad6e4..ded76eff 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -71,7 +71,6 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
   p->attachSignal(this, SIGNAL(networkCreated(NetworkId)));
   p->attachSignal(this, SIGNAL(networkRemoved(NetworkId)));
   p->attachSlot(SIGNAL(createNetwork(const NetworkInfo &)), this, SLOT(createNetwork(const NetworkInfo &)));
-  p->attachSlot(SIGNAL(updateNetwork(const NetworkInfo &)), this, SLOT(updateNetwork(const NetworkInfo &)));
   p->attachSlot(SIGNAL(removeNetwork(NetworkId)), this, SLOT(removeNetwork(NetworkId)));
 
   loadSettings();
@@ -244,14 +243,10 @@ void CoreSession::addClient(QObject *dev) { // this is QObject* so we can use it
 }
 
 void CoreSession::removeClient(QIODevice *iodev) {
-  // no checks for validity check - privateslot...
   QTcpSocket *socket = qobject_cast<QTcpSocket *>(iodev);
   if(socket)
     quInfo() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("disconnected (UserId: %1).").arg(user().toInt()));
-  else
-    quInfo() << "Local client disconnedted.";
-  disconnect(socket, 0, this, 0);
-  socket->deleteLater();
+  iodev->deleteLater();
 }
 
 SignalProxy *CoreSession::signalProxy() const {
@@ -432,20 +427,10 @@ void CoreSession::createNetwork(const NetworkInfo &info_) {
     emit networkCreated(id);
   } else {
     quWarning() << qPrintable(tr("CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!"));
-    updateNetwork(info);
+    _networks[info.networkId]->requestSetNetworkInfo(info);
   }
 }
 
-// FIXME: move to CoreNetwork
-void CoreSession::updateNetwork(const NetworkInfo &info) {
-  if(!_networks.contains(info.networkId)) {
-    quWarning() << "Update request for unknown network received!";
-    return;
-  }
-  _networks[info.networkId]->setNetworkInfo(info);
-  Core::updateNetwork(user(), info);
-}
-
 void CoreSession::removeNetwork(NetworkId id) {
   // Make sure the network is disconnected!
   NetworkConnection *conn = _connections.value(id, 0);