[gtk+/toplevel-embedding: 12/12] Fixed conflict while rebasing master.

[Tristan Van Berkom <tvb src gnome org>]

commit e40b77b569541c71e89738861678b55a39adcc3d
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Mon Dec 27 15:02:01 2010 +0900

    Fixed conflict while rebasing master.

 gtk/gtkwindow.c |   11 -----------
 1 files changed, 0 insertions(+), 11 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 0068ea9..112227b 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -5251,11 +5251,6 @@ gtk_window_size_allocate (GtkWidget     *widget,
 	}
       else
 	{
-	  if (priv->frame)
-	    gdk_window_resize (priv->frame,
-			       allocation->width + priv->frame_left + priv->frame_right,
-			       allocation->height + priv->frame_top + priv->frame_bottom);
-	  
 	  update_grip_visibility (window);
 	  set_grip_position (window);
 	}
@@ -5274,12 +5269,6 @@ gtk_window_size_allocate (GtkWidget     *widget,
 
       gtk_widget_size_allocate (child, &child_allocation);
     }
-
-  if (gtk_widget_get_realized (widget))
-    {
-      update_grip_visibility (window);
-      set_grip_position (window);
-    }
 }
 
 static gint