fix a crash in the SessionLogout action

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

diff --git a/openbox/actions/session.c b/openbox/actions/session.c
index b4b2ebb89eb2cf3beed0acdcad065755a2c28fcf..04ba96cbd81dc5edfe9bb1667c1fc3436b8fc1ff 100644 (file)
--- a/openbox/actions/session.c
+++ b/openbox/actions/session.c
@@ -38,7 +38,9 @@ static gboolean prompt_cb(ObPrompt *p, gint result, gpointer data)
 #ifdef USE_SM
         session_request_logout(o->silent);
 #else
-        g_message(_("The SessionLogout actions is not available since Openbox was built without session management support"));
+        /* 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 */
@@ -60,7 +62,7 @@ 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));
@@ -70,7 +72,7 @@ static gboolean logout_func(ObActionsData *data, gpointer options)
         prompt_show(p, NULL, FALSE);
     }
     else
-        prompt_cb(NULL, 1, NULL);
+        prompt_cb(NULL, 1, o);
 
     return FALSE;
 }