X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=plugins%2Fmouse%2Fmouse.c;h=26b23cd8797a534187271c73f81955b27f7747f9;hb=bcc090ec83fe26b6b3afa144033c38021f49c400;hp=0bfe602c7cb936647785a9a78d98b70b1356097c;hpb=d2857b11944146e2e6973b7f7280cb57e1ee260b;p=chaz%2Fopenbox

diff --git a/plugins/mouse/mouse.c b/plugins/mouse/mouse.c
index 0bfe602c..26b23cd8 100644
--- a/plugins/mouse/mouse.c
+++ b/plugins/mouse/mouse.c
@@ -5,15 +5,14 @@
 #include "kernel/client.h"
 #include "kernel/prop.h"
 #include "kernel/grab.h"
-#include "kernel/parse.h"
 #include "kernel/frame.h"
+#include "parser/parse.h"
 #include "translate.h"
 #include "mouse.h"
 #include <glib.h>
 
 static int threshold;
 static int dclicktime;
-
 /*
 
 <context name="Titlebar"> 
@@ -59,7 +58,7 @@ static void parse_xml(xmlDocPtr doc, xmlNodePtr node, void *d)
                 goto next_nbut;
             nact = parse_find_node("action", nbut->xmlChildrenNode);
             while (nact) {
-                if ((action = parse_action(doc, nact))) {
+                if ((action = action_parse(doc, nact))) {
                     /* validate that its okay for a mouse binding*/
                     if (mact == MouseAction_Motion) {
                         if (action->func != action_moveresize ||
@@ -275,12 +274,10 @@ static void event(ObEvent *e, void *foo)
         context = frame_context(e->data.x.client,
                                 e->data.x.e->xbutton.window);
 
-        if (!button) {
-            px = e->data.x.e->xbutton.x_root;
-            py = e->data.x.e->xbutton.y_root;
-            button = e->data.x.e->xbutton.button;
-            state = e->data.x.e->xbutton.state;
-        }
+        px = e->data.x.e->xbutton.x_root;
+        py = e->data.x.e->xbutton.y_root;
+        button = e->data.x.e->xbutton.button;
+        state = e->data.x.e->xbutton.state;
 
         fire_button(MouseAction_Press, context,
                     e->data.x.client, e->data.x.e->xbutton.state,