summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2008-03-02 15:01:46 -0500
committerDana Jansens <danakj@orodu.net>2008-03-02 15:02:07 -0500
commitffaac4a65043b6d4ea1e358d17f68f8c703db73d (patch)
tree4a6e97abca6753eb8751751a4c790257f49058ee /openbox
parent60053651335e4ffd2bb1cb0aec04e4ceb9357c3f (diff)
make the SessionLogout action always available but it shows an error if you use it and Openbox wasn't built with SM support
Diffstat (limited to 'openbox')
-rw-r--r--openbox/actions/session.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/openbox/actions/session.c b/openbox/actions/session.c
index 0117e07c..2c373654 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;
@@ -38,8 +34,13 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
static void prompt_cb(ObPrompt *p, gint result, gpointer data)
{
Options *o = data;
- if (result)
+ if (result) {
+#ifndef 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);
prompt_unref(p);
}
@@ -67,5 +68,3 @@ static gboolean logout_func(ObActionsData *data, gpointer options)
return FALSE;
}
-
-#endif