Combine the Exit and SessionLogout actions

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

diff --git a/openbox/actions/restart.c b/openbox/actions/restart.c
index f7f1dfc0bb40f954b8496990bdeaf4603465b757..4b52f9d36f4ee222bae649a4c71caead045d4791 100644 (file)
--- a/openbox/actions/restart.c
+++ b/openbox/actions/restart.c
@@ -9,7 +9,7 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
 static void     free_func(gpointer options);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
-void action_restart_startup()
+void action_restart_startup(void)
 {
     actions_register("Restart",
                      setup_func,
@@ -25,7 +25,9 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
 
     o = g_new0(Options, 1);
 
-    if ((n = parse_find_node("execute", node))) {
+    if ((n = parse_find_node("command", node)) ||
+        (n = parse_find_node("execute", node)))
+    {
         gchar *s = parse_string(doc, n);
         o->cmd = parse_expand_tilde(s);
         g_free(s);