From: Dana Jansens <danakj@orodu.net>
Date: Sat, 7 Nov 2009 02:02:23 +0000 (-0500)
Subject: Merge branch 'backport' into work
X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=commitdiff_plain;h=a170ad7c85b5f23fafe64d28a3f183a7ce42ce53;hp=a92c209fc1845cf3f3acdfa3f9e8f0930fd53eb3

Merge branch 'backport' into work
---

diff --git a/openbox/actions/session.c b/openbox/actions/session.c
index e9cc40db..58652adb 100644
--- 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;
 }