more using g_slice_new() instead of g_new()

[chaz/openbox] / openbox / actions / maximize.c

diff --git a/openbox/actions/maximize.c b/openbox/actions/maximize.c
index bb6f470ac557ab54084e2d67f12a1fa7be2c6141..db7c36bb8aaebb9fd9d47a7eea41768bb40d5662 100644 (file)
--- a/openbox/actions/maximize.c
+++ b/openbox/actions/maximize.c
@@ -12,31 +12,52 @@ typedef struct {
     MaxDirection dir;
 } Options;
 
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_func(xmlNodePtr node);
+static void free_func(gpointer o);
 static gboolean run_func_on(ObActionsData *data, gpointer options);
 static gboolean run_func_off(ObActionsData *data, gpointer options);
 static gboolean run_func_toggle(ObActionsData *data, gpointer options);
+/* 3.4-compatibility */
+static gpointer setup_both_func(xmlNodePtr node);
+static gpointer setup_horz_func(xmlNodePtr node);
+static gpointer setup_vert_func(xmlNodePtr node);
 
 void action_maximize_startup(void)
 {
-    actions_register("Maximize", setup_func, g_free, run_func_on,
-                     NULL, NULL);
-    actions_register("Unmaximize", setup_func, g_free, run_func_off,
-                     NULL, NULL);
-    actions_register("ToggleMaximize", setup_func, g_free, run_func_toggle,
-                     NULL, NULL);
+    actions_register("Maximize", setup_func, free_func, run_func_on);
+    actions_register("Unmaximize", setup_func, free_func, run_func_off);
+    actions_register("ToggleMaximize", setup_func, free_func, run_func_toggle);
+    /* 3.4-compatibility */
+    actions_register("MaximizeFull", setup_both_func, free_func,
+                     run_func_on);
+    actions_register("UnmaximizeFull", setup_both_func, free_func,
+                     run_func_off);
+    actions_register("ToggleMaximizeFull", setup_both_func, free_func,
+                     run_func_toggle);
+    actions_register("MaximizeHorz", setup_horz_func, free_func,
+                     run_func_on);
+    actions_register("UnmaximizeHorz", setup_horz_func, free_func,
+                     run_func_off);
+    actions_register("ToggleMaximizeHorz", setup_horz_func, free_func,
+                     run_func_toggle);
+    actions_register("MaximizeVert", setup_vert_func, free_func,
+                     run_func_on);
+    actions_register("UnmaximizeVert", setup_vert_func, free_func,
+                     run_func_off);
+    actions_register("ToggleMaximizeVert", setup_vert_func, free_func,
+                     run_func_toggle);
 }
 
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+static gpointer setup_func(xmlNodePtr node)
 {
     xmlNodePtr n;
     Options *o;
 
-    o = g_new0(Options, 1);
+    o = g_slice_new0(Options);
     o->dir = BOTH;
 
-    if ((n = parse_find_node("direction", node))) {
-        gchar *s = parse_string(doc, n);
+    if ((n = obt_xml_find_node(node, "direction"))) {
+        gchar *s = obt_xml_node_string(n);
         if (!g_ascii_strcasecmp(s, "vertical") ||
             !g_ascii_strcasecmp(s, "vert"))
             o->dir = VERT;
@@ -49,6 +70,11 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
     return o;
 }
 
+static void free_func(gpointer o)
+{
+    g_slice_free(Options, o);
+}
+
 /* Always return FALSE because its not interactive */
 static gboolean run_func_on(ObActionsData *data, gpointer options)
 {
@@ -89,3 +115,26 @@ static gboolean run_func_toggle(ObActionsData *data, gpointer options)
     }
     return FALSE;
 }
+
+/* 3.4-compatibility */
+static gpointer setup_both_func(xmlNodePtr node)
+{
+    Options *o = g_slice_new0(Options);
+    o->dir = BOTH;
+    return o;
+}
+
+static gpointer setup_horz_func(xmlNodePtr node)
+{
+    Options *o = g_slice_new0(Options);
+    o->dir = HORZ;
+    return o;
+}
+
+static gpointer setup_vert_func(xmlNodePtr node)
+{
+    Options *o = g_slice_new0(Options);
+    o->dir = VERT;
+    return o;
+}
+