Merge branch 'backport' into work

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

diff --git a/openbox/actions/exit.c b/openbox/actions/exit.c
index f5af8a12beabadcecde3870d68b47716d87a51d3..25fc08bc8730c719090cff08b729584efc79a3f2 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);
@@ -43,8 +44,8 @@ static gboolean run_func(ObActionsData *data, gpointer options)
     if (o->prompt) {
         ObPrompt *p;
         ObPromptAnswer answers[] = {
-            { _("No"), 0 },
-            { _("Yes"), 1 }
+            { _("Cancel"), 0 },
+            { _("Exit"), 1 }
         };
 
         p = prompt_new(_("Are you sure you want to exit Openbox?"),