Merge lp:~unity-team/unity/unity.fix-removing-nofavs into lp:unity

[Gord Allott]

fixes lp:623953 -
summery; launch an application that is not in your launcher, right click the launcher, select keep in launcher, close the application. it should stay on your launcher.

[Mikkel Kamstrup Erlandsen (kamstrup)]

review: Approve

=== modified file 'unity-private/launcher/application-controller.vala'
--- unity-private/launcher/application-controller.vala	2010-08-25 09:17:16 +0000
+++ unity-private/launcher/application-controller.vala	2010-09-02 11:03:43 +0000
@@ -38,7 +38,7 @@
     private Dbusmenu.Menuitem cached_menu;
     private int menu_items_realized_counter;
 
-    private bool is_favorite = false;
+    public bool is_favorite = false;
 
     public ApplicationController (string? desktop_file_, ScrollerChild child_)
     {

=== modified file 'unity-private/launcher/scroller-controller.vala'
--- unity-private/launcher/scroller-controller.vala	2010-09-01 13:26:46 +0000
+++ unity-private/launcher/scroller-controller.vala	2010-09-02 11:03:43 +0000
@@ -135,9 +135,23 @@
               childcontrollers.add (controller);
               controller.request_removal.connect (on_scroller_controller_closed);
               controller.notify["hide"].connect (() => {
+
+                // weird logic here i know, basically more if's than needed because
+                // i don't want to access the controller as a subclass until
+                // i know it is of that subclass type.
                 if (controller.hide && controller.child in model)
-                  model.remove (controller.child);
-                if (!controller.hide && (controller.child in model) == false)
+                  {
+                    if (controller is ApplicationController)
+                      {
+                        if ((controller as ApplicationController).is_favorite == false)
+                          model.remove (controller.child);
+                      }
+                    else
+                      {
+                        model.remove (controller.child);
+                      }
+                  }
+                else if (!controller.hide && (controller.child in model) == false)
                   model.add (controller.child);
               });
             }