merge the C branch into HEAD

[chaz/openbox] / src / actions.cc

diff --git a/src/actions.cc b/src/actions.cc
index c629006aeedd5f8ef9b47851c811a5e26cd1cd49..36b4f111acb72ddf7133115ce61411c7cede0c0d 100644 (file)
--- a/src/actions.cc
+++ b/src/actions.cc
@@ -290,8 +290,8 @@ void Actions::motionHandler(const XMotionEvent &e)
   // compress changes to a window into a single change
   XEvent ce;
   while (XCheckTypedWindowEvent(**otk::display, e.window, e.type, &ce)) {
-    x_root = e.x_root;
-    y_root = e.y_root;
+    x_root = ce.x_root;
+    y_root = ce.y_root;
   }
 
   int screen;