Index: src/display.c
===================================================================
RCS file: /cvs/gnome/metacity/src/display.c,v
retrieving revision 1.261
diff -p -u -r1.261 display.c
--- src/display.c	19 Nov 2005 14:58:50 -0000	1.261
+++ src/display.c	21 Nov 2005 21:19:20 -0000
@@ -1338,14 +1338,12 @@ handle_net_moveresize_window (MetaDispla
 
   if (window)
     {
-      /* FIXME!!!!  I'm pretty sure this is wrong except _maybe_ for the
-       * resize-only case; see comment at beginning of
-       * meta_window_move_resize_internal().  Basically, this should act
-       * like a configure request--meaning that it should count as an app
-       * specified change instead of a user one, and the position needs to
-       * be fixed up with adjust_for_gravity().  In particular,
-       * meta_window_resize_with_gravity(), meta_window_resize(), and
-       * meta_window_move_resize() should probably NOT be called.
+      /* FIXME!!!!  This function is _wrong_ except for the resize-only
+       * case.  Even then, it sucks to special case the code instead of
+       * factoring out common functionality with the configure reqest
+       * handling, especially since the EWMH says this message should be
+       * treated identically to a configure request with the exception of
+       * having a special gravity specified.
        */
       meta_window_get_gravity_position (window, &x, &y);
       width = window->rect.width;
@@ -1369,20 +1367,20 @@ handle_net_moveresize_window (MetaDispla
         {
           if (gravity)
 	    meta_window_resize_with_gravity (window,
-					     TRUE,
+					     FALSE,
 					     width,
 					     height,
 					     gravity);
           else
             meta_window_resize (window,
-				TRUE,
+				FALSE,
 				width,
 				height);
         }
       else
         {
           meta_window_move_resize (window,
-                                   TRUE,
+                                   FALSE,
                                    x,
                                    y,
                                    width,
Index: src/window.c
===================================================================
RCS file: /cvs/gnome/metacity/src/window.c,v
retrieving revision 1.397
diff -p -u -r1.397 window.c
--- src/window.c	19 Nov 2005 14:58:50 -0000	1.397
+++ src/window.c	21 Nov 2005 21:19:20 -0000
@@ -2138,7 +2138,7 @@ meta_window_unmaximize (MetaWindow      
         }
 
       meta_window_move_resize (window,
-                               TRUE,
+                               FALSE,
                                window->saved_rect.x,
                                window->saved_rect.y,
                                window->saved_rect.width,
@@ -2213,7 +2213,7 @@ meta_window_unmake_fullscreen (MetaWindo
       window->fullscreen = FALSE;
 
       meta_window_move_resize (window,
-                               TRUE,
+                               FALSE,
                                window->saved_rect.x,
                                window->saved_rect.y,
                                window->saved_rect.width,
@@ -6345,7 +6345,7 @@ meta_window_shove_titlebar_onscreen (Met
   newx = outer_rect.x + window->frame->child_x;
   newy = outer_rect.y + window->frame->child_y;
   meta_window_move_resize (window,
-                           TRUE,
+                           FALSE,
                            newx,
                            newy,
                            window->rect.width, 
