summaryrefslogtreecommitdiff
path: root/libcaja-private
diff options
context:
space:
mode:
authorJasmine Hassan <[email protected]>2012-11-08 00:14:30 +0200
committerJasmine Hassan <[email protected]>2012-11-16 09:45:52 +0200
commite5b2fbf43e1c1ad5552abb004e5ebc4beb17ce2c (patch)
tree464e5a8b73e201f19ec18770da0ea3bb409e93a7 /libcaja-private
parent2a4433a562b4a9fde5f81961c67fbee8810d63f0 (diff)
downloadcaja-e5b2fbf43e1c1ad5552abb004e5ebc4beb17ce2c.tar.bz2
caja-e5b2fbf43e1c1ad5552abb004e5ebc4beb17ce2c.tar.xz
[icon-container] use gtk_widget_get_preferred_size()
http://git.gnome.org/browse/nautilus/commit/?id=e56241830bfd2ca470ec2b1da53313c2230bc2b9
Diffstat (limited to 'libcaja-private')
-rw-r--r--libcaja-private/caja-icon-container.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c
index f3e1ccf8..583b6c85 100644
--- a/libcaja-private/caja-icon-container.c
+++ b/libcaja-private/caja-icon-container.c
@@ -5258,11 +5258,13 @@ caja_icon_container_search_position_func (CajaIconContainer *container,
#if GTK_CHECK_VERSION(3, 0, 0)
cont_width = gdk_window_get_width (cont_window);
cont_height = gdk_window_get_height (cont_window);
+
+ gtk_widget_get_preferred_size (search_dialog, &requisition, NULL);
#else
gdk_drawable_get_size (cont_window, &cont_width, &cont_height);
-#endif
gtk_widget_size_request (search_dialog, &requisition);
+#endif
if (cont_x + cont_width - requisition.width > gdk_screen_get_width (screen))
{