Merge commit 'upstream/0.4.0'

1 files changed, 10 insertions, 6 deletions

diff --git a/src/actions/pieAction.vala b/src/actions/pieAction.vala
index 53ea919..5b2c81d 100644
--- a/src/actions/pieAction.vala
+++ b/src/actions/pieAction.vala
@@ -29,10 +29,14 @@ public class PieAction : Action {
     /// used in the pies.conf file for this kind of Actions.
     /////////////////////////////////////////////////////////////////////
 
-    public static void register(out string name, out bool icon_name_editable, out string settings_name) {
-        name = _("Open Pie");
-        icon_name_editable = false;
-        settings_name = "pie";
+    public static ActionRegistry.TypeDescription register() {
+        var description = new ActionRegistry.TypeDescription();
+        description.name = _("Open Pie");
+        description.icon = "gnome-pie";
+        description.description = _("Opens another Pie of Gnome-Pie. You may create sub menus this way.");
+        description.icon_name_editable = false;
+        description.id = "pie";
+        return description;
     }
     
     /////////////////////////////////////////////////////////////////////
@@ -79,8 +83,8 @@ public class PieAction : Action {
     /// C'tor, initializes all members.
     /////////////////////////////////////////////////////////////////////
 
-    public PieAction(string id, bool is_quick_action = false) {
-        GLib.Object(name : "", icon : "", real_command : id, is_quick_action : is_quick_action);
+    public PieAction(string id, bool is_quickaction = false) {
+        GLib.Object(name : "", icon : "", real_command : id, is_quickaction : is_quickaction);
     }
     
     /////////////////////////////////////////////////////////////////////