X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Fexecute.c;h=02de01549d9ccac0a88a91c58d4588c6ff78dc90;hb=0ce14a727968736e57fb3fabba3794b46903875f;hp=606bb15326dd4836fda8ce14dda1ce272d190e2f;hpb=b76ec18d1c8857cf32598c822364298fc535c84e;p=chaz%2Fopenbox

diff --git a/openbox/actions/execute.c b/openbox/actions/execute.c
index 606bb153..02de0154 100644
--- a/openbox/actions/execute.c
+++ b/openbox/actions/execute.c
@@ -23,7 +23,7 @@ static gboolean i_input_func(guint initial_state,
 static void     i_cancel_func(gpointer options);
 */
 
-void action_execute_startup()
+void action_execute_startup(void)
 {
     actions_register("Execute",
                      setup_func,
@@ -39,7 +39,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);
@@ -103,8 +105,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
             /* sets up the environment */
             sn_setup_spawn_environment(program, o->sn_name, o->sn_icon,
                                        /* launch it on the current desktop */
-                                       screen_desktop,
-                                       data->time);
+                                       screen_desktop);
         }
 
         if (!g_spawn_async(NULL, argv, NULL,