Fitting the SyncableObjects to the new Style

[quassel.git] / src / client / bufferviewoverlay.cpp

diff --git a/src/client/bufferviewoverlay.cpp b/src/client/bufferviewoverlay.cpp
index 3b49ff9..b1938d1 100644 (file)
--- a/src/client/bufferviewoverlay.cpp
+++ b/src/client/bufferviewoverlay.cpp
@@ -56,7 +56,9 @@ void BufferViewOverlay::addView(int viewId) {
     viewInitialized(config);
   } else {
     disconnect(config, SIGNAL(initDone()), this, SLOT(viewInitialized()));
-    connect(config, SIGNAL(initDone()), this, SLOT(viewInitialized()));
+    // we use a queued connection here since manipulating the connection list of a sending object
+    // doesn't seem to be such a good idea while executing a connected slots.
+    connect(config, SIGNAL(initDone()), this, SLOT(viewInitialized()), Qt::QueuedConnection);
   }
 }
 
@@ -96,16 +98,17 @@ void BufferViewOverlay::viewInitialized(BufferViewConfig *config) {
   }
   disconnect(config, SIGNAL(initDone()), this, SLOT(viewInitialized()));
 
-  connect(config, SIGNAL(networkIdSet(const NetworkId &)), this, SLOT(update()));
-  connect(config, SIGNAL(addNewBuffersAutomaticallySet(bool)), this, SLOT(update()));
-  connect(config, SIGNAL(sortAlphabeticallySet(bool)), this, SLOT(update()));
-  connect(config, SIGNAL(hideInactiveBuffersSet(bool)), this, SLOT(update()));
-  connect(config, SIGNAL(allowedBufferTypesSet(int)), this, SLOT(update()));
-  connect(config, SIGNAL(minimumActivitySet(int)), this, SLOT(update()));
-  connect(config, SIGNAL(bufferListSet()), this, SLOT(update()));
-  connect(config, SIGNAL(bufferAdded(const BufferId &, int)), this, SLOT(update()));
-  connect(config, SIGNAL(bufferRemoved(const BufferId &)), this, SLOT(update()));
-  connect(config, SIGNAL(bufferPermanentlyRemoved(const BufferId &)), this, SLOT(update()));
+  connect(config, SIGNAL(configChanged()), this, SLOT(update()));  
+//   connect(config, SIGNAL(networkIdSet(const NetworkId &)), this, SLOT(update()));
+//   connect(config, SIGNAL(addNewBuffersAutomaticallySet(bool)), this, SLOT(update()));
+//   connect(config, SIGNAL(sortAlphabeticallySet(bool)), this, SLOT(update()));
+//   connect(config, SIGNAL(hideInactiveBuffersSet(bool)), this, SLOT(update()));
+//   connect(config, SIGNAL(allowedBufferTypesSet(int)), this, SLOT(update()));
+//   connect(config, SIGNAL(minimumActivitySet(int)), this, SLOT(update()));
+//   connect(config, SIGNAL(bufferListSet()), this, SLOT(update()));
+//   connect(config, SIGNAL(bufferAdded(const BufferId &, int)), this, SLOT(update()));
+//   connect(config, SIGNAL(bufferRemoved(const BufferId &)), this, SLOT(update()));
+//   connect(config, SIGNAL(bufferPermanentlyRemoved(const BufferId &)), this, SLOT(update()));
 
   // check if the view was removed in the meantime...
   if(_bufferViewIds.contains(config->bufferViewId()))