X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Fsession.c;h=2c373654c84d8dd72c6fa3b94e4f74363c4a1fd6;hb=ffaac4a65043b6d4ea1e358d17f68f8c703db73d;hp=0031a273db5371a0fbd20763fb393e1a8454aa6d;hpb=4d098217301086d5ab142d6c4184f01d18c8b329;p=chaz%2Fopenbox diff --git a/openbox/actions/session.c b/openbox/actions/session.c index 0031a273..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; @@ -27,6 +23,7 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node) Options *o; o = g_new0(Options, 1); + o->prompt = TRUE; if ((n = parse_find_node("prompt", node))) o->prompt = parse_bool(doc, n); @@ -37,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); } @@ -66,5 +68,3 @@ static gboolean logout_func(ObActionsData *data, gpointer options) return FALSE; } - -#endif