[gnome-shell/gnome-3-8] RemoteMenu: use detailed action-added signal

[Florian Müllner <fmuellner src gnome org>]

commit 1420f62dfaa01e51662b81d1f97eae46000afb4b
Author: Xavier Claessens <xavier claessens collabora co uk>
Date:   Wed Jun 5 13:51:26 2013 +0200

    RemoteMenu: use detailed action-added signal
    
    This avoid disconnecting all signals if we are waiting for
    different actions to be added, leading to incomplete menu.
    Previously if we were waiting for 2 different actions in 2
    different sections, the first action-added signal would
    disconnect the 2nd signal handler as well, so the model of
    that section would not be updated when the 2nd action is added.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=694612

 js/ui/popupMenu.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 88305da..1c63997 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -1873,7 +1873,7 @@ const RemoteMenu = new Lang.Class({
         let action_id = model.get_item_attribute_value(index, Gio.MENU_ATTRIBUTE_ACTION, null).deep_unpack();
         if (!this.actionGroup.has_action(action_id)) {
             // the action may not be there yet, wait for action-added
-            return [null, false, 'action-added'];
+            return [null, false, 'action-added::' + action_id];
         }
 
         if (!this._actions[action_id])
@@ -1910,7 +1910,7 @@ const RemoteMenu = new Lang.Class({
                 break;
             default:
                 log('Action "%s" has state of type %s, which is not supported'.format(action_id, 
action.state.get_type_string()));
-                return [null, false, 'action-state-changed'];
+                return [null, false, 'action-state-changed::' + action_id];
             }
         } else {
             target = model.get_item_attribute_value(index, Gio.MENU_ATTRIBUTE_TARGET, null);