Merge branch 'backport' into work

[chaz/openbox] / openbox / mouse.c

diff --git a/openbox/mouse.c b/openbox/mouse.c
index 5a9fe170b8c018d9108f80468c91b72526f91325..dca6e6baf6604c9ead3dd2e577a4b04b638b6f5f 100644 (file)
--- 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;
@@ -258,7 +257,7 @@ void mouse_event(ObClient *client, XEvent *e)
             guint ujunk, b, w, h;
             /* this can cause errors to occur when the window closes */
             obt_display_ignore_errors(TRUE);
-            junk1 = XGetGeometry(ob_display, e->xbutton.window,
+            junk1 = XGetGeometry(obt_display, e->xbutton.window,
                                  &wjunk, &junk1, &junk2, &w, &h, &b, &ujunk);
             obt_display_ignore_errors(FALSE);
             if (junk1) {