X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Fexit.c;h=f2b0cafbfafa0977ed9bb7c508c4114191218034;hb=b06b684589a618a2481ccc2745d5e03abb6bd5e0;hp=f5af8a12beabadcecde3870d68b47716d87a51d3;hpb=8bd02bf4b883fa369dd68df2053974407024ddaf;p=chaz%2Fopenbox

diff --git a/openbox/actions/exit.c b/openbox/actions/exit.c
index f5af8a12..f2b0cafb 100644
--- a/openbox/actions/exit.c
+++ b/openbox/actions/exit.c
@@ -1,6 +1,7 @@
 #include "openbox/actions.h"
 #include "openbox/openbox.h"
 #include "openbox/prompt.h"
+#include "openbox/session.h"
 #include "gettext.h"
 
 typedef struct {
@@ -12,7 +13,8 @@ static gboolean run_func(ObActionsData *data, gpointer options);
 
 void action_exit_startup(void)
 {
-    actions_register("Exit", setup_func, NULL, run_func, NULL, NULL);
+    actions_register("Exit", setup_func, NULL, run_func);
+    actions_register("SessionLogout", setup_func, NULL, run_func);
 }
 
 static gpointer setup_func(xmlNodePtr node)
@@ -21,17 +23,31 @@ 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);
+    if ((n = obt_xml_find_node(node, "prompt")))
+        o->prompt = obt_xml_node_bool(n);
 
     return o;
 }
 
-static void prompt_cb(ObPrompt *p, gint result, gpointer data)
+static void do_exit(void)
 {
-    if (result)
+    if (session_connected())
+        session_request_logout(FALSE);
+    else
         ob_exit(0);
+}
+
+static gboolean prompt_cb(ObPrompt *p, gint result, gpointer data)
+{
+    if (result)
+        do_exit();
+    return TRUE; /* call the cleanup func */
+}
+
+static void prompt_cleanup(ObPrompt *p, gpointer data)
+{
     prompt_unref(p);
 }
 
@@ -43,16 +59,23 @@ static gboolean run_func(ObActionsData *data, gpointer options)
     if (o->prompt) {
         ObPrompt *p;
         ObPromptAnswer answers[] = {
-            { _("No"), 0 },
-            { _("Yes"), 1 }
+            { _("Cancel"), 0 },
+            { _("Exit"), 1 }
         };
 
-        p = prompt_new(_("Are you sure you want to exit Openbox?"),
-                       answers, 2, 0, 0, prompt_cb, NULL);
+        if (session_connected())
+            p = prompt_new(_("Are you sure you want to log out?"),
+                           _("Log Out"),
+                           answers, 2, 0, 0, prompt_cb, prompt_cleanup, NULL);
+        else
+            p = prompt_new(_("Are you sure you want to exit Openbox?"),
+                           _("Exit Openbox"),
+                           answers, 2, 0, 0, prompt_cb, prompt_cleanup, NULL);
+
         prompt_show(p, NULL, FALSE);
     }
     else
-        ob_exit(0);
+        do_exit();
 
     return FALSE;
 }