Merge branch 'backport' into work

Conflicts:

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

4 files changed, 74 insertions, 0 deletions

diff --git a/openbox/actions/all.c b/openbox/actions/all.c
index 47141ac6..c86c4281 100644
--- a/openbox/actions/all.c
+++ b/openbox/actions/all.c
@@ -9,6 +9,7 @@ void action_all_startup(void)
     action_reconfigure_startup();
     action_exit_startup();
     action_restart_startup();
+    action_session_startup();
     action_cyclewindows_startup();
     action_breakchroot_startup();
     action_close_startup();
diff --git a/openbox/actions/all.h b/openbox/actions/all.h
index 35e1537c..909836ae 100644
--- a/openbox/actions/all.h
+++ b/openbox/actions/all.h
@@ -10,6 +10,7 @@ void action_showdesktop_startup(void);
 void action_reconfigure_startup(void);
 void action_exit_startup(void);
 void action_restart_startup(void);
+void action_session_startup(void);
 void action_cyclewindows_startup(void);
 void action_breakchroot_startup(void);
 void action_close_startup(void);
diff --git a/openbox/actions/exit.c b/openbox/actions/exit.c
index 58a1dcb1..25fc08bc 100644
--- a/openbox/actions/exit.c
+++ b/openbox/actions/exit.c
@@ -21,6 +21,7 @@ static gpointer setup_func(xmlNodePtr node)
     Options *o;
 
     o = g_new0(Options, 1);
+    o->prompt = TRUE;
 
     if ((n = obt_parse_find_node(node, "prompt")))
         o->prompt = obt_parse_node_bool(n);
diff --git a/openbox/actions/session.c b/openbox/actions/session.c
new file mode 100644
index 00000000..cfc5e377
--- /dev/null
+++ b/openbox/actions/session.c
@@ -0,0 +1,71 @@
+#include "openbox/actions.h"
+#include "openbox/prompt.h"
+#include "openbox/session.h"
+#include "gettext.h"
+
+#ifndef USE_SM
+void action_logout_startup(void) {}
+#else
+
+typedef struct {
+    gboolean prompt;
+    gboolean silent;
+} Options;
+
+static gpointer setup_func(xmlNodePtr node);
+static gboolean logout_func(ObActionsData *data, gpointer options);
+
+void action_session_startup(void)
+{
+    actions_register("SessionLogout", setup_func, NULL, logout_func,
+                     NULL, NULL);
+}
+
+static gpointer setup_func(xmlNodePtr node)
+{
+    xmlNodePtr n;
+    Options *o;
+
+    o = g_new0(Options, 1);
+    o->prompt = TRUE;
+
+    if ((n = obt_parse_find_node(node, "prompt")))
+        o->prompt = obt_parse_node_bool(n);
+
+    return o;
+}
+
+static void prompt_cb(ObPrompt *p, gint result, gpointer data)
+{
+    Options *o = data;
+    if (result)
+        session_request_logout(o->silent);
+    g_free(o);
+    prompt_unref(p);
+}
+
+/* Always return FALSE because its not interactive */
+static gboolean logout_func(ObActionsData *data, gpointer options)
+{
+    Options *o = options;
+
+    if (o->prompt) {
+        Options *o2;
+        ObPrompt *p;
+        ObPromptAnswer answers[] = {
+            { _("Cancel"), 0 },
+            { _("Log out"), 1 }
+        };
+
+        o2 = g_memdup(o, sizeof(Options));
+        p = prompt_new(_("Are you sure you want to log out?"),
+                       answers, 2, 0, 0, prompt_cb, o2);
+        prompt_show(p, NULL, FALSE);
+    }
+    else
+        prompt_cb(NULL, 1, NULL);
+
+    return FALSE;
+}
+
+#endif