[gtk+/extended-layout-jhs: 48/64] Repair sizing algorithm - gtk_socket_size_request and

[Johannes Schmid <jhs src gnome org>]

commit 7090278582c0373da11605fc484f4e60f8d6fb98
Author: Mathias Hasselmann <mathias hasselmann gmx de>
Date:   Mon Aug 6 09:42:03 2007 +0000

    Repair sizing algorithm - gtk_socket_size_request and
    
    2007-08-06  Mathias Hasselmann  <mathias hasselmann gmx de>
    
    	* gtk/gtksocket.c: Repair sizing algorithm - gtk_socket_size_request
    	and gtk_socket_extended_layout_get_natural_size were calling each
    	other's windowing backend function. Was I drunk when commiting the
    	previous revision?
    
    svn path=/branches/extended-layout/; revision=18576

 ChangeLog.gtk-extended-layout |    7 +++++++
 gtk/gtksocket.c               |    4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog.gtk-extended-layout b/ChangeLog.gtk-extended-layout
index 9b8843b..2efa5d5 100644
--- a/ChangeLog.gtk-extended-layout
+++ b/ChangeLog.gtk-extended-layout
@@ -1,3 +1,10 @@
+2007-08-06  Mathias Hasselmann  <mathias hasselmann gmx de>
+
+	* gtk/gtksocket.c: Repair sizing algorithm - gtk_socket_size_request
+	and gtk_socket_extended_layout_get_natural_size were calling each
+	other's windowing backend function. Was I drunk when commiting the
+	previous revision?
+
 2007-08-01  Mathias Hasselmann  <mathias hasselmann gmx de>
 
 	* gtk/gtkcellrenderertext.c: Provide natural size information.
diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index dba1148..c8061c6 100644
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -401,7 +401,7 @@ gtk_socket_size_request (GtkWidget      *widget,
   else
     {
       if (socket->is_mapped && !socket->have_size && socket->plug_window)
-	_gtk_socket_windowing_get_natural_size (socket);
+	_gtk_socket_windowing_size_request (socket);
 
       if (socket->is_mapped && socket->have_size)
 	{
@@ -1030,7 +1030,7 @@ gtk_socket_extended_layout_get_natural_size (GtkExtendedLayout *layout,
       priv = _gtk_socket_get_private (socket);
 
       if (socket->is_mapped && !priv->have_natural_size && socket->plug_window)
-	_gtk_socket_windowing_size_request (socket);
+	_gtk_socket_windowing_get_natural_size (socket);
 
       if (socket->is_mapped && priv->have_natural_size)
 	{