Imported Upstream version 0.4.0upstream/0.4.0

1 files changed, 6 insertions, 25 deletions

diff --git a/src/pies/load.vala b/src/pies/load.vala
index 98fd72f..b606cf5 100644
--- a/src/pies/load.vala
+++ b/src/pies/load.vala
@@ -80,7 +80,7 @@ namespace Pies {
         string name = "";
         string icon = "";
         string id = "";
-        int quick_action = -1;
+        int quickaction = -1;
         
         // parse all attributes of this node
         for (Xml.Attr* attribute = node->properties; attribute != null; attribute = attribute->next) {
@@ -92,7 +92,7 @@ namespace Pies {
                     hotkey = attr_content;
                     break;
                 case "quickaction":
-                    quick_action = int.parse(attr_content);
+                    quickaction = int.parse(attr_content);
                     break;
                 case "name":
                     name = attr_content;
@@ -145,7 +145,7 @@ namespace Pies {
         string icon="";
         string command="";
         string type="";
-        bool quick_action = false;
+        bool quickaction = false;
         
         // parse all attributes of this node
         for (Xml.Attr* attribute = slice->properties; attribute != null; attribute = attribute->next) {
@@ -166,7 +166,7 @@ namespace Pies {
                     type = attr_content;
                     break;
                 case "quickaction":
-                    quick_action = bool.parse(attr_content);
+                    quickaction = bool.parse(attr_content);
                     break;
                 default:
                     warning("Invalid attribute \"" + attr_name + "\" in <slice> element in pies.conf!");
@@ -174,19 +174,8 @@ namespace Pies {
             }
         }
         
-        Action action = null;
-        
         // create a new Action according to the loaded type
-        foreach (var action_type in ActionRegistry.types) {
-            if (ActionRegistry.settings_names[action_type] == type) {
-            
-                action = GLib.Object.new(action_type, "name", name, 
-                                                      "icon", icon, 
-                                              "real_command", command, 
-                                           "is_quick_action", quick_action) as Action;
-                break;
-            } 
-        }
+        Action action = ActionRegistry.create_action(type, name, icon, command, quickaction);
         
         if (action != null) pie.add_action(action);
     }
@@ -213,15 +202,7 @@ namespace Pies {
             }
         }
         
-        ActionGroup group = null;
-        
-        // create a new ActionGroup according to the loaded type
-        foreach (var group_type in GroupRegistry.types) {
-            if (GroupRegistry.settings_names[group_type] == type) {
-                group = GLib.Object.new(group_type, "parent_id", pie.id) as ActionGroup;
-                break;
-            } 
-        }
+        ActionGroup group = GroupRegistry.create_group(type, pie.id);
 
         if (group != null) pie.add_group(group);
     }