1 files changed, 68 insertions, 19 deletions

diff --git a/libqmenumodel/src/unitymenumodel.cpp b/libqmenumodel/src/unitymenumodel.cpp
index d457cad..a0ab4ff 100644
--- a/libqmenumodel/src/unitymenumodel.cpp
+++ b/libqmenumodel/src/unitymenumodel.cpp
@@ -93,6 +93,9 @@ public:
     static void registeredActionEnabledChanged(GtkSimpleActionObserver *observer_item,  const gchar *action_name, gboolean enabled);
     static void registeredActionStateChanged(GtkSimpleActionObserver *observer_item, const gchar *action_name, GVariant *state);
     static void registeredActionRemoved(GtkSimpleActionObserver *observer_item, const gchar *action_name);
+
+    gchar * fullActionName(UnityMenuAction *action);
+    void updateRegisteredAction(UnityMenuAction *action);
 };
 
 void menu_item_free (gpointer data)
@@ -432,8 +435,12 @@ QVariant UnityMenuModel::data(const QModelIndex &index, int role) const
             return map ? *map : QVariant();
         }
 
-        case ActionRole:
-            return gtk_menu_tracker_item_get_action_name (item);
+        case ActionRole: {
+            gchar *action_name = gtk_menu_tracker_item_get_action_name (item);
+            QString v(action_name);
+            g_free(action_name);
+            return v;
+        }
 
         case ActionStateRole:
             return priv->itemState(item);
@@ -646,7 +653,7 @@ void UnityMenuModel::activate(int index, const QVariant& parameter)
     if (parameter.isValid()) {
         gchar *action;
 
-        gtk_menu_tracker_item_get_attribute (item, "action", "s", &action);
+        action = gtk_menu_tracker_item_get_action_name (item);
         g_action_group_activate_action (G_ACTION_GROUP (priv->muxer), action, Converter::toGVariant(parameter));
 
         g_free (action);
@@ -751,6 +758,7 @@ void UnityMenuModel::registerAction(UnityMenuAction* action)
         priv->registeredActions[action] = observer_item;
 
         connect(action, SIGNAL(nameChanged(const QString&)), SLOT(onRegisteredActionNameChanged(const QString&)));
+        connect(action, SIGNAL(indexChanged(int)), SLOT(onRegisteredActionIndexChanged(int)));
         connect(action, SIGNAL(activate(const QVariant&)), SLOT(onRegisteredActionActivated(const QVariant&)));
         connect(action, SIGNAL(changeState(const QVariant&)), SLOT(onRegisteredActionStateChanged(const QVariant&)));
     }
@@ -768,26 +776,53 @@ void UnityMenuModel::unregisterAction(UnityMenuAction* action)
     }
 }
 
-void UnityMenuModel::onRegisteredActionNameChanged(const QString& name)
+/* Returns the full name for @action
+ *
+ * If @action is associated with a menu item that is inside of a
+ * section or submenu with "action-namespace" set, this namespace
+ * is prepended to @action->name()
+ */
+char * UnityMenuModelPrivate::fullActionName(UnityMenuAction *action)
 {
-    UnityMenuAction* action = qobject_cast<UnityMenuAction*>(sender());
-    if (!action || !priv->registeredActions.contains(action))
-        return;
+    GSequenceIter *iter;
+    QByteArray bytes;
+    const gchar *name;
+    gchar *full_name = NULL;
 
-    GtkSimpleActionObserver* observer_item;
-    observer_item = priv->registeredActions[action];
+    bytes = action->name().toUtf8();
+    name = bytes.constData();
 
-    QByteArray nameArray = name.toUtf8();
-    const gchar* action_name = nameArray.constData();
+    iter = g_sequence_get_iter_at_pos (this->items, action->index());
+    if (!g_sequence_iter_is_end (iter)) {
+        GtkMenuTrackerItem *item;
+        const gchar *action_namespace;
 
-    gtk_simple_action_observer_register_action (observer_item, action_name);
+        item = (GtkMenuTrackerItem *) g_sequence_get (iter);
+        action_namespace = gtk_menu_tracker_item_get_action_namespace (item);
+        if (action_namespace != NULL)
+          return g_strjoin (".", action_namespace, name, NULL);
+    }
+
+    return g_strdup (name);
+}
 
-    const GVariantType *parameter_type;
+void UnityMenuModelPrivate::updateRegisteredAction(UnityMenuAction *action)
+{
+    GtkSimpleActionObserver *observer_item;
+    gchar *action_name;
     gboolean enabled;
     GVariant *state;
 
-    if (g_action_group_query_action (G_ACTION_GROUP (priv->muxer), action_name,
-                                     &enabled, &parameter_type, NULL, NULL, &state))
+    if (!action || !this->registeredActions.contains(action))
+        return;
+
+    action_name = fullActionName(action);
+
+    observer_item = this->registeredActions[action];
+    gtk_simple_action_observer_register_action (observer_item, action_name);
+
+    if (g_action_group_query_action (G_ACTION_GROUP (this->muxer), action_name,
+                                     &enabled, NULL, NULL, NULL, &state))
     {
         UnityMenuActionAddEvent umaae(enabled, Converter::toQVariant(state));
         QCoreApplication::sendEvent(action, &umaae);
@@ -796,6 +831,18 @@ void UnityMenuModel::onRegisteredActionNameChanged(const QString& name)
             g_variant_unref (state);
         }
     }
+
+    g_free(action_name);
+}
+
+void UnityMenuModel::onRegisteredActionNameChanged(const QString& name)
+{
+    priv->updateRegisteredAction(qobject_cast<UnityMenuAction*>(sender()));
+}
+
+void UnityMenuModel::onRegisteredActionIndexChanged(int index)
+{
+    priv->updateRegisteredAction(qobject_cast<UnityMenuAction*>(sender()));
 }
 
 void UnityMenuModel::onRegisteredActionActivated(const QVariant& parameter)
@@ -804,10 +851,11 @@ void UnityMenuModel::onRegisteredActionActivated(const QVariant& parameter)
     if (!action || action->name().isEmpty())
         return;
 
-    QByteArray nameArray = action->name().toUtf8();
-    const gchar* action_name = nameArray.constData();
+    gchar* action_name = priv->fullActionName(action);
 
     g_action_group_activate_action (G_ACTION_GROUP (priv->muxer), action_name, Converter::toGVariant(parameter));
+
+    g_free(action_name);
 }
 
 void UnityMenuModel::onRegisteredActionStateChanged(const QVariant& parameter)
@@ -816,10 +864,11 @@ void UnityMenuModel::onRegisteredActionStateChanged(const QVariant& parameter)
     if (!action || action->name().isEmpty())
         return;
 
-    QByteArray nameArray = action->name().toUtf8();
-    const gchar* action_name = nameArray.constData();
+    gchar* action_name = priv->fullActionName(action);
 
     g_action_group_change_action_state (G_ACTION_GROUP (priv->muxer), action_name, Converter::toGVariant(parameter));
+
+    g_free(action_name);
 }
 
 void UnityMenuModelPrivate::registeredActionAdded(GtkSimpleActionObserver    *observer_item,