Merge lp:~bilalakhtar/unity/fix-740867 into lp:unity

[Bilal Akhtar]

This branch fixes bug #740867 .

[Didier Roche-Tolomelli (didrocks)]

Hey Bilal,

Thanks for the merge request. However, the decision to remove it has been taken in bug #709707 referenced by the commit your revert (see the comments) and won't be reintroduce without an agreement on the ayatana-mailing list.

Disapproving for now. keep me in touch if the discussion changed the outcome :)

review: Disapprove

[Didier Roche-Tolomelli (didrocks)]

Setting the state to reject as my previous comment to clean the list and you already proposed another fix which makes that happen :)

Unmerged revisions

1001. By Bilal Akhtar on 2011-03-23

Add 'Open a new window' item to quicklist of BamfLauncherIcon

=== modified file 'src/BamfLauncherIcon.cpp'
--- src/BamfLauncherIcon.cpp	2011-03-14 20:48:50 +0000
+++ src/BamfLauncherIcon.cpp	2011-03-23 11:35:43 +0000
@@ -651,6 +651,12 @@
 }
 
 void
+BamfLauncherIcon::OnNewWindow (DbusmenuMenuitem *item, int time, BamfLauncherIcon *self)
+{
+    OpenInstanceLauncherIcon();
+}
+
+void
 BamfLauncherIcon::OnTogglePin (DbusmenuMenuitem *item, int time, BamfLauncherIcon *self)
 {
   BamfView *view = BAMF_VIEW (self->m_App);
@@ -680,6 +686,22 @@
 {
   DbusmenuMenuitem *menu_item;
 
+  /* NewWindow */
+  if (_menu_items.find ("NewWindow") == _menu_items.end ())
+  {
+    menu_item = dbusmenu_menuitem_new ();
+    g_object_ref (menu_item);
+
+    dbusmenu_menuitem_property_set (menu_item, DBUSMENU_MENUITEM_PROP_LABEL, _("Open a 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::OnNewWindow, this);
+
+    _menu_items["NewWindow"] = menu_item;
+  }
+
+
   /* Pin */
   if (_menu_items.find ("Pin") == _menu_items.end ())
   {
@@ -770,6 +792,9 @@
     if (g_strcmp0 (key , "Quit") == 0 && !bamf_view_is_running (BAMF_VIEW (m_App)))
       continue;
 
+    if (g_strcmp0 (key, "NewWindow") == 0 && !bamf_view_is_running (BAMF_VIEW (m_App)))
+      continue;
+
     exists = false;
     std::string label_default = dbusmenu_menuitem_property_get ((*it_m).second, DBUSMENU_MENUITEM_PROP_LABEL);
     for(it_l = result.begin(); it_l != result.end(); it_l++)
 
=== modified file 'src/BamfLauncherIcon.h'
--- src/BamfLauncherIcon.h	2011-02-11 17:03:24 +0000
+++ src/BamfLauncherIcon.h	2011-03-23 11:35:43 +0000
@@ -95,6 +95,7 @@
     static void OnChildRemoved (BamfView *view, BamfView *child, gpointer data);
 
     static void OnQuit (DbusmenuMenuitem *item, int time, BamfLauncherIcon *self);
+    static void OnNewWindow (DbusmenuMenuitem *item, int time, BamfLauncherIcon *self);
     static void OnLaunch (DbusmenuMenuitem *item, int time, BamfLauncherIcon *self);
     static void OnTogglePin (DbusmenuMenuitem *item, int time, BamfLauncherIcon *self);