summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2016-07-29 17:06:55 -0400
committerraveit65 <[email protected]>2016-08-04 15:30:23 +0200
commitc8ea6aafe576d204b4423c868754b4580c52d397 (patch)
tree348a2e18954013eac543fd80bbaeea21a400ed55
parentb8f0f58e84776d828964dc0ecfd5604421222268 (diff)
downloadcaja-c8ea6aafe576d204b4423c868754b4580c52d397.tar.bz2
caja-c8ea6aafe576d204b4423c868754b4580c52d397.tar.xz
GTK3.21:fix desktop redraw (fm-icon-view.c)
-rw-r--r--src/file-manager/fm-icon-view.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index 9b9b3781..933f9869 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -30,7 +30,9 @@
#include "fm-desktop-icon-view.h"
#include "fm-error-reporting.h"
#include <stdlib.h>
+#if !GTK_CHECK_VERSION(3, 21, 0)
#include <eel/eel-background.h>
+#endif
#include <eel/eel-glib-extensions.h>
#include <eel/eel-gtk-extensions.h>
#include <eel/eel-gtk-macros.h>
@@ -43,7 +45,9 @@
#include <glib/gi18n.h>
#include <gio/gio.h>
#include <libcaja-private/caja-clipboard-monitor.h>
+#if !GTK_CHECK_VERSION(3, 21, 0)
#include <libcaja-private/caja-directory-background.h>
+#endif
#include <libcaja-private/caja-directory.h>
#include <libcaja-private/caja-dnd.h>
#include <libcaja-private/caja-file-utilities.h>
@@ -1277,7 +1281,7 @@ fm_icon_view_begin_loading (FMDirectoryView *view)
/* kill any sound preview process that is ongoing */
preview_audio (icon_view, NULL, FALSE);
-
+#if !GTK_CHECK_VERSION(3, 21, 0)
/* FIXME bugzilla.gnome.org 45060: Should use methods instead
* of hardcoding desktop knowledge in here.
*/
@@ -1301,7 +1305,7 @@ fm_icon_view_begin_loading (FMDirectoryView *view)
caja_connect_background_to_file_metadata (icon_container, file, default_action);
}
-
+#endif
/* Set up the zoom level from the metadata. */
if (fm_directory_view_supports_zooming (FM_DIRECTORY_VIEW (icon_view)))
{
@@ -1507,6 +1511,7 @@ fm_icon_view_can_zoom_out (FMDirectoryView *view)
> CAJA_ZOOM_LEVEL_SMALLEST;
}
+#if !GTK_CHECK_VERSION(3, 21, 0)
static GtkWidget *
fm_icon_view_get_background_widget (FMDirectoryView *view)
{
@@ -1514,6 +1519,7 @@ fm_icon_view_get_background_widget (FMDirectoryView *view)
return GTK_WIDGET (get_icon_container (FM_ICON_VIEW (view)));
}
+#endif
static gboolean
fm_icon_view_is_empty (FMDirectoryView *view)
@@ -3168,7 +3174,9 @@ fm_icon_view_class_init (FMIconViewClass *klass)
fm_directory_view_class->clear = fm_icon_view_clear;
fm_directory_view_class->end_loading = fm_icon_view_end_loading;
fm_directory_view_class->file_changed = fm_icon_view_file_changed;
+#if !GTK_CHECK_VERSION(3, 21, 0)
fm_directory_view_class->get_background_widget = fm_icon_view_get_background_widget;
+#endif
fm_directory_view_class->get_selected_icon_locations = fm_icon_view_get_selected_icon_locations;
fm_directory_view_class->get_selection = fm_icon_view_get_selection;
fm_directory_view_class->get_selection_for_file_transfer = fm_icon_view_get_selection;