libwnck r1617 - in trunk: . libwnck

[vuntz svn gnome org]

Author: vuntz
Date: Wed Mar 19 14:25:42 2008
New Revision: 1617
URL: http://svn.gnome.org/viewvc/libwnck?rev=1617&view=rev

Log:
2008-03-19  Vincent Untz  <vuntz gnome org>

	Fix moving a window to an arbitrary workspace in viewport mode.
	Fix bug #520726.

	* libwnck/window-action-menu.c: (item_activated_callback): get the
	maths right.


Modified:
   trunk/ChangeLog
   trunk/libwnck/window-action-menu.c

Modified: trunk/libwnck/window-action-menu.c
==============================================================================
--- trunk/libwnck/window-action-menu.c	(original)
+++ trunk/libwnck/window-action-menu.c	Wed Mar 19 14:25:42 2008
@@ -337,14 +337,11 @@
           viewport_x = wnck_workspace_get_viewport_x (workspace);
           viewport_y = wnck_workspace_get_viewport_y (workspace);
 
-          xw += viewport_x;
-          yw += viewport_y;
-
           wnck_window_unstick (window);
           wnck_window_set_geometry (window, 0,
                                     WNCK_WINDOW_CHANGE_X | WNCK_WINDOW_CHANGE_Y,
-                                    xw + new_viewport_x,
-                                    yw + new_viewport_y,
+                                    xw + new_viewport_x - viewport_x,
+                                    yw + new_viewport_y - viewport_y,
                                     ww, hw);
         }
       break;