Unity

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

  1. fix-709707
  2. Merge into trunk
Proposed by Didier Roche-Tolomelli
Status: Merged
Approved by: Gord Allott
Approved revision: no longer in the source branch.
Merged at revision: 827
Proposed branch: lp:~didrocks/unity/fix-709707
Merge into: lp:unity
Diff against target: 65 lines (+4/-25)
2 files modified
src/BamfLauncherIcon.cpp (+4/-24)
src/BamfLauncherIcon.h (+0/-1)
To merge this branch: bzr merge lp:~didrocks/unity/fix-709707
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+48759@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
390void390void
391BamfLauncherIcon::OnMouseClick (int button)391BamfLauncherIcon::OnMouseClick (int button)
392{392{
393 if (button != 1)393 if (button == 1)
394 return;394 Activate ();
395 else if (button == 2)
396 OpenInstance ();
395397
396 Activate ();
397}398}
398399
399void400void
@@ -580,12 +581,6 @@
580}581}
581582
582void583void
583BamfLauncherIcon::OnLaunch (DbusmenuMenuitem *item, int time, BamfLauncherIcon *self)
584{
585 self->OpenInstance ();
586}
587
588void
589BamfLauncherIcon::OnQuit (DbusmenuMenuitem *item, int time, BamfLauncherIcon *self)584BamfLauncherIcon::OnQuit (DbusmenuMenuitem *item, int time, BamfLauncherIcon *self)
590{585{
591 GList *children, *l;586 GList *children, *l;
@@ -640,21 +635,6 @@
640{635{
641 DbusmenuMenuitem *menu_item;636 DbusmenuMenuitem *menu_item;
642637
643 /* Launch */
644 if (_menu_items.find ("Launch") == _menu_items.end ())
645 {
646 menu_item = dbusmenu_menuitem_new ();
647 g_object_ref (menu_item);
648
649 dbusmenu_menuitem_property_set (menu_item, DBUSMENU_MENUITEM_PROP_LABEL, _("Open New Window"));
650 dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_ENABLED, true);
651 dbusmenu_menuitem_property_set_bool (menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE, true);
652
653 g_signal_connect (menu_item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, (GCallback) &BamfLauncherIcon::OnLaunch, this);
654
655 _menu_items["Launch"] = menu_item;
656 }
657
658 /* Pin */638 /* Pin */
659 if (_menu_items.find ("Pin") == _menu_items.end ())639 if (_menu_items.find ("Pin") == _menu_items.end ())
660 {640 {
661641
=== 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 @@
83 static void OnChildAdded (BamfView *view, BamfView *child, gpointer data);83 static void OnChildAdded (BamfView *view, BamfView *child, gpointer data);
84 static void OnChildRemoved (BamfView *view, BamfView *child, gpointer data);84 static void OnChildRemoved (BamfView *view, BamfView *child, gpointer data);
8585
86 static void OnLaunch (DbusmenuMenuitem *item, int time, BamfLauncherIcon *self);
87 static void OnQuit (DbusmenuMenuitem *item, int time, BamfLauncherIcon *self);86 static void OnQuit (DbusmenuMenuitem *item, int time, BamfLauncherIcon *self);
88 static void OnTogglePin (DbusmenuMenuitem *item, int time, BamfLauncherIcon *self);87 static void OnTogglePin (DbusmenuMenuitem *item, int time, BamfLauncherIcon *self);
89};88};