add exit and reconfigure actions

7 files changed, 47 insertions, 13 deletions

diff --git a/Makefile.am b/Makefile.am
index 0529ecd7..002b50cf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -158,6 +158,8 @@ openbox_openbox_SOURCES = \
 	openbox/actions/all.h \
 	openbox/actions/debug.c \
 	openbox/actions/execute.c \
+	openbox/actions/exit.c \
+	openbox/actions/reconfigure.c \
 	openbox/actions/showdesktop.c \
 	openbox/actions/showmenu.c \
 	openbox/actions.c \
diff --git a/openbox/action.c b/openbox/action.c
index 74a15620..eba3c95a 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -781,11 +781,6 @@ ActionString actionstrings[] =
         NULL
     },
     {
-        "reconfigure",
-        action_reconfigure,
-        NULL
-    },
-    {
         "restart",
         action_restart,
         NULL
@@ -1706,11 +1701,6 @@ void action_resize(union ActionData *data)
     moveresize_start(c, data->any.x, data->any.y, data->any.button, corner);
 }
 
-void action_reconfigure(union ActionData *data)
-{
-    ob_reconfigure();
-}
-
 void action_restart(union ActionData *data)
 {
     ob_restart_other(data->execute.path);
@@ -1718,7 +1708,6 @@ void action_restart(union ActionData *data)
 
 void action_exit(union ActionData *data)
 {
-    ob_exit(0);
 }
 
 void action_cycle_windows(union ActionData *data)
diff --git a/openbox/actions/all.c b/openbox/actions/all.c
index 077f394b..13068b7b 100644
--- a/openbox/actions/all.c
+++ b/openbox/actions/all.c
@@ -6,4 +6,6 @@ void action_all_startup()
     action_debug_startup();
     action_showmenu_startup();
     action_showdesktop_startup();
+    action_reconfigure_startup();
+    action_exit_startup();
 }
diff --git a/openbox/actions/all.h b/openbox/actions/all.h
index 75cce788..dadfc3f0 100644
--- a/openbox/actions/all.h
+++ b/openbox/actions/all.h
@@ -7,5 +7,7 @@ void action_execute_startup();
 void action_debug_startup();
 void action_showmenu_startup();
 void action_showdesktop_startup();
+void action_reconfigure_startup();
+void action_exit_startup();
 
 #endif
diff --git a/openbox/actions/exit.c b/openbox/actions/exit.c
new file mode 100644
index 00000000..68b5cef4
--- /dev/null
+++ b/openbox/actions/exit.c
@@ -0,0 +1,20 @@
+#include "openbox/actions.h"
+#include "openbox/openbox.h"
+
+static gboolean run_func(ObActionsData *data, gpointer options);
+
+void action_exit_startup()
+{
+    actions_register("Exit",
+                     NULL, NULL,
+                     run_func,
+                     NULL, NULL);
+}
+
+/* Always return FALSE because its not interactive */
+static gboolean run_func(ObActionsData *data, gpointer options)
+{
+    ob_exit(0);
+
+    return FALSE;
+}
diff --git a/openbox/actions/reconfigure.c b/openbox/actions/reconfigure.c
new file mode 100644
index 00000000..8802a37b
--- /dev/null
+++ b/openbox/actions/reconfigure.c
@@ -0,0 +1,20 @@
+#include "openbox/actions.h"
+#include "openbox/openbox.h"
+
+static gboolean run_func(ObActionsData *data, gpointer options);
+
+void action_reconfigure_startup()
+{
+    actions_register("Reconfigure",
+                     NULL, NULL,
+                     run_func,
+                     NULL, NULL);
+}
+
+/* Always return FALSE because its not interactive */
+static gboolean run_func(ObActionsData *data, gpointer options)
+{
+    ob_reconfigure();
+
+    return FALSE;
+}
diff --git a/openbox/actions/showdesktop.c b/openbox/actions/showdesktop.c
index 2699b1bc..8781f95d 100644
--- a/openbox/actions/showdesktop.c
+++ b/openbox/actions/showdesktop.c
@@ -6,8 +6,7 @@ static gboolean run_func(ObActionsData *data, gpointer options);
 void action_showdesktop_startup()
 {
     actions_register("ShowDesktop",
-                     NULL,
-                     NULL,
+                     NULL, NULL,
                      run_func,
                      NULL, NULL);
 }