Merge lp:~didrocks/unity/fix-709707 into lp:unity

[Didier Roche-Tolomelli]

Middle click to open a new instance (LP: #709707)
drop the menu entry, now that we have a way to launch the application reliably.
We will add additional one to individual .desktop file

=== modified file 'src/BamfLauncherIcon.cpp'
--- src/BamfLauncherIcon.cpp	2011-02-03 17:31:47 +0000
+++ src/BamfLauncherIcon.cpp	2011-02-07 08:26:18 +0000
@@ -390,10 +390,11 @@
 void
 BamfLauncherIcon::OnMouseClick (int button)
 {
-  if (button != 1)
-    return;
+  if (button == 1)
+    Activate ();
+  else if (button == 2)
+    OpenInstance ();
 
-  Activate ();
 }
 
 void
@@ -580,12 +581,6 @@
 }
 
 void
-BamfLauncherIcon::OnLaunch (DbusmenuMenuitem *item, int time, BamfLauncherIcon *self)
-{
-  self->OpenInstance ();
-}
-
-void
 BamfLauncherIcon::OnQuit (DbusmenuMenuitem *item, int time, BamfLauncherIcon *self)
 {
   GList *children, *l;
@@ -640,21 +635,6 @@
 {
   DbusmenuMenuitem *menu_item;
 
-  /* Launch */
-  if (_menu_items.find ("Launch") == _menu_items.end ())
-  {
-    menu_item = dbusmenu_menuitem_new ();
-    g_object_ref (menu_item);
-
-    dbusmenu_menuitem_property_set (menu_item, DBUSMENU_MENUITEM_PROP_LABEL, _("Open New Window"));
-    dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_ENABLED, true);
-    dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE, true);
-
-    g_signal_connect (menu_item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, (GCallback) &BamfLauncherIcon::OnLaunch, this);
-
-    _menu_items["Launch"] = menu_item;
-  }
-
   /* Pin */
   if (_menu_items.find ("Pin") == _menu_items.end ())
   {

=== modified file 'src/BamfLauncherIcon.h'
--- src/BamfLauncherIcon.h	2011-02-03 17:31:47 +0000
+++ src/BamfLauncherIcon.h	2011-02-07 08:26:18 +0000
@@ -83,7 +83,6 @@
     static void OnChildAdded (BamfView *view, BamfView *child, gpointer data);
     static void OnChildRemoved (BamfView *view, BamfView *child, gpointer data);
 
-    static void OnLaunch (DbusmenuMenuitem *item, int time, BamfLauncherIcon *self);
     static void OnQuit (DbusmenuMenuitem *item, int time, BamfLauncherIcon *self);
     static void OnTogglePin (DbusmenuMenuitem *item, int time, BamfLauncherIcon *self);
 };