X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Fsession.c;h=436eb0f57141b13e0f6b2aaf3e215d7198d85172;hb=d394d8c613b8b85cd3ee92b6114716e57f8d03ce;hp=0031a273db5371a0fbd20763fb393e1a8454aa6d;hpb=4d098217301086d5ab142d6c4184f01d18c8b329;p=chaz%2Fopenbox

diff --git a/openbox/actions/session.c b/openbox/actions/session.c
index 0031a273..436eb0f5 100644
--- 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;
@@ -27,6 +23,7 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
     Options *o;
 
     o = g_new0(Options, 1);
+    o->prompt = TRUE;
 
     if ((n = parse_find_node("prompt", node)))
         o->prompt = parse_bool(doc, n);
@@ -34,12 +31,22 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, 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
+        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);
 }
 
@@ -53,12 +60,13 @@ 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
@@ -66,5 +74,3 @@ static gboolean logout_func(ObActionsData *data, gpointer options)
 
     return FALSE;
 }
-
-#endif