Merge branch 'backport' into work

diff --git a/openbox/actions/session.c b/openbox/actions/session.c
index e9cc40dbbd4e780acae71c21cf1f524f81528016..58652adb46021c9d314bf4b20730133891311ace 100644 (file)
--- a/openbox/actions/session.c
+++ b/openbox/actions/session.c
@@ -72,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;
 }