summaryrefslogtreecommitdiff
path: root/libcaja-private
diff options
context:
space:
mode:
authorAlexei Sorokin <[email protected]>2017-02-25 20:10:44 +0300
committerraveit65 <[email protected]>2017-03-13 10:28:08 +0100
commit438682bef1a8fea49b4c6972350bede1bfad69d0 (patch)
treef99a0439cb45b349a162e2d05c3ac232c46bf859 /libcaja-private
parente7834d32c9b1aae49d9f791a5eba70dc33d0849d (diff)
downloadcaja-438682bef1a8fea49b4c6972350bede1bfad69d0.tar.bz2
caja-438682bef1a8fea49b4c6972350bede1bfad69d0.tar.xz
Revert "GTK3.21:fix desktop redraw"
Diffstat (limited to 'libcaja-private')
-rw-r--r--libcaja-private/caja-icon-container.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c
index 21466f0b..f6021900 100644
--- a/libcaja-private/caja-icon-container.c
+++ b/libcaja-private/caja-icon-container.c
@@ -4529,15 +4529,12 @@ realize (GtkWidget *widget)
GTK_WIDGET_CLASS (caja_icon_container_parent_class)->realize (widget);
container = CAJA_ICON_CONTAINER (widget);
- /* Unless GTK 3.21 or later is in use and the desktop must be transparent*/
-#if !GTK_CHECK_VERSION (3, 22, 0)
/* Ensure that the desktop window is native so the background
set on it is drawn by X. */
if (container->details->is_desktop)
{
gdk_x11_window_get_xid (gtk_layout_get_bin_window (GTK_LAYOUT (widget)));
}
-#endif
/* Set up DnD. */
caja_icon_dnd_init (container);
@@ -6072,14 +6069,12 @@ popup_menu (GtkWidget *widget)
return TRUE;
}
-#if !GTK_CHECK_VERSION (3, 22, 0)
static void
draw_canvas_background (EelCanvas *canvas,
cairo_t *cr)
{
/* Don't chain up to the parent to avoid clearing and redrawing */
}
-#endif
static void
grab_notify_cb (GtkWidget *widget,
@@ -6525,9 +6520,7 @@ caja_icon_container_class_init (CajaIconContainerClass *class)
gtk_widget_class_set_accessible_type (widget_class, caja_icon_container_accessible_get_type ());
canvas_class = EEL_CANVAS_CLASS (class);
-#if !GTK_CHECK_VERSION (3, 22, 0)
canvas_class->draw_background = draw_canvas_background;
-#endif
class->start_interactive_search = caja_icon_container_start_interactive_search;
gtk_widget_class_install_style_property (widget_class,