Index: metacity/ChangeLog
===================================================================
RCS file: /export/cvs/head/metacity/ChangeLog,v
retrieving revision 1.937
diff -p -u -5 -r1.937 ChangeLog
--- metacity/ChangeLog	2005/01/10 05:10:33	1.937
+++ metacity/ChangeLog	2005/01/10 06:42:47
@@ -1,5 +1,12 @@
+2005-01-10  Leena Gunda  <leena.gunda@wipro.com>
+
+	* src/display.c (meta_display_begin_grab_op,
+	meta_display_end_grab_op):
+	* src/window.c (update_move): Don't do the wireframe effects for 
+	double-click on window to maximize/unmaximize. Fixes bug #161239.
+
 2005-01-09  Elijah Newren  <newren@gmail.com>
 
 	* configure.in: post-release version bump to 2.9.5
 
 2005-01-09  Elijah Newren  <newren@gmail.com>
Index: metacity/src/display.c
===================================================================
RCS file: /export/cvs/head/metacity/src/display.c,v
retrieving revision 1.245
diff -p -u -5 -r1.245 display.c
--- metacity/src/display.c	2005/01/10 00:27:00	1.245
+++ metacity/src/display.c	2005/01/10 06:42:47
@@ -3218,13 +3218,14 @@ meta_display_begin_grab_op (MetaDisplay 
           
           meta_window_calc_showing (display->grab_window);
 
           meta_window_get_xor_rect (window, &display->grab_wireframe_rect,
                                     &xor_rect);
-          
-          meta_effects_begin_wireframe (display->grab_window->screen,
-                                        &xor_rect);
+         
+          if (!display->is_double_click) 
+            meta_effects_begin_wireframe (display->grab_window->screen,
+                                          &xor_rect);
           display->grab_wireframe_last_xor_rect = xor_rect;
         }
       
 #ifdef HAVE_XSYNC
       if (!display->grab_wireframe_active &&
@@ -3356,12 +3357,14 @@ meta_display_end_grab_op (MetaDisplay *d
     }
   
   if (display->grab_wireframe_active)
     {
       display->grab_wireframe_active = FALSE;
-      meta_effects_end_wireframe (display->grab_window->screen,
-                                  &display->grab_wireframe_last_xor_rect);
+
+      if (!display->is_double_click)
+        meta_effects_end_wireframe (display->grab_window->screen,
+                                    &display->grab_wireframe_last_xor_rect);
       if (!display->grab_was_cancelled)
         meta_window_move_resize (display->grab_window,
                                  TRUE,
                                  display->grab_wireframe_rect.x,
                                  display->grab_wireframe_rect.y,
Index: metacity/src/window.c
===================================================================
RCS file: /export/cvs/head/metacity/src/window.c,v
retrieving revision 1.361
diff -p -u -5 -r1.361 window.c
--- metacity/src/window.c	2005/01/10 00:27:00	1.361
+++ metacity/src/window.c	2005/01/10 06:42:47
@@ -6120,11 +6120,12 @@ update_move (MetaWindow  *window,
 
   /* don't allow a maximized window to move */
   if (window->maximized)
     return;
 
-  if (window->display->grab_wireframe_active)
+  if (window->display->grab_wireframe_active && 
+      !meta_display_is_double_click (window->display))
     {
       /* FIXME Horribly broken, does not honor position
        * constraints
        */
       MetaRectangle new_xor;
