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

[Albert Astals Cid]

[launcher] Do not allow a unity-2d-shell.desktop tile to appear in the launcher

Happens when we get a "Can't unmount device" dialog when the device is busy

Do not show ourselves in the launcher

Happens when we get a "Can't unmount device" dialog when the device is busy

=== modified file 'libunity-2d-private/src/applicationslist.cpp'
--- libunity-2d-private/src/applicationslist.cpp	2012-04-27 10:27:40 +0000
+++ libunity-2d-private/src/applicationslist.cpp	2012-05-24 08:43:19 +0000
@@ -236,6 +236,9 @@
     if (!bamf_application->user_visible()) {
         return;
     }
+    if (bamf_application->desktop_file().endsWith("/unity-2d-shell.desktop")) {
+        return;
+    }
 
     Application* matchingApplication = NULL;
     Application* newApplication = new Application;

=== modified file 'tests/manual-tests/launcher.txt'
--- tests/manual-tests/launcher.txt	2012-05-21 13:49:05 +0000
+++ tests/manual-tests/launcher.txt	2012-05-24 08:43:19 +0000
@@ -176,3 +176,10 @@
 
 Verify the launcher hides
 ----
+ * Plug an external device
+ * Make it busy (e.g. go to it in a terminal)
+ * Try to safe eject the device
+ * Verify the volume is busy dialog appears
+
+Verify there is no "Unity 2d Shell" tile in the launcher
+----