X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=7379c0ee980224c1f67468405bc6c5d78718f2f1;hb=7317d17c76f3f38f92768541cb0fe370f9c88616;hp=0025187b8d989b1bda52de4f5f43393c15435e90;hpb=9290376bbbb8b29411f59a35e5477f25304fe205;p=chaz%2Fopenbox

diff --git a/openbox/action.c b/openbox/action.c
index 0025187b..7379c0ee 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -8,7 +8,6 @@
 #include "frame.h"
 #include "screen.h"
 #include "action.h"
-#include "dispatch.h"
 #include "openbox.h"
 
 #include <glib.h>
@@ -693,7 +692,7 @@ ObAction *action_from_string(char *name)
     return a;
 }
 
-ObAction *action_parse(xmlDocPtr doc, xmlNodePtr node)
+ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
 {
     char *actname;
     ObAction *act = NULL;
@@ -986,7 +985,7 @@ void action_send_to_desktop(union ActionData *data)
 
     if (data->sendto.desk < screen_num_desktops ||
         data->sendto.desk == DESKTOP_ALL) {
-        client_set_desktop(c, data->sendto.desk, data->sendtodir.follow);
+        client_set_desktop(c, data->sendto.desk, data->sendto.follow);
         if (data->sendto.follow)
             screen_set_desktop(data->sendto.desk);
     }
@@ -1218,7 +1217,7 @@ void action_send_to_desktop_up(union ActionData *data)
 
 void action_toggle_decorations(union ActionData *data)
 {
-    ObClient *c = data->client.c;;
+    ObClient *c = data->client.c;
 
     if (!c) return;