more using g_slice_new() instead of g_new()

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

diff --git a/openbox/actions/layer.c b/openbox/actions/layer.c
index bbfda57218f122ae1784dc11ba03c9372d4cebf1..ed1eeedc0462c26ed22557edbeb39ef028b4c61e 100644 (file)
--- a/openbox/actions/layer.c
+++ b/openbox/actions/layer.c
@@ -9,21 +9,33 @@ typedef struct {
 static gpointer setup_func_top(xmlNodePtr node);
 static gpointer setup_func_bottom(xmlNodePtr node);
 static gpointer setup_func_send(xmlNodePtr node);
+static void free_func(gpointer o);
 static gboolean run_func(ObActionsData *data, gpointer options);
+/* 3.4-compatibility */
+static gpointer setup_sendtop_func(xmlNodePtr node);
+static gpointer setup_sendbottom_func(xmlNodePtr node);
+static gpointer setup_sendnormal_func(xmlNodePtr node);
 
 void action_layer_startup(void)
 {
-    actions_register("ToggleAlwaysOnTop", setup_func_top, g_free,
-                     run_func, NULL, NULL);
-    actions_register("ToggleAlwaysOnBottom", setup_func_bottom, g_free,
-                     run_func, NULL, NULL);
-    actions_register("SendToLayer", setup_func_send, g_free,
-                     run_func, NULL, NULL);
+    actions_register("ToggleAlwaysOnTop", setup_func_top, free_func,
+                     run_func);
+    actions_register("ToggleAlwaysOnBottom", setup_func_bottom, free_func,
+                     run_func);
+    actions_register("SendToLayer", setup_func_send, free_func,
+                     run_func);
+    /* 3.4-compatibility */
+    actions_register("SendToTopLayer", setup_sendtop_func, free_func,
+                     run_func);
+    actions_register("SendToBottomLayer", setup_sendbottom_func, free_func,
+                     run_func);
+    actions_register("SendToNormalLayer", setup_sendnormal_func, free_func,
+                     run_func);
 }
 
 static gpointer setup_func_top(xmlNodePtr node)
 {
-    Options *o = g_new0(Options, 1);
+    Options *o = g_slice_new0(Options);
     o->layer = 1;
     o->toggle = TRUE;
     return o;
@@ -31,7 +43,7 @@ static gpointer setup_func_top(xmlNodePtr node)
 
 static gpointer setup_func_bottom(xmlNodePtr node)
 {
-    Options *o = g_new0(Options, 1);
+    Options *o = g_slice_new0(Options);
     o->layer = -1;
     o->toggle = TRUE;
     return o;
@@ -42,10 +54,10 @@ static gpointer setup_func_send(xmlNodePtr node)
     xmlNodePtr n;
     Options *o;
 
-    o = g_new0(Options, 1);
+    o = g_slice_new0(Options);
 
-    if ((n = obt_parse_find_node(node, "layer"))) {
-        gchar *s = obt_parse_node_string(n);
+    if ((n = obt_xml_find_node(node, "layer"))) {
+        gchar *s = obt_xml_node_string(n);
         if (!g_ascii_strcasecmp(s, "above") ||
             !g_ascii_strcasecmp(s, "top"))
             o->layer = 1;
@@ -61,6 +73,11 @@ static gpointer setup_func_send(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(ObActionsData *data, gpointer options)
 {
@@ -87,3 +104,29 @@ static gboolean run_func(ObActionsData *data, gpointer options)
 
     return FALSE;
 }
+
+/* 3.4-compatibility */
+static gpointer setup_sendtop_func(xmlNodePtr node)
+{
+    Options *o = g_slice_new0(Options);
+    o->layer = 1;
+    o->toggle = FALSE;
+    return o;
+}
+
+static gpointer setup_sendbottom_func(xmlNodePtr node)
+{
+    Options *o = g_slice_new0(Options);
+    o->layer = -1;
+    o->toggle = FALSE;
+    return o;
+}
+
+static gpointer setup_sendnormal_func(xmlNodePtr node)
+{
+    Options *o = g_slice_new0(Options);
+    o->layer = 0;
+    o->toggle = FALSE;
+    return o;
+}
+