diff options
| author | Dana Jansens <danakj@orodu.net> | 2009-12-08 14:19:04 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2009-12-08 14:19:04 -0500 |
| commit | 2f09e0ce388f63c341cb328d795766e2bd0dc24b (patch) | |
| tree | 14fb36919947e80ba0dfc151d0f1f02ed46fd712 /openbox/session.c | |
| parent | 84843c3f9842046e34366202f1a8f80ce8565f91 (diff) | |
| parent | 672aea85cfe2ac2bc8cb4e3f34fd023f10d90182 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/actions/all.h
openbox/actions/session.c
openbox/client.c
openbox/event.c
openbox/grab.c
Diffstat (limited to 'openbox/session.c')
| -rw-r--r-- | openbox/session.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/openbox/session.c b/openbox/session.c index d1a3f99b..758e9887 100644 --- a/openbox/session.c +++ b/openbox/session.c @@ -34,6 +34,7 @@ void session_startup(gint argc, gchar **argv) {} void session_shutdown(gboolean permanent) {} GList* session_state_find(struct _ObClient *c) { return NULL; } void session_request_logout(gboolean silent) {} +gboolean session_connected(void) { return FALSE; } #else #include "debug.h" @@ -159,6 +160,11 @@ void session_shutdown(gboolean permanent) } } +gboolean session_connected(void) +{ + return !!sm_conn; +} + /*! Connect to the session manager and set up our callback functions */ static gboolean session_connect(void) { |