merge r5946 from trunk

diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 25131435644ec5ccccb19cc0a652aed74330e8f3..cf9bfcbf5c7cd41c4c72e2d954626f7cca4a7ea0 100644 (file)
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -240,30 +240,30 @@ static void menu_frame_place_topmenu(ObMenuFrame *self, gint *x, gint *y)
         myy = *y;
 
         /* try to the bottom right of the cursor */
-        menu_frame_move_on_screen(self, myx, *y, &dx, &dy);
+        menu_frame_move_on_screen(self, myx, myy, &dx, &dy);
         if (dx != 0 || dy != 0) {
             /* try to the bottom left of the cursor */
             myx = *x - self->area.width;
             myy = *y;
-            menu_frame_move_on_screen(self, myx, *y, &dx, &dy);
+            menu_frame_move_on_screen(self, myx, myy, &dx, &dy);
         }
         if (dx != 0 || dy != 0) {
             /* try to the top right of the cursor */
             myx = *x;
             myy = *y - self->area.height;
-            menu_frame_move_on_screen(self, myx, *y, &dx, &dy);
+            menu_frame_move_on_screen(self, myx, myy, &dx, &dy);
         }
         if (dx != 0 || dy != 0) {
             /* try to the top left of the cursor */
             myx = *x - self->area.width;
             myy = *y - self->area.height;
-            menu_frame_move_on_screen(self, myx, *y, &dx, &dy);
+            menu_frame_move_on_screen(self, myx, myy, &dx, &dy);
         }
         if (dx != 0 || dy != 0) {
             /* if didnt fit on either side so just use what it says */
             myx = *x;
             myy = *y;
-            menu_frame_move_on_screen(self, myx, *y, &dx, &dy);
+            menu_frame_move_on_screen(self, myx, myy, &dx, &dy);
         }
         *x = myx + dx;
         *y = myy + dy;