projects
/
dana
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6005365
)
make the SessionLogout action always available but it shows an error if you use it...
author
Dana Jansens
<danakj@orodu.net>
Sun, 2 Mar 2008 20:01:46 +0000
(15:01 -0500)
committer
Dana Jansens
<danakj@orodu.net>
Sun, 2 Mar 2008 20:02:07 +0000
(15:02 -0500)
openbox/actions/session.c
patch
|
blob
|
history
diff --git
a/openbox/actions/session.c
b/openbox/actions/session.c
index
0117e07
..
2c37365
100644
(file)
--- a/
openbox/actions/session.c
+++ b/
openbox/actions/session.c
@@
-3,10
+3,6
@@
#include "openbox/session.h"
#include "gettext.h"
#include "openbox/session.h"
#include "gettext.h"
-#ifndef USE_SM
-void action_logout_startup(void) {}
-#else
-
typedef struct {
gboolean prompt;
gboolean silent;
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;
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);
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);
}
g_free(o);
prompt_unref(p);
}
@@
-67,5
+68,3
@@
static gboolean logout_func(ObActionsData *data, gpointer options)
return FALSE;
}
return FALSE;
}
-
-#endif