X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmouse.c;h=dca6e6baf6604c9ead3dd2e577a4b04b638b6f5f;hb=5563e251c36a1fbda703cf4bc3c8c6ae543829bd;hp=782ea62cb1579321a1aefd8aff846932996d9677;hpb=a2f5a826a1ed79102cd59a9ef17724fb90afe86b;p=chaz%2Fopenbox

diff --git a/openbox/mouse.c b/openbox/mouse.c
index 782ea62c..dca6e6ba 100644
--- a/openbox/mouse.c
+++ b/openbox/mouse.c
@@ -22,7 +22,6 @@
 #include "actions.h"
 #include "event.h"
 #include "client.h"
-#include "prop.h"
 #include "grab.h"
 #include "frame.h"
 #include "translate.h"
@@ -237,7 +236,7 @@ void mouse_event(ObClient *client, XEvent *e)
 
         if (CLIENT_CONTEXT(context, client)) {
             /* Replay the event, so it goes to the client*/
-            XAllowEvents(ob_display, ReplayPointer, event_curtime);
+            XAllowEvents(obt_display, ReplayPointer, event_curtime);
             /* Fall through to the release case! */
         } else
             break;
@@ -257,10 +256,10 @@ void mouse_event(ObClient *client, XEvent *e)
             Window wjunk;
             guint ujunk, b, w, h;
             /* this can cause errors to occur when the window closes */
-            obt_display_ignore_errors(ob_display, TRUE);
-            junk1 = XGetGeometry(ob_display, e->xbutton.window,
+            obt_display_ignore_errors(TRUE);
+            junk1 = XGetGeometry(obt_display, e->xbutton.window,
                                  &wjunk, &junk1, &junk2, &w, &h, &b, &ujunk);
-            obt_display_ignore_errors(ob_display, FALSE);
+            obt_display_ignore_errors(FALSE);
             if (junk1) {
                 if (e->xbutton.x >= (signed)-b &&
                     e->xbutton.y >= (signed)-b &&