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

[Albert Astals Cid]

[Launcher] When the stickyness of an application instance changes and we decide to remove it from it's launcher applicationlist do the same for all the other launchers (monitors)

[Launcher] When the stickyness of an application instance changes and we decide to remove it from it's launcher applicationlist do the same for all the other launchers (monitors)

[lp:~aacid/unity-2d/remove_non_running_non_sticky_all_lists]

1087. By Albert Astals Cid on 2012-04-27

test

1088. By Albert Astals Cid on 2012-04-30

Merge lp:unity-2d

=== modified file 'libunity-2d-private/src/applicationslist.cpp'
--- libunity-2d-private/src/applicationslist.cpp	2012-03-14 15:07:50 +0000
+++ libunity-2d-private/src/applicationslist.cpp	2012-04-30 14:00:29 +0000
@@ -201,6 +201,17 @@
 }
 
 void
+ApplicationsList::removeApplication(const QString& desktop_file)
+{
+    Q_FOREACH(Application *app, m_applications) {
+        if (app->desktop_file() == desktop_file) {
+            removeApplication(app);
+            break;
+        }
+    }
+}
+
+void
 ApplicationsList::onApplicationUserVisibleChanged(bool user_visible)
 {
     BamfApplication* bamf_application = qobject_cast<BamfApplication*>(sender());
@@ -399,6 +410,11 @@
 
     if (!sticky && !application->running()) {
         removeApplication(application);
+        Q_FOREACH(ApplicationsList *other, ApplicationsListManager::instance()->m_lists) {
+            if (other != this) {
+                other->removeApplication(application->desktop_file());
+            }
+        }
     }
 }
 
 
=== modified file 'libunity-2d-private/src/applicationslist.h'
--- libunity-2d-private/src/applicationslist.h	2012-04-26 08:14:26 +0000
+++ libunity-2d-private/src/applicationslist.h	2012-04-30 14:00:29 +0000
@@ -70,6 +70,7 @@
 
     void insertApplication(Application* application);
     void removeApplication(Application* application);
+    void removeApplication(const QString& desktop_file);
 
     QString favoriteFromDesktopFilePath(const QString& desktop_file) const;
 
 
=== modified file 'tests/manual-tests/launcher.txt'
--- tests/manual-tests/launcher.txt	2012-04-26 08:16:18 +0000
+++ tests/manual-tests/launcher.txt	2012-04-30 14:00:29 +0000
@@ -163,7 +163,13 @@
 ----
  * Have a multimonitor setup
  * On primary screen, open dash
- * Drab an application icon and drop it onto the launcher beside it
+ * Drag an application icon and drop it onto the launcher beside it
 
 Verify Application tile created for that application in all launchers
 ----
+ * Have a multimonitor setup
+ * Have launchers in all monitors
+ * Make an application that is not running not sticky (i.e. remove it from the launcher)
+
+Verify Application tile is removed from all launchers
+----