Merge branch 'backport' into work

Conflicts:

	openbox/actions/all.h
	openbox/event.c
	openbox/prompt.c

1 files changed, 17 insertions, 0 deletions

diff --git a/openbox/session.c b/openbox/session.c
index 99d66221..3cf8fbe2 100644
--- a/openbox/session.c
+++ b/openbox/session.c
@@ -33,6 +33,7 @@ GSList *session_desktop_names = NULL;
 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) {}
 #else
 
 #include "debug.h"
@@ -813,4 +814,20 @@ static void session_load_file(const gchar *path)
     obt_parse_instance_unref(i);
 }
 
+void session_request_logout(gboolean silent)
+{
+    if (sm_conn) {
+        SmcRequestSaveYourself(sm_conn,
+                               SmSaveBoth,
+                               TRUE, /* logout */
+                               (silent ?
+                                SmInteractStyleNone : SmInteractStyleAny),
+                               TRUE,  /* if false, with GSM, it shows the old
+                                         logout prompt */
+                               TRUE); /* global */
+    }
+    else
+        g_message(_("Not connected to a session manager"));
+}
+
 #endif