summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2016-07-29 17:05:34 -0400
committerraveit65 <[email protected]>2016-08-04 15:30:23 +0200
commitb8f0f58e84776d828964dc0ecfd5604421222268 (patch)
tree3dbf5d53b3902caba7172e28c71f5574bbf697bb
parent3fd59d25d213f53761691aa81095623fe5895e52 (diff)
downloadcaja-b8f0f58e84776d828964dc0ecfd5604421222268.tar.bz2
caja-b8f0f58e84776d828964dc0ecfd5604421222268.tar.xz
GTK3.21:fix desktop redraw (fm-directory-view.c)
-rw-r--r--src/file-manager/fm-directory-view.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index e5180dad..28c446ec 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -61,7 +61,9 @@
#include <libcaja-private/caja-desktop-directory.h>
#include <libcaja-private/caja-extensions.h>
#include <libcaja-private/caja-search-directory.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-attributes.h>
@@ -421,7 +423,9 @@ EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, can_zoom_in)
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, can_zoom_out)
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, clear)
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, file_changed)
+#if !GTK_CHECK_VERSION(3, 21, 0)
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, get_background_widget)
+#endif
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, get_selection)
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, get_selection_for_file_transfer)
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, get_item_count)
@@ -3688,6 +3692,7 @@ fm_directory_view_can_zoom_out (FMDirectoryView *view)
can_zoom_out, (view));
}
+#if !GTK_CHECK_VERSION(3, 21, 0)
GtkWidget *
fm_directory_view_get_background_widget (FMDirectoryView *view)
{
@@ -3713,7 +3718,7 @@ real_set_is_active (FMDirectoryView *view,
bg = fm_directory_view_get_background (view);
eel_background_set_active (bg, is_active);
}
-
+#endif
static void
fm_directory_view_set_is_active (FMDirectoryView *view,
gboolean is_active)
@@ -7749,10 +7754,11 @@ real_merge_menus (FMDirectoryView *view)
ui = caja_ui_string_get ("caja-directory-view-ui.xml");
view->details->dir_merge_id = gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, NULL);
+#if !GTK_CHECK_VERSION(3, 21, 0)
g_signal_connect_object (fm_directory_view_get_background (view), "settings_changed",
G_CALLBACK (schedule_update_menus), G_OBJECT (view),
G_CONNECT_SWAPPED);
-
+#endif
view->details->scripts_invalid = TRUE;
view->details->templates_invalid = TRUE;
}
@@ -11111,8 +11117,9 @@ fm_directory_view_class_init (FMDirectoryViewClass *klass)
klass->merge_menus = real_merge_menus;
klass->unmerge_menus = real_unmerge_menus;
klass->update_menus = real_update_menus;
- klass->set_is_active = real_set_is_active;
-
+#if !GTK_CHECK_VERSION(3, 21, 0)
+ klass->set_is_active = real_set_is_active;
+#endif
/* Function pointers that subclasses must override */
EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, add_file);
EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, bump_zoom_level);
@@ -11120,7 +11127,9 @@ fm_directory_view_class_init (FMDirectoryViewClass *klass)
EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, can_zoom_out);
EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, clear);
EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, file_changed);
- EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, get_background_widget);
+#if !GTK_CHECK_VERSION(3, 21, 0)
+ EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, get_background_widget);
+#endif
EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, get_selection);
EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, get_selection_for_file_transfer);
EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, get_item_count);