diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-03-02 15:03:10 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-03-02 15:03:10 -0500 |
| commit | c70379fa8f771e499a4d47e84af06d71838b780d (patch) | |
| tree | 0f244d32b2069c0b8d68895e34532bfaf98d9392 /openbox/actions | |
| parent | 9676757a08b3e2e508c47f7795326bda8e54dc53 (diff) | |
| parent | b8960827b76ad499170e8b5b9ae8bf202188f0b0 (diff) | |
Merge branch 'backport' into work
Diffstat (limited to 'openbox/actions')
| -rw-r--r-- | openbox/actions/session.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/openbox/actions/session.c b/openbox/actions/session.c index cfc5e377..b6eebcb6 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(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 |