/pidgin/main: d6229108ce71: Remove deprecated gtk_widget_size_re...

[Elliott Sales de Andrade]

Changeset: d6229108ce716cbce2c4c7677aa541b75c2fe048
Author:	 Elliott Sales de Andrade <qulogic at pidgin.im>
Date:	 2012-08-16 03:03 -0400
Branch:	 default
URL: http://hg.pidgin.im/pidgin/main/rev/d6229108ce71

Description:

Remove deprecated gtk_widget_size_request calls.

I'm not sure if the "natural size" is the correct analogue here, but it
seems to work in my testing.

diffstat:

 pidgin/gtk3compat.h        |   1 +
 pidgin/gtkmedia.c          |   2 +-
 pidgin/gtkstatusbox.c      |   6 +++---
 pidgin/gtkutils.c          |   2 +-
 pidgin/gtkwebviewtoolbar.c |  10 +++++-----
 5 files changed, 11 insertions(+), 10 deletions(-)

diffs (113 lines):

diff --git a/pidgin/gtk3compat.h b/pidgin/gtk3compat.h
--- a/pidgin/gtk3compat.h
+++ b/pidgin/gtk3compat.h
@@ -35,6 +35,7 @@
 #if !GTK_CHECK_VERSION(3,0,0)
 
 #define gdk_x11_window_get_xid GDK_WINDOW_XWINDOW
+#define gtk_widget_get_preferred_size(x,y,z) gtk_widget_size_request(x,z)
 
 #if !GTK_CHECK_VERSION(2,24,0)
 
diff --git a/pidgin/gtkmedia.c b/pidgin/gtkmedia.c
--- a/pidgin/gtkmedia.c
+++ b/pidgin/gtkmedia.c
@@ -443,7 +443,7 @@ pidgin_media_remove_widget(PidginMedia *
 
 		gtk_widget_destroy(widget);
 
-		gtk_widget_size_request(GTK_WIDGET(gtkmedia), &req);
+		gtk_widget_get_preferred_size(GTK_WIDGET(gtkmedia), NULL, &req);
 		gtk_window_resize(GTK_WINDOW(gtkmedia), req.width, req.height);
 	}
 }
diff --git a/pidgin/gtkstatusbox.c b/pidgin/gtkstatusbox.c
--- a/pidgin/gtkstatusbox.c
+++ b/pidgin/gtkstatusbox.c
@@ -1331,7 +1331,7 @@ pidgin_status_box_list_position (PidginS
 	             "hscrollbar-policy", hpolicy,
 	             "vscrollbar-policy", vpolicy,
 	             NULL);
-	gtk_widget_size_request(status_box->popup_frame, &popup_req);
+	gtk_widget_get_preferred_size(status_box->popup_frame, NULL, &popup_req);
 
 	if (popup_req.width > *width) {
 		hpolicy = GTK_POLICY_ALWAYS;
@@ -1339,7 +1339,7 @@ pidgin_status_box_list_position (PidginS
 		             "hscrollbar-policy", hpolicy,
 		             "vscrollbar-policy", vpolicy,
 		             NULL);
-		gtk_widget_size_request(status_box->popup_frame, &popup_req);
+		gtk_widget_get_preferred_size(status_box->popup_frame, NULL, &popup_req);
 	}
 
 	*height = popup_req.height;
@@ -2071,7 +2071,7 @@ pidgin_status_box_size_allocate(GtkWidge
 	GtkAllocation parent_alc, box_alc, icon_alc;
 	gint border_width = gtk_container_get_border_width(GTK_CONTAINER (widget));
 
-	gtk_widget_size_request(status_box->toggle_button, &req);
+	gtk_widget_get_preferred_size(status_box->toggle_button, NULL, &req);
 	/* Make this icon the same size as other buddy icons in the list; unless it already wants to be bigger */
 
 	req.height = MAX(req.height, 34);
diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -1201,7 +1201,7 @@ pidgin_menu_position_func_helper(GtkMenu
 	 * if a size_request was queued while we weren't popped up,
 	 * the requisition won't have been recomputed yet.
 	 */
-	gtk_widget_size_request (widget, &requisition);
+	gtk_widget_get_preferred_size(widget, NULL, &requisition);
 
 	monitor_num = gdk_screen_get_monitor_at_point (screen, *x, *y);
 
diff --git a/pidgin/gtkwebviewtoolbar.c b/pidgin/gtkwebviewtoolbar.c
--- a/pidgin/gtkwebviewtoolbar.c
+++ b/pidgin/gtkwebviewtoolbar.c
@@ -686,7 +686,7 @@ sort_smileys(struct smiley_button_list *
 	it_last = ls; /* list iterators */
 	image = gtk_image_new_from_file(filename);
 
-	gtk_widget_size_request(image, &size);
+	gtk_widget_get_preferred_size(image, NULL, &size);
 
 	if ((size.width > 24)
 	 && (gtk_webview_smiley_get_flags(smiley) & GTK_WEBVIEW_SMILEY_CUSTOM)) {
@@ -712,7 +712,7 @@ sort_smileys(struct smiley_button_list *
 					GDK_INTERP_HYPER);
 
 			gtk_image_set_from_pixbuf(GTK_IMAGE(image), resized); /* This unrefs pixbuf */
-			gtk_widget_size_request(image, &size);
+			gtk_widget_get_preferred_size(image, NULL, &size);
 			g_object_unref(G_OBJECT(resized));
 		}
 	}
@@ -894,7 +894,7 @@ insert_smiley_cb(GtkAction *smiley, GtkW
 			g_signal_connect_swapped(G_OBJECT(manage), "clicked",
 					G_CALLBACK(gtk_widget_destroy), dialog);
 			gtk_box_pack_end(GTK_BOX(vbox), manage, FALSE, TRUE, 0);
-			gtk_widget_size_request(manage, &req);
+			gtk_widget_get_preferred_size(manage, NULL, &req);
 			button_width = req.width;
 		}
 
@@ -946,7 +946,7 @@ insert_smiley_cb(GtkAction *smiley, GtkW
 	/* show everything */
 	gtk_widget_show_all(dialog);
 
-	gtk_widget_size_request(viewport, &req);
+	gtk_widget_get_preferred_size(viewport, NULL, &req);
 	gtk_widget_set_size_request(scrolled, MIN(300, req.width), MIN(290, req.height));
 
 	/* The window has to be made resizable, and the scrollbars in the scrolled window
@@ -1155,7 +1155,7 @@ menu_position_func(GtkMenu  *menu,
 	int savy;
 
 	gtk_widget_get_allocation(widget, &allocation);
-	gtk_widget_size_request(GTK_WIDGET(menu), &menu_req);
+	gtk_widget_get_preferred_size(GTK_WIDGET(menu), NULL, &menu_req);
 	gdk_window_get_origin(gtk_widget_get_window(widget), x, y);
 	*x += allocation.x;
 	*y += allocation.y + allocation.height;