Merge branch 'backport' into work

[chaz/openbox] / openbox / session.c

diff --git a/openbox/session.c b/openbox/session.c
index d1a3f99bf3f0237d4d7c5f1306f1c9dabcc59df3..758e9887bb2ad3f2d8f5378ab3f0cda47dd57c96 100644 (file)
--- 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)
 {