Merge branch 'backport' into work

Conflicts:

	openbox/actions/execute.c
	openbox/event.c
	openbox/openbox.c
	openbox/openbox.h

1 files changed, 10 insertions, 4 deletions

diff --git a/openbox/actions/session.c b/openbox/actions/session.c
index b6eebcb6..27df917a 100644
--- a/openbox/actions/session.c
+++ b/openbox/actions/session.c
@@ -31,17 +31,22 @@ 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) {
-#ifndef USE_SM
+#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"));
 #endif
     }
-    g_free(o);
+    return TRUE; /* call cleanup func */
+}
+
+static void prompt_cleanup(ObPrompt *p, gpointer data)
+{
+    g_free(data);
     prompt_unref(p);
 }
 
@@ -60,7 +65,8 @@ static gboolean logout_func(ObActionsData *data, gpointer options)
 
         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