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

diff --git a/openbox/actions/execute.c b/openbox/actions/execute.c
index 7e58fe7c..ff73bf2b 100644
--- a/openbox/actions/execute.c
+++ b/openbox/actions/execute.c
@@ -2,8 +2,13 @@
 #include "openbox/event.h"
 #include "openbox/startupnotify.h"
 #include "openbox/screen.h"
+#include "obt/paths.h"
 #include "gettext.h"
 
+#ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+#endif
+
 typedef struct {
     gchar   *cmd;
     gboolean sn;
@@ -12,7 +17,7 @@ typedef struct {
     gchar   *sn_wmclass;
 } Options;
 
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_func(xmlNodePtr node);
 static void     free_func(gpointer options);
 static gboolean run_func(ObActionsData *data, gpointer options);
 /*
@@ -23,38 +28,36 @@ 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,
-                     free_func,
-                     run_func,
-                     NULL, NULL);
+    actions_register("Execute", setup_func, free_func, run_func, NULL, NULL);
 }
 
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+static gpointer setup_func(xmlNodePtr node)
 {
     xmlNodePtr n;
     Options *o;
 
     o = g_new0(Options, 1);
 
-    if ((n = parse_find_node("command", node))) {
-        gchar *s = parse_string(doc, n);
-        o->cmd = parse_expand_tilde(s);
+    if ((n = obt_parse_find_node(node, "command")) ||
+        (n = obt_parse_find_node(node, "execute")))
+    {
+        gchar *s = obt_parse_node_string(n);
+        o->cmd = obt_paths_expand_tilde(s);
         g_free(s);
     }
 
-    if ((n = parse_find_node("startupnotify", node))) {
+    if ((n = obt_parse_find_node(node, "startupnotify"))) {
         xmlNodePtr m;
-        if ((m = parse_find_node("enabled", n->xmlChildrenNode)))
-            o->sn = parse_bool(doc, m);
-        if ((m = parse_find_node("name", n->xmlChildrenNode)))
-            o->sn_name = parse_string(doc, m);
-        if ((m = parse_find_node("icon", n->xmlChildrenNode)))
-            o->sn_icon = parse_string(doc, m);
-        if ((m = parse_find_node("wmclass", n->xmlChildrenNode)))
-            o->sn_wmclass = parse_string(doc, m);
+        if ((m = obt_parse_find_node(n->children, "enabled")))
+            o->sn = obt_parse_node_bool(m);
+        if ((m = obt_parse_find_node(n->children, "name")))
+            o->sn_name = obt_parse_node_string(m);
+        if ((m = obt_parse_find_node(n->children, "icon")))
+            o->sn_icon = obt_parse_node_string(m);
+        if ((m = obt_parse_find_node(n->children, "wmclass")))
+            o->sn_wmclass = obt_parse_node_string(m);
     }
     return o;
 }
@@ -83,7 +86,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
     if (!o->cmd) return FALSE;
     cmd = g_filename_from_utf8(o->cmd, -1, NULL, NULL, NULL);
     if (!cmd) {
-        g_message(_("Failed to convert the path '%s' from utf8"), o->cmd);
+        g_message(_("Failed to convert the path \"%s\" from utf8"), o->cmd);
         return FALSE;
     }
 
@@ -92,7 +95,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
     event_cancel_all_key_grabs();
 
     if (!g_shell_parse_argv(cmd, NULL, &argv, &e)) {
-        g_message(_("Failed to execute '%s': %s"), o->cmd, e->message);
+        g_message(_("Failed to execute \"%s\": %s"), o->cmd, e->message);
         g_error_free(e);
     }
     else {
@@ -102,6 +105,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);
         }
@@ -110,7 +114,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
                            G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
                            NULL, NULL, NULL, &e))
         {
-            g_message(_("Failed to execute '%s': %s"), o->cmd, e->message);
+            g_message(_("Failed to execute \"%s\": %s"), o->cmd, e->message);
             g_error_free(e);
 
             if (o->sn)