X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Flayer.c;h=bbfda57218f122ae1784dc11ba03c9372d4cebf1;hb=0dc7eca4cdfff6425e19a0bace0f9ae8834d04e8;hp=4a1cf651901d6023d3e3c745e9409b1f8cbea804;hpb=23c8f0bc5b862ebf5f98e2f26ecf3c15042092d5;p=chaz%2Fopenbox

diff --git a/openbox/actions/layer.c b/openbox/actions/layer.c
index 4a1cf651..bbfda572 100644
--- a/openbox/actions/layer.c
+++ b/openbox/actions/layer.c
@@ -6,49 +6,46 @@ typedef struct {
     gboolean toggle;
 } Options;
 
-static gpointer setup_func_top(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
-static gpointer setup_func_bottom(ObParseInst *i, xmlDocPtr doc,
-                                  xmlNodePtr node);
-static gpointer setup_func_send(ObParseInst *i, xmlDocPtr doc,
-                                xmlNodePtr node);
+static gpointer setup_func_top(xmlNodePtr node);
+static gpointer setup_func_bottom(xmlNodePtr node);
+static gpointer setup_func_send(xmlNodePtr node);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
-void action_layer_startup()
+void action_layer_startup(void)
 {
     actions_register("ToggleAlwaysOnTop", setup_func_top, g_free,
-                     run_func_toggle, NULL, NULL);
+                     run_func, NULL, NULL);
     actions_register("ToggleAlwaysOnBottom", setup_func_bottom, g_free,
-                     run_func_toggle, NULL, NULL);
+                     run_func, NULL, NULL);
     actions_register("SendToLayer", setup_func_send, g_free,
-                     run_func_send, NULL, NULL);
+                     run_func, NULL, NULL);
 }
 
-static gpointer setup_func_top(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+static gpointer setup_func_top(xmlNodePtr node)
 {
     Options *o = g_new0(Options, 1);
     o->layer = 1;
+    o->toggle = TRUE;
     return o;
 }
 
-static gpointer setup_func_bottom(ObParseInst *i, xmlDocPtr doc,
-                                  xmlNodePtr node)
+static gpointer setup_func_bottom(xmlNodePtr node)
 {
     Options *o = g_new0(Options, 1);
     o->layer = -1;
+    o->toggle = TRUE;
     return o;
 }
 
-static gpointer setup_func_send(ObParseInst *i, xmlDocPtr doc,
-                                xmlNodePtr node)
+static gpointer setup_func_send(xmlNodePtr node)
 {
     xmlNodePtr n;
     Options *o;
 
     o = g_new0(Options, 1);
-    o->toggle = TRUE;
 
-    if ((n = parse_find_node("layer", node))) {
-        gchar *s = parse_string(doc, n);
+    if ((n = obt_parse_find_node(node, "layer"))) {
+        gchar *s = obt_parse_node_string(n);
         if (!g_ascii_strcasecmp(s, "above") ||
             !g_ascii_strcasecmp(s, "top"))
             o->layer = 1;