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 /src/file-manager | |
parent | d8ac8e9c2b7781931e42b72e3200e269a0f27acb (diff) | |
download | caja-f8e542223bdd305ac69ed0380b05b9a0c99ad3ab.tar.bz2 caja-f8e542223bdd305ac69ed0380b05b9a0c99ad3ab.tar.xz |
Revert "GTK3.21:fix desktop redraw"
Diffstat (limited to 'src/file-manager')
-rw-r--r-- | src/file-manager/fm-desktop-icon-view.c | 2 | ||||
-rw-r--r-- | src/file-manager/fm-directory-view.c | 23 | ||||
-rw-r--r-- | src/file-manager/fm-icon-view.c | 10 | ||||
-rw-r--r-- | src/file-manager/fm-list-view.c | 6 |
4 files changed, 6 insertions, 35 deletions
diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c index 1637532c..6e4952fa 100644 --- a/src/file-manager/fm-desktop-icon-view.c +++ b/src/file-manager/fm-desktop-icon-view.c @@ -38,9 +38,7 @@ #include <gdk/gdkx.h> #include <glib/gi18n.h> #include <libcaja-private/caja-desktop-icon-file.h> -#if !GTK_CHECK_VERSION(3, 21, 0) #include <libcaja-private/caja-directory-background.h> -#endif #include <libcaja-private/caja-directory-notify.h> #include <libcaja-private/caja-file-changes-queue.h> #include <libcaja-private/caja-file-operations.h> diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index b9d6f76f..1d9683b8 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -61,9 +61,7 @@ #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> @@ -423,9 +421,7 @@ 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) @@ -3692,7 +3688,6 @@ 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) { @@ -3718,7 +3713,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) @@ -7745,11 +7740,9 @@ 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; } @@ -11105,12 +11098,10 @@ fm_directory_view_class_init (FMDirectoryViewClass *klass) klass->supports_properties = real_supports_properties; klass->supports_zooming = real_supports_zooming; klass->using_manual_layout = real_using_manual_layout; - klass->merge_menus = real_merge_menus; - klass->unmerge_menus = real_unmerge_menus; - klass->update_menus = real_update_menus; -#if !GTK_CHECK_VERSION(3, 21, 0) - klass->set_is_active = real_set_is_active; -#endif + 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; /* 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); @@ -11118,9 +11109,7 @@ 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); -#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_background_widget); 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); diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c index ec167810..9c187466 100644 --- a/src/file-manager/fm-icon-view.c +++ b/src/file-manager/fm-icon-view.c @@ -30,9 +30,7 @@ #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> @@ -45,9 +43,7 @@ #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> @@ -1281,7 +1277,6 @@ 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. */ @@ -1305,7 +1300,6 @@ 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))) { @@ -1511,7 +1505,6 @@ 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) { @@ -1519,7 +1512,6 @@ 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) @@ -3199,9 +3191,7 @@ 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; diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c index 163f1be8..4b155f27 100644 --- a/src/file-manager/fm-list-view.c +++ b/src/file-manager/fm-list-view.c @@ -47,9 +47,7 @@ #include <libcaja-private/caja-column-chooser.h> #include <libcaja-private/caja-column-utilities.h> #include <libcaja-private/caja-debug-log.h> -#if !GTK_CHECK_VERSION(3, 21, 0) #include <libcaja-private/caja-directory-background.h> -#endif #include <libcaja-private/caja-dnd.h> #include <libcaja-private/caja-file-dnd.h> #include <libcaja-private/caja-file-utilities.h> @@ -2121,13 +2119,11 @@ fm_list_view_file_changed (FMDirectoryView *view, CajaFile *file, CajaDirectory } } -#if !GTK_CHECK_VERSION(3, 21, 0) static GtkWidget * fm_list_view_get_background_widget (FMDirectoryView *view) { return GTK_WIDGET (view); } -#endif static void fm_list_view_get_selection_foreach_func (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) @@ -3329,9 +3325,7 @@ fm_list_view_class_init (FMListViewClass *class) fm_directory_view_class->click_policy_changed = fm_list_view_click_policy_changed; fm_directory_view_class->clear = fm_list_view_clear; fm_directory_view_class->file_changed = fm_list_view_file_changed; -#if !GTK_CHECK_VERSION(3, 21, 0) fm_directory_view_class->get_background_widget = fm_list_view_get_background_widget; -#endif fm_directory_view_class->get_selection = fm_list_view_get_selection; fm_directory_view_class->get_selection_for_file_transfer = fm_list_view_get_selection_for_file_transfer; fm_directory_view_class->get_item_count = fm_list_view_get_item_count; |