Merge lp:~cando/unity/fixed683466 into lp:unity

[Stefano Candori]

In this branch i've fixed bug #683466.

Sorry for the double merge proposal...:(

=== modified file 'src/BamfLauncherIcon.cpp'
--- src/BamfLauncherIcon.cpp	2010-12-13 22:50:48 +0000
+++ src/BamfLauncherIcon.cpp	2010-12-14 21:26:11 +0000
@@ -630,11 +630,32 @@
 
   EnsureMenuItemsReady ();
 
-  result.push_back (_menu_items["Launch"]);
-  result.push_back (_menu_items["Pin"]);
+  std::map<std::string, DbusmenuMenuitem *>::iterator it_m;
+  std::list<DbusmenuMenuitem *>::iterator it_l;
+  bool exists;
+  for (it_m = _menu_items.begin (); it_m != _menu_items.end (); it_m++)
+  {
+    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++)
+    {
+      const gchar* type = dbusmenu_menuitem_property_get (*it_l, DBUSMENU_MENUITEM_PROP_TYPE);
+      if (type == NULL)//(g_strcmp0 (type, DBUSMENU_MENUITEM_PROP_LABEL) == 0)
+      {
+        std::string label_menu = dbusmenu_menuitem_property_get (*it_l, DBUSMENU_MENUITEM_PROP_LABEL);
+        if (label_menu.compare(label_default) == 0){ exists = true; break;}
+      }
+    }
+    
+    if (!exists)
+    {
+      const char* key = ((*it_m).first).c_str();
+      if (g_strcmp0 (key , "Quit") == 0)
+        if (!bamf_view_is_running (BAMF_VIEW (m_App))) continue;
 
-  if (bamf_view_is_running (BAMF_VIEW (m_App)))
-    result.push_back (_menu_items["Quit"]);
+      result.push_back((*it_m).second);
+    } 
+  }
 
   return result;
 }