summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-icon-container.c
diff options
context:
space:
mode:
authorJasmine Hassan <[email protected]>2012-11-19 14:59:33 +0200
committerJasmine Hassan <[email protected]>2012-11-20 08:14:47 +0200
commitc4e2b5d53b82c9f82099d8e6c89a82f88458f223 (patch)
tree95b4caabfa0ef9f6006915a72bee9bdf86ee8283 /libcaja-private/caja-icon-container.c
parentd35f6594100ab023839c3c6ac9350adfd107f105 (diff)
downloadcaja-c4e2b5d53b82c9f82099d8e6c89a82f88458f223.tar.bz2
caja-c4e2b5d53b82c9f82099d8e6c89a82f88458f223.tar.xz
[lc-p] revise rendering-cleanup commit 2a4433a562
mainly, in icon-dnd, in drag_begin_callback, CajaIconContainer was only declared for GTK2. Also, replace some deprecated gdk_drawable_get(size|screen) calls, and remove some unnecessary GDK_DRAWABLE casts. Also, in icon-canvas-item, in draw_label_text, missed ommitting a NULL parameter to gtk_paint_focus, for GTK3.
Diffstat (limited to 'libcaja-private/caja-icon-container.c')
-rw-r--r--libcaja-private/caja-icon-container.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c
index 6b2f18e8..2b38220c 100644
--- a/libcaja-private/caja-icon-container.c
+++ b/libcaja-private/caja-icon-container.c
@@ -5252,14 +5252,12 @@ caja_icon_container_search_position_func (CajaIconContainer *container,
gdk_window_get_origin (cont_window, &cont_x, &cont_y);
-#if GTK_CHECK_VERSION(3, 0, 0)
cont_width = gdk_window_get_width (cont_window);
cont_height = gdk_window_get_height (cont_window);
+#if GTK_CHECK_VERSION(3, 0, 0)
gtk_widget_get_preferred_size (search_dialog, &requisition, NULL);
#else
- gdk_drawable_get_size (cont_window, &cont_width, &cont_height);
-
gtk_widget_size_request (search_dialog, &requisition);
#endif