Merge branch 'backport' into work

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

diff --git a/openbox/actions/session.c b/openbox/actions/session.c
index cfc5e37..58652ad 100644 (file)
--- a/openbox/actions/session.c
+++ b/openbox/actions/session.c
@@ -3,10 +3,6 @@
 #include "openbox/session.h"
 #include "gettext.h"
 
-#ifndef USE_SM
-void action_logout_startup(void) {}
-#else
-
 typedef struct {
     gboolean prompt;
     gboolean silent;
@@ -35,12 +31,24 @@ 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)
 {
     Options *o = data;
-    if (result)
+    if (result) {
+#ifdef USE_SM
         session_request_logout(o->silent);
-    g_free(o);
+#else
+        /* TRANSLATORS: Don't translate the word "SessionLogout" as it's the
+           name of the action you write in rc.xml */
+        g_message(_("The SessionLogout action is not available since Openbox was built without session management support"));
+#endif
+    }
+    return TRUE; /* call cleanup func */
+}
+
+static void prompt_cleanup(ObPrompt *p, gpointer data)
+{
+    g_free(data);
     prompt_unref(p);
 }
 
@@ -54,18 +62,17 @@ static gboolean logout_func(ObActionsData *data, gpointer options)
         ObPrompt *p;
         ObPromptAnswer answers[] = {
             { _("Cancel"), 0 },
-            { _("Log out"), 1 }
+            { _("Log Out"), 1 }
         };
 
         o2 = g_memdup(o, sizeof(Options));
         p = prompt_new(_("Are you sure you want to log out?"),
-                       answers, 2, 0, 0, prompt_cb, o2);
+                       _("Log Out"),
+                       answers, 2, 0, 0, prompt_cb, prompt_cleanup, o2);
         prompt_show(p, NULL, FALSE);
     }
     else
-        prompt_cb(NULL, 1, NULL);
+        prompt_cb(NULL, 1, o);
 
     return FALSE;
 }
-
-#endif