From 7e395411a8ef934accc205f34b4c67e03282a2dc Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Wed, 7 Nov 2012 19:27:12 +0200 Subject: [editable-label] use gtk_widget_get_preferred_size() for GTK3 and gtk_widget_size_request() for GTK2 http://git.gnome.org/browse/nautilus/commit/?id=4963a3c9e5526ffd139b1b0b5bff18b6ea91a717 --- eel/eel-editable-label.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/eel/eel-editable-label.c b/eel/eel-editable-label.c index 57386f88..5a916aed 100644 --- a/eel/eel-editable-label.c +++ b/eel/eel-editable-label.c @@ -1216,7 +1216,11 @@ get_layout_location (EelEditableLabel *label, if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_LTR) xalign = 1.0 - xalign; - gtk_widget_get_child_requisition (widget, &req); +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_get_preferred_size (widget, &req, NULL); +#else + gtk_widget_size_request (widget, &req); +#endif gtk_misc_get_padding (misc, &xpad, &ypad); gtk_widget_get_allocation (widget, &allocation); -- cgit v1.2.1