make menu event handling work more like how other events are handled, less special...

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

diff --git a/openbox/actions/execute.c b/openbox/actions/execute.c
index 51bcaac21c0485bcadc3f7bd55233e9dc94a0e20..5a7472706bc99b2a58ee48a4430e9a85ef4e3732 100644 (file)
--- a/openbox/actions/execute.c
+++ b/openbox/actions/execute.c
@@ -2,6 +2,7 @@
 #include "openbox/event.h"
 #include "openbox/startupnotify.h"
 #include "openbox/screen.h"
+#include "obt/paths.h"
 #include "gettext.h"
 
 typedef struct {
@@ -39,19 +40,19 @@ static gpointer setup_func(xmlNodePtr node)
         (n = obt_parse_find_node(node, "execute")))
     {
         gchar *s = obt_parse_node_string(n);
-        o->cmd = parse_expand_tilde(s);
+        o->cmd = obt_paths_expand_tilde(s);
         g_free(s);
     }
 
     if ((n = obt_parse_find_node(node, "startupnotify"))) {
         xmlNodePtr m;
-        if ((m = obt_parse_find_node(n->xmlChildrenNode, "enabled")))
+        if ((m = obt_parse_find_node(n->children, "enabled")))
             o->sn = obt_parse_node_bool(m);
-        if ((m = obt_parse_find_node(n->xmlChildrenNode, "name")))
+        if ((m = obt_parse_find_node(n->children, "name")))
             o->sn_name = obt_parse_node_string(m);
-        if ((m = obt_parse_find_node(n->xmlChildrenNode, "icon")))
+        if ((m = obt_parse_find_node(n->children, "icon")))
             o->sn_icon = obt_parse_node_string(m);
-        if ((m = obt_parse_find_node(n->xmlChildrenNode, "wmclass")))
+        if ((m = obt_parse_find_node(n->children, "wmclass")))
             o->sn_wmclass = obt_parse_node_string(m);
     }
     return o;