Merge lp:~uriboni/unity-2d/spread-no-windows-when-inactive into lp:unity-2d/3.0

[Ugo Riboni]

[spread] While the spread is not active avoid creating WindowInfo instances for windows that are opened

[Ugo Riboni (uriboni)]

The only way to verify that this patch works as advertised is to actually go in with a debugger and verify that the WindowsList has still zero items after a new window has been created while the spread is active.

[Ugo Riboni (uriboni)]

I meant, "while the spread is *not* active", at the end of the previous comment.

[Florian Boucault (fboucault)]

Works fine. Note 753269 is merely related to that MR, not fixed by it.

review: Approve

=== modified file 'libunity-2d-private/Unity2d/windowslist.cpp'
--- libunity-2d-private/Unity2d/windowslist.cpp	2011-04-12 16:27:37 +0000
+++ libunity-2d-private/Unity2d/windowslist.cpp	2011-04-15 11:56:41 +0000
@@ -35,10 +35,6 @@
     roles[WindowInfo::RoleDesktopFile] = "desktopFile";
     roles[WindowInfo::RoleWorkspace] = "workspace";
     setRoleNames(roles);
-
-    BamfMatcher &matcher = BamfMatcher::get_default();
-    connect(&matcher, SIGNAL(ViewOpened(BamfView*)), SLOT(addWindow(BamfView*)));
-    connect(&matcher, SIGNAL(ViewClosed(BamfView*)), SLOT(removeWindow(BamfView*)));
 }
 
 WindowsList::~WindowsList()
@@ -74,6 +70,10 @@
 
 void WindowsList::load()
 {
+    BamfMatcher &matcher = BamfMatcher::get_default();
+    connect(&matcher, SIGNAL(ViewOpened(BamfView*)), SLOT(addWindow(BamfView*)));
+    connect(&matcher, SIGNAL(ViewClosed(BamfView*)), SLOT(removeWindow(BamfView*)));
+
     if (m_windows.count() > 0) {
         beginRemoveRows(QModelIndex(), 0, m_windows.count() - 1);
         qDeleteAll(m_windows);
@@ -81,7 +81,6 @@
         endRemoveRows();
     }
 
-    BamfMatcher &matcher = BamfMatcher::get_default();
     QList<BamfApplication*> applications;
 
     /* List the windows of all the applications */
@@ -122,6 +121,10 @@
 
 void WindowsList::unload()
 {
+    BamfMatcher &matcher = BamfMatcher::get_default();
+    matcher.disconnect(this, SLOT(addWindow(BamfView*)));
+    matcher.disconnect(this, SLOT(removeWindow(BamfView*)));
+
     beginRemoveRows(QModelIndex(), 0, m_windows.count() - 1);
     qDeleteAll(m_windows);
     m_windows.clear();