X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Fexit.c;h=4f8cce6e6c44517bd50d88eeeced98de3002db7c;hb=a1746ab2158da2324aefb7ce81e7b5edc9c41e79;hp=747514f623dde81dbbc0ee0ae7f764818dadb79b;hpb=fc085fd66c2b06281df959285c5046fa5994e19e;p=chaz%2Fopenbox

diff --git a/openbox/actions/exit.c b/openbox/actions/exit.c
index 747514f6..4f8cce6e 100644
--- a/openbox/actions/exit.c
+++ b/openbox/actions/exit.c
@@ -7,7 +7,7 @@ typedef struct {
     gboolean prompt;
 } Options;
 
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_func(xmlNodePtr node);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
 void action_exit_startup(void)
@@ -15,7 +15,7 @@ void action_exit_startup(void)
     actions_register("Exit", setup_func, NULL, run_func, NULL, NULL);
 }
 
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+static gpointer setup_func(xmlNodePtr node)
 {
     xmlNodePtr n;
     Options *o;
@@ -23,16 +23,21 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
     o = g_new0(Options, 1);
     o->prompt = TRUE;
 
-    if ((n = parse_find_node("prompt", node)))
-        o->prompt = parse_bool(doc, n);
+    if ((n = obt_parse_find_node(node, "prompt")))
+        o->prompt = obt_parse_node_bool(n);
 
     return o;
 }
 
-static void prompt_cb(ObPrompt *p, gint result, gpointer data)
+static gboolean prompt_cb(ObPrompt *p, gint result, gpointer data)
 {
     if (result)
         ob_exit(0);
+    return TRUE; /* call the cleanup func */
+}
+
+static void prompt_cleanup(ObPrompt *p, gpointer data)
+{
     prompt_unref(p);
 }
 
@@ -49,7 +54,8 @@ static gboolean run_func(ObActionsData *data, gpointer options)
         };
 
         p = prompt_new(_("Are you sure you want to exit Openbox?"),
-                       answers, 2, 0, 0, prompt_cb, NULL);
+                       _("Exit Openbox"),
+                       answers, 2, 0, 0, prompt_cb, prompt_cleanup, NULL);
         prompt_show(p, NULL, FALSE);
     }
     else