diff options
| author | Alexei Sorokin <[email protected]> | 2017-02-25 20:10:44 +0300 |
|---|---|---|
| committer | Alexei Sorokin <[email protected]> | 2017-02-25 20:10:44 +0300 |
| commit | f8e542223bdd305ac69ed0380b05b9a0c99ad3ab (patch) | |
| tree | 10b28c33da9893e8131731b99763a72aaeb134ca /libcaja-private | |
| parent | d8ac8e9c2b7781931e42b72e3200e269a0f27acb (diff) | |
| download | caja-f8e542223bdd305ac69ed0380b05b9a0c99ad3ab.tar.bz2 caja-f8e542223bdd305ac69ed0380b05b9a0c99ad3ab.tar.xz | |
Revert "GTK3.21:fix desktop redraw"
Diffstat (limited to 'libcaja-private')
| -rw-r--r-- | libcaja-private/caja-icon-container.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c index b67ba5a6..385d88c2 100644 --- a/libcaja-private/caja-icon-container.c +++ b/libcaja-private/caja-icon-container.c @@ -4707,8 +4707,6 @@ 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, 21, 0) /* Ensure that the desktop window is native so the background set on it is drawn by X. */ if (container->details->is_desktop) @@ -4719,7 +4717,6 @@ realize (GtkWidget *widget) gdk_x11_drawable_get_xid (gtk_layout_get_bin_window (GTK_LAYOUT (widget))); #endif } -#endif /* Set up DnD. */ caja_icon_dnd_init (container); @@ -6285,7 +6282,6 @@ popup_menu (GtkWidget *widget) return TRUE; } -#if !GTK_CHECK_VERSION(3, 21, 0) static void draw_canvas_background (EelCanvas *canvas, #if GTK_CHECK_VERSION(3,0,0) @@ -6296,7 +6292,6 @@ draw_canvas_background (EelCanvas *canvas, { /* Don't chain up to the parent to avoid clearing and redrawing */ } -#endif #if !GTK_CHECK_VERSION(3,0,0) @@ -6787,9 +6782,7 @@ caja_icon_container_class_init (CajaIconContainerClass *class) widget_class->grab_notify = grab_notify_cb; canvas_class = EEL_CANVAS_CLASS (class); -#if !GTK_CHECK_VERSION(3, 21, 0) canvas_class->draw_background = draw_canvas_background; -#endif class->start_interactive_search = caja_icon_container_start_interactive_search; #if GTK_CHECK_VERSION(3,0,0) |