Merge branch 'backport' into work

[mikachu/openbox.git] / openbox / actions / exit.c

diff --git a/openbox/actions/exit.c b/openbox/actions/exit.c
index 58a1dcb..4f8cce6 100644 (file)
--- a/openbox/actions/exit.c
+++ b/openbox/actions/exit.c
@@ -21,6 +21,7 @@ static gpointer setup_func(xmlNodePtr node)
     Options *o;
 
     o = g_new0(Options, 1);
+    o->prompt = TRUE;
 
     if ((n = obt_parse_find_node(node, "prompt")))
         o->prompt = obt_parse_node_bool(n);
@@ -28,10 +29,15 @@ static gpointer setup_func(xmlNodePtr node)
     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);
 }
 
@@ -48,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