more using g_slice_new() instead of g_new()

[chaz/openbox] / openbox / actions / exit.c

diff --git a/openbox/actions/exit.c b/openbox/actions/exit.c
index 25fc08bc8730c719090cff08b729584efc79a3f2..2d9fc63312dc9c73b196474db71fb0f79bd99f83 100644 (file)
--- 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 {
@@ -8,11 +9,13 @@ typedef struct {
 } Options;
 
 static gpointer setup_func(xmlNodePtr node);
+static void free_func(gpointer o);
 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, free_func, run_func);
+    actions_register("SessionLogout", setup_func, free_func, run_func);
 }
 
 static gpointer setup_func(xmlNodePtr node)
@@ -20,22 +23,41 @@ static gpointer setup_func(xmlNodePtr node)
     xmlNodePtr n;
     Options *o;
 
-    o = g_new0(Options, 1);
+    o = g_slice_new0(Options);
     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 free_func(gpointer o)
 {
-    if (result)
+    g_slice_free(Options, o);
+}
+
+static void do_exit(void)
+{
+    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);
 }
 
+
 /* Always return FALSE because its not interactive */
 static gboolean run_func(ObActionsData *data, gpointer options)
 {
@@ -48,12 +70,19 @@ static gboolean run_func(ObActionsData *data, gpointer options)
             { _("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;
 }