diff options
| author | Elliott Sales de Andrade <qulogic@pidgin.im> | 2012-08-16 03:03:50 -0400 |
|---|---|---|
| committer | Elliott Sales de Andrade <qulogic@pidgin.im> | 2012-08-16 03:03:50 -0400 |
| commit | 72888312b4d4d8bf11b8a8794ef034afcc55a228 (patch) | |
| tree | adb6b0135dcb3a03936191328895394da7517e82 /pidgin/gtkwebviewtoolbar.c | |
| parent | 3e41375eb4c8a7c4b0693ffdad5f36091e308ee5 (diff) | |
| download | pidgin-72888312b4d4d8bf11b8a8794ef034afcc55a228.tar.gz | |
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 (limited to 'pidgin/gtkwebviewtoolbar.c')
| -rw-r--r-- | pidgin/gtkwebviewtoolbar.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pidgin/gtkwebviewtoolbar.c b/pidgin/gtkwebviewtoolbar.c index ef9638029d..eb9e4be236 100644 --- a/pidgin/gtkwebviewtoolbar.c +++ b/pidgin/gtkwebviewtoolbar.c @@ -686,7 +686,7 @@ sort_smileys(struct smiley_button_list *ls, GtkWebViewToolbar *toolbar, 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 *ls, GtkWebViewToolbar *toolbar, 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, GtkWebViewToolbar *toolbar) 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, GtkWebViewToolbar *toolbar) /* 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; |