libwnck r1616 - in trunk: . libwnck

[vuntz svn gnome org]

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

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

	Unstick windows when moving them in another workspace (viewport mode),
	else the windows are just outside the visible screen.
	Fix bug #520704.
	Patch by Travis Watkins <amaranth ubuntu com>

	* libwnck/window-action-menu.c: (item_activated_callback): well, do
	what I already described


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:15:29 2008
@@ -208,13 +208,13 @@
       if (!viewport_mode)
         wnck_window_pin (window);
       else
-        wnck_window_stick(window);
+        wnck_window_stick (window);
       break;
     case UNPIN:
       if (!viewport_mode)
         wnck_window_unpin (window);
       else
-        wnck_window_unstick(window);
+        wnck_window_unstick (window);
       break;
     case LEFT:
       if (!viewport_mode)
@@ -230,6 +230,7 @@
 
           width = wnck_screen_get_width (screen);
           wnck_window_get_geometry (window, &xw, &yw, &ww, &hw);
+          wnck_window_unstick (window);
           wnck_window_set_geometry (window, 0,
                                     WNCK_WINDOW_CHANGE_X | WNCK_WINDOW_CHANGE_Y,
                                     xw - width, yw,
@@ -250,6 +251,7 @@
 
           width = wnck_screen_get_width (screen);
           wnck_window_get_geometry (window, &xw, &yw, &ww, &hw);
+          wnck_window_unstick (window);
           wnck_window_set_geometry (window, 0,
                                     WNCK_WINDOW_CHANGE_X | WNCK_WINDOW_CHANGE_Y,
                                     xw + width, yw,
@@ -270,6 +272,7 @@
 
           height = wnck_screen_get_height (screen);
           wnck_window_get_geometry (window, &xw, &yw, &ww, &hw);
+          wnck_window_unstick (window);
           wnck_window_set_geometry (window, 0,
                                     WNCK_WINDOW_CHANGE_X | WNCK_WINDOW_CHANGE_Y,
                                     xw, yw - height,
@@ -290,6 +293,7 @@
 
           height = wnck_screen_get_height (screen);
           wnck_window_get_geometry (window, &xw, &yw, &ww, &hw);
+          wnck_window_unstick (window);
           wnck_window_set_geometry (window, 0,
                                     WNCK_WINDOW_CHANGE_X | WNCK_WINDOW_CHANGE_Y,
                                     xw, yw + height,
@@ -336,6 +340,7 @@
           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,