Merge branch 'backport' into work

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

diff --git a/openbox/actions/restart.c b/openbox/actions/restart.c
index 0afe8bf016c68f9415b9095deb7ff3fdb7c78cf5..01de4f9a752ee9c62803c9ddfccef416df8aa096 100644 (file)
--- a/openbox/actions/restart.c
+++ b/openbox/actions/restart.c
@@ -1,5 +1,6 @@
 #include "openbox/actions.h"
 #include "openbox/openbox.h"
+#include "obt/paths.h"
 
 typedef struct {
     gchar   *cmd;
@@ -11,7 +12,7 @@ static gboolean run_func(ObActionsData *data, gpointer options);
 
 void action_restart_startup(void)
 {
-    actions_register("Restart", setup_func, free_func, run_func, NULL, NULL);
+    actions_register("Restart", setup_func, free_func, run_func);
 }
 
 static gpointer setup_func(xmlNodePtr node)
@@ -25,7 +26,7 @@ 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);
     }
     return o;