Fix activation of radio menu items (#24)

p-e-w · May 6, 2017 · 2c2a711 · 2c2a711
1 parent 04f7876
commit 2c2a711
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Command.vala b/src/Command.vala
@@ -31,14 +31,16 @@ namespace Plotinus {
 
   class ActionCommand : Command {
     private Action action;
+    private Variant? parameter;
 
     public override void execute() {
-      action.activate(null);
+      action.activate(parameter);
     }
 
-    public ActionCommand(string[] path, string label, string[] accelerators, Action action) {
+    public ActionCommand(string[] path, string label, string[] accelerators, Action action, Variant? parameter) {
       base(path, label, accelerators);
       this.action = action;
+      this.parameter = parameter;
     }
   }
 

diff --git a/src/CommandExtractor.vala b/src/CommandExtractor.vala
@@ -75,7 +75,8 @@ class Plotinus.CommandExtractor : Object {
 
       if (label != null && label != "" && action != null && action.enabled) {
         var accelerators = (application != null) ? application.get_accels_for_action(action_name) : new string[0];
-        commands += new ActionCommand(path, label, accelerators, action);
+        var target = menu_model.get_item_attribute_value(i, Menu.ATTRIBUTE_TARGET, null);
+        commands += new ActionCommand(path, label, accelerators, action, target);
       }
 
       var link_iterator = menu_model.iterate_item_links(i);