Merge lp:~aacid/unity-2d/use_gconnector_in_application into lp:unity-2d

[Albert Astals Cid]

Use GConnector in Application instead of calling g_signal_connect

This makes sure we correctly disconnect all the signals we connected

=== modified file 'libunity-2d-private/src/application.cpp'
--- libunity-2d-private/src/application.cpp	2012-03-05 11:28:54 +0000
+++ libunity-2d-private/src/application.cpp	2012-03-12 13:05:19 +0000
@@ -106,7 +106,6 @@
 
 Application::~Application()
 {
-    disconnectWindowSignals();
 }
 
 bool
@@ -540,36 +539,9 @@
 
     for (int i = 0; i < size; ++i) {
         WnckWindow* window = wnck_window_get(xids->at(i));
-        g_signal_connect(G_OBJECT(window), "workspace-changed",
+        m_gConnector.connect(G_OBJECT(window), "workspace-changed",
             G_CALLBACK(Application::onWindowWorkspaceChanged), this);
-        g_signal_connect(G_OBJECT(window), "geometry-changed", G_CALLBACK(geometryChangedCB), this);
-    }
-}
-
-void
-Application::disconnectWindowSignals()
-{
-    if (m_application == NULL || m_application->running() == false) {
-        return;
-    }
-
-    QScopedPointer<BamfUintList> xids(m_application->xids());
-    int size = xids->size();
-    if (size < 1) {
-        return;
-    }
-
-    for (int i = 0; i < size; ++i) {
-        WnckWindow *window = wnck_window_get(xids->at(i));
-        if (window == NULL) {
-            wnck_screen_force_update(wnck_screen_get_default());
-            window = wnck_window_get(xids->at(i));
-            if (window == NULL) {
-                continue;
-            }
-        }
-
-        g_signal_handlers_disconnect_by_func(window, gpointer(geometryChangedCB), this);
+        m_gConnector.connect(G_OBJECT(window), "geometry-changed", G_CALLBACK(geometryChangedCB), this);
     }
 }
 
@@ -579,9 +551,9 @@
     if (window != NULL) {
         windowAdded(window->xid());
         WnckWindow* wnck_window = wnck_window_get(window->xid());
-        g_signal_connect(G_OBJECT(wnck_window), "workspace-changed",
+        m_gConnector.connect(G_OBJECT(wnck_window), "workspace-changed",
              G_CALLBACK(Application::onWindowWorkspaceChanged), this);
-        g_signal_connect(G_OBJECT(wnck_window), "geometry-changed", G_CALLBACK(geometryChangedCB), this);
+        m_gConnector.connect(G_OBJECT(wnck_window), "geometry-changed", G_CALLBACK(geometryChangedCB), this);
     }
 }
 

=== modified file 'libunity-2d-private/src/application.h'
--- libunity-2d-private/src/application.h	2012-03-01 14:26:38 +0000
+++ libunity-2d-private/src/application.h	2012-03-12 13:05:19 +0000
@@ -26,6 +26,7 @@
 #include "launcheritem.h"
 
 // libunity-2d
+#include <gconnector.h>
 #include <gscopedpointer.h>
 
 // Qt
@@ -107,7 +108,6 @@
     Q_INVOKABLE virtual bool belongsToDifferentWorkspace();
     Q_INVOKABLE virtual bool belongsToDifferentScreen(int screen);
     Q_INVOKABLE void connectWindowSignals();
-    void disconnectWindowSignals();
 
     void updateOverlaysState(const QString& sender, const QMap<QString, QVariant>& properties);
 
@@ -193,6 +193,7 @@
     void setDynamicQuicklistImporter(const QString& service);
     IndicatorDesktopShortcutsPointer m_staticShortcuts;
     QTimer m_geometryChangedTimer;
+    GConnector m_gConnector;
 };
 
 Q_DECLARE_METATYPE(Application*)