Merge lp:~unity-team/unity/unity.fix-723877 into lp:unity

[Mirco Müller]

Adds separators and application-name label to the quicklist again. The application-name label also allows to start/focus the app... just like the launcher-icon itself. Fixes LP: #723877

[Neil J. Patel (njpatel)]

Sweet!

review: Approve

=== modified file 'src/BamfLauncherIcon.cpp'
--- src/BamfLauncherIcon.cpp	2011-03-14 20:48:50 +0000
+++ src/BamfLauncherIcon.cpp	2011-03-23 18:29:10 +0000
@@ -719,11 +719,27 @@
   }
 }
 
+static void
+OnAppLabelActivated (DbusmenuMenuitem* sender,
+                     guint             timestamp,
+                     gpointer data)
+{
+  BamfLauncherIcon* self = NULL;
+
+  if (!data)
+    return;
+    
+  self = (BamfLauncherIcon*) data;
+  self->ActivateLauncherIcon ();
+}
+
 std::list<DbusmenuMenuitem *>
 BamfLauncherIcon::GetMenus ()
 {
   std::map<std::string, DbusmenuClient *>::iterator it;
   std::list<DbusmenuMenuitem *> result;
+  bool first_separator_needed = false;
+  DbusmenuMenuitem* item = NULL;
 
   for (it = _menu_clients.begin (); it != _menu_clients.end (); it++)
   {
@@ -738,6 +754,8 @@
       if (!item)
         continue;
 
+      first_separator_needed = true;
+
       result.push_back (item);
     }
   }
@@ -754,10 +772,36 @@
       if (!item)
         continue;
 
+      first_separator_needed = true;
+
       result.push_back (item);
     }
-
-  }
+  }
+
+  if (first_separator_needed)
+  {
+    item = dbusmenu_menuitem_new ();
+    dbusmenu_menuitem_property_set (item,
+                                    DBUSMENU_MENUITEM_PROP_TYPE,
+                                    DBUSMENU_CLIENT_TYPES_SEPARATOR);
+    result.push_back (item);
+  }
+
+  item = dbusmenu_menuitem_new ();
+  dbusmenu_menuitem_property_set (item,
+                                  DBUSMENU_MENUITEM_PROP_LABEL,
+                                  bamf_view_get_name (BAMF_VIEW (m_App)));
+  dbusmenu_menuitem_property_set_bool (item,
+                                       DBUSMENU_MENUITEM_PROP_ENABLED,
+                                       true);
+  g_signal_connect (item, "item-activated", (GCallback) OnAppLabelActivated, this);
+  result.push_back (item);
+
+  item = dbusmenu_menuitem_new ();
+  dbusmenu_menuitem_property_set (item,
+                                  DBUSMENU_MENUITEM_PROP_TYPE,
+                                  DBUSMENU_CLIENT_TYPES_SEPARATOR);
+  result.push_back (item);
 
   EnsureMenuItemsReady ();
 
 
=== modified file 'src/BamfLauncherIcon.h'
--- src/BamfLauncherIcon.h	2011-02-11 17:03:24 +0000
+++ src/BamfLauncherIcon.h	2011-03-23 18:29:10 +0000
@@ -42,6 +42,8 @@
     const char* DesktopFile ();
     bool IsSticky ();
 
+    void ActivateLauncherIcon ();
+
 protected:
     void OnMouseClick (int button);
     std::list<DbusmenuMenuitem *> GetMenus ();
@@ -58,7 +60,6 @@
     void OnDndEnter ();
     void OnDndLeave ();
     
-    void ActivateLauncherIcon ();
     void OpenInstanceLauncherIcon ();
     
     std::list<char *> ValidateUrisForLaunch (std::list<char *> uris);