X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=a2ffd8e9c90d0260871b7dae8ea1c848b8037044;hb=c2718511214289f58a02207f7988876c420e8c7e;hp=2b667e0cac363fd3b5250f18b30ea79fbfea479a;hpb=c0c8cea57282c56951562e427bc1acb3ee2028a3;p=quassel.git

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 2b667e0c..a2ffd8e9 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -115,7 +115,6 @@ void Client::init() {
   p->attachSlot(SIGNAL(identityRemoved(IdentityId)), this, SLOT(coreIdentityRemoved(IdentityId)));
 
   p->attachSignal(this, SIGNAL(requestCreateNetwork(const NetworkInfo &)), SIGNAL(createNetwork(const NetworkInfo &)));
-  p->attachSignal(this, SIGNAL(requestUpdateNetwork(const NetworkInfo &)), SIGNAL(updateNetwork(const NetworkInfo &)));
   p->attachSignal(this, SIGNAL(requestRemoveNetwork(NetworkId)), SIGNAL(removeNetwork(NetworkId)));
   p->attachSlot(SIGNAL(networkCreated(NetworkId)), this, SLOT(coreNetworkCreated(NetworkId)));
   p->attachSlot(SIGNAL(networkRemoved(NetworkId)), this, SLOT(coreNetworkRemoved(NetworkId)));
@@ -207,14 +206,19 @@ void Client::createNetwork(const NetworkInfo &info) {
   emit instance()->requestCreateNetwork(info);
 }
 
-void Client::updateNetwork(const NetworkInfo &info) {
-  emit instance()->requestUpdateNetwork(info);
-}
-
 void Client::removeNetwork(NetworkId id) {
   emit instance()->requestRemoveNetwork(id);
 }
 
+void Client::updateNetwork(const NetworkInfo &info) {
+  Network *netptr = instance()->_networks.value(info.networkId, 0);
+  if(!netptr) {
+    qWarning() << "Update for unknown network requested:" << info;
+    return;
+  }
+  netptr->requestSetNetworkInfo(info);
+}
+
 void Client::addNetwork(Network *net) {
   net->setProxy(signalProxy());
   signalProxy()->synchronize(net);
@@ -257,7 +261,6 @@ void Client::createIdentity(const Identity &id) {
 }
 
 void Client::updateIdentity(IdentityId id, const QVariantMap &ser) {
-  //emit instance()->requestUpdateIdentity(id);
   Identity *idptr = instance()->_identities.value(id, 0);
   if(!idptr) {
     qWarning() << "Update for unknown identity requested:" << id;