X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Fexecute.c;h=a857b1b83e45e242d5c411872b289e5b0722b9ce;hb=c907f5af4ad16b1;hp=7e58fe7c7c0178ea9550d14b00f8de2853df1a52;hpb=8514c1b98cb946bf320ab30ab0785eb9154f0ac9;p=chaz%2Fopenbox

diff --git a/openbox/actions/execute.c b/openbox/actions/execute.c
index 7e58fe7c..a857b1b8 100644
--- a/openbox/actions/execute.c
+++ b/openbox/actions/execute.c
@@ -4,6 +4,10 @@
 #include "openbox/screen.h"
 #include "gettext.h"
 
+#ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+#endif
+
 typedef struct {
     gchar   *cmd;
     gboolean sn;
@@ -23,7 +27,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 +43,9 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
 
     o = g_new0(Options, 1);
 
-    if ((n = parse_find_node("command", 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);
@@ -102,6 +108,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
             program = g_path_get_basename(argv[0]);
             /* sets up the environment */
             sn_setup_spawn_environment(program, o->sn_name, o->sn_icon,
+                                       o->sn_wmclass,
                                        /* launch it on the current desktop */
                                        screen_desktop);
         }