[nautilus/rendering-cleanup: 15/15] Revert "Use gtk_size_request_get_size()"

[Christian Persch <chpe src gnome org>]

commit 34e76fad08de53d5822af8b59f214c29a50d50cb
Author: Christian Persch <chpe gnome org>
Date:   Sun Sep 26 20:07:15 2010 +0200

    Revert "Use gtk_size_request_get_size()"
    
    This reverts commit 36836b7dc517a588b34117e05a45bc4026e77f71.
    
    Conflicts:
    
    	eel/eel-editable-label.c
    	libnautilus-private/nautilus-horizontal-splitter.c
    	libnautilus-private/nautilus-icon-container.c
    	src/nautilus-pathbar.c
    	src/nautilus-side-pane.c

 src/nautilus-pathbar.c        |    9 +++------
 src/nautilus-side-pane.c      |    3 +--
 src/nautilus-spatial-window.c |    6 ++----
 src/nautilus-zoom-control.c   |    6 ++----
 4 files changed, 8 insertions(+), 16 deletions(-)
---
diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c
index 06579de..c7206af 100644
--- a/src/nautilus-pathbar.c
+++ b/src/nautilus-pathbar.c
@@ -476,8 +476,7 @@ nautilus_path_bar_size_request (GtkWidget      *widget,
 
 	for (list = path_bar->button_list; list; list = list->next) {
 		button_data = BUTTON_DATA (list->data);
-		gtk_size_request_get_size (GTK_SIZE_REQUEST (button_data->button),
-							     &child_requisition, NULL);
+                gtk_widget_size_request (button_data->button, &child_requisition);
                 requisition->width = MAX (child_requisition.width, requisition->width);
                 requisition->height = MAX (child_requisition.height, requisition->height);
         }
@@ -491,10 +490,8 @@ nautilus_path_bar_size_request (GtkWidget      *widget,
 		requisition->width += (path_bar->spacing + path_bar->slider_width) * 2;
 	}
 
-	gtk_size_request_get_size (GTK_SIZE_REQUEST (path_bar->up_slider_button),
-				   &child_requisition, NULL);
-	gtk_size_request_get_size (GTK_SIZE_REQUEST (path_bar->down_slider_button),
-				   &child_requisition, NULL);
+        gtk_widget_size_request (path_bar->up_slider_button, &child_requisition);
+        gtk_widget_size_request (path_bar->down_slider_button, &child_requisition);
 
 	border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
         requisition->width += border_width * 2;
diff --git a/src/nautilus-side-pane.c b/src/nautilus-side-pane.c
index a2cbf6b..0b80862 100644
--- a/src/nautilus-side-pane.c
+++ b/src/nautilus-side-pane.c
@@ -242,8 +242,7 @@ select_button_press_callback (GtkWidget *widget,
                 gtk_widget_get_allocation (widget, &allocation);
                 width = allocation.width;
                 gtk_widget_set_size_request (side_pane->details->menu, -1, -1);
-                gtk_size_request_get_size (GTK_SIZE_REQUEST (side_pane->details->menu),
-					   &requisition, NULL);
+                gtk_widget_size_request (side_pane->details->menu, &requisition);
                 gtk_widget_set_size_request (side_pane->details->menu,
                                              MAX (width, requisition.width), -1);
 
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index 67c4a89..86575f0 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -607,10 +607,8 @@ menu_popup_pos (GtkMenu   *menu,
 
 	widget = user_data;
 
-	gtk_size_request_get_size (GTK_SIZE_REQUEST (menu),
-				   &menu_requisition, NULL);
-	gtk_size_request_get_size (GTK_SIZE_REQUEST (widget),
-				   &button_requisition, NULL);
+	gtk_widget_size_request (GTK_WIDGET (menu), &menu_requisition);
+	gtk_widget_size_request (widget, &button_requisition);
 	gtk_widget_get_allocation (widget, &allocation);
 
 	gdk_window_get_origin (gtk_widget_get_window (widget), x, y);
diff --git a/src/nautilus-zoom-control.c b/src/nautilus-zoom-control.c
index 118574e..bb06c48 100644
--- a/src/nautilus-zoom-control.c
+++ b/src/nautilus-zoom-control.c
@@ -148,10 +148,8 @@ menu_position_under_widget (GtkMenu   *menu,
 	container = gtk_widget_get_ancestor (widget, GTK_TYPE_CONTAINER);
 	g_assert (container != NULL);
 
-	gtk_size_request_get_size (GTK_SIZE_REQUEST (menu),
-				   &menu_req, NULL);
-	gtk_size_request_get_size (GTK_SIZE_REQUEST (widget),
-				   &req, NULL);
+	gtk_widget_size_request (widget, &req);
+	gtk_widget_size_request (GTK_WIDGET (menu), &menu_req);
 	gtk_widget_get_allocation (widget, &allocation);
 
 	screen = gtk_widget_get_screen (GTK_WIDGET (menu));