From c4e2b5d53b82c9f82099d8e6c89a82f88458f223 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Mon, 19 Nov 2012 14:59:33 +0200 Subject: [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. --- libcaja-private/caja-icon-container.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libcaja-private/caja-icon-container.c') 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 -- cgit v1.2.1