summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libcaja-private/caja-icon-container.c6
-rw-r--r--src/caja-desktop-window.c22
-rw-r--r--src/file-manager/fm-desktop-icon-view.c2
-rw-r--r--src/file-manager/fm-directory-view.c12
-rw-r--r--src/file-manager/fm-icon-view.c16
-rw-r--r--src/file-manager/fm-list-view.c6
-rw-r--r--src/file-manager/fm-properties-window.c2
7 files changed, 33 insertions, 33 deletions
diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c
index e26a7837..66cfa4c9 100644
--- a/libcaja-private/caja-icon-container.c
+++ b/libcaja-private/caja-icon-container.c
@@ -4548,7 +4548,7 @@ realize (GtkWidget *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)
+#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)
@@ -6090,7 +6090,7 @@ popup_menu (GtkWidget *widget)
return TRUE;
}
-#if !GTK_CHECK_VERSION(3, 21, 0)
+#if !GTK_CHECK_VERSION (3, 22, 0)
static void
draw_canvas_background (EelCanvas *canvas,
cairo_t *cr)
@@ -6543,7 +6543,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, 21, 0)
+#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;
diff --git a/src/caja-desktop-window.c b/src/caja-desktop-window.c
index 1e453672..c7b55635 100644
--- a/src/caja-desktop-window.c
+++ b/src/caja-desktop-window.c
@@ -35,7 +35,7 @@
#include <libcaja-private/caja-icon-names.h>
#include <gio/gio.h>
#include <glib/gi18n.h>
-#if GTK_CHECK_VERSION(3, 21, 0)
+#if GTK_CHECK_VERSION (3, 22, 0)
#define MATE_DESKTOP_USE_UNSTABLE_API
#include <libmate-desktop/mate-bg.h>
#endif
@@ -45,7 +45,7 @@ struct CajaDesktopWindowDetails
gulong size_changed_id;
gboolean loaded;
-#if GTK_CHECK_VERSION(3, 21, 0)
+#if GTK_CHECK_VERSION (3, 22, 0)
gboolean composited;
cairo_surface_t *surface;
#endif
@@ -54,7 +54,7 @@ struct CajaDesktopWindowDetails
G_DEFINE_TYPE (CajaDesktopWindow, caja_desktop_window,
CAJA_TYPE_SPATIAL_WINDOW);
-#if GTK_CHECK_VERSION(3, 21, 0)
+#if GTK_CHECK_VERSION (3, 22, 0)
static void
background_changed (CajaDesktopWindow *window)
@@ -155,7 +155,7 @@ caja_desktop_window_finalize (GObject *obj)
G_OBJECT_CLASS (caja_desktop_window_parent_class)->finalize (obj);
}
-#endif
+#endif /* GTK_CHECK_VERSION (3, 22, 0) */
static void
caja_desktop_window_init (CajaDesktopWindow *window)
@@ -171,7 +171,7 @@ caja_desktop_window_init (CajaDesktopWindow *window)
context = gtk_widget_get_style_context (GTK_WIDGET (window));
gtk_style_context_add_class (context, "caja-desktop-window");
-#if GTK_CHECK_VERSION(3, 21, 0)
+#if GTK_CHECK_VERSION (3, 22, 0)
window->details->composited = TRUE;
caja_desktop_window_composited_changed (GTK_WIDGET (window));
#endif
@@ -259,7 +259,7 @@ caja_desktop_window_new (CajaApplication *application,
/* Stop wrong desktop window size in GTK 3.20*/
/* We don't want to set a default size, which the parent does, since this */
/* will cause the desktop window to open at the wrong size in gtk 3.20 */
-#if GTK_CHECK_VERSION (3, 19, 0)
+#if GTK_CHECK_VERSION (3, 20, 0)
gtk_window_set_default_size (GTK_WINDOW (window), -1, -1);
#endif
/* Special sawmill setting*/
@@ -281,7 +281,7 @@ map (GtkWidget *widget)
/* Chain up to realize our children */
GTK_WIDGET_CLASS (caja_desktop_window_parent_class)->map (widget);
gdk_window_lower (gtk_widget_get_window (widget));
-#if GTK_CHECK_VERSION(3, 21, 0)
+#if GTK_CHECK_VERSION (3, 22, 0)
GdkWindow *window;
GdkRGBA transparent = { 0, 0, 0, 0 };
@@ -353,7 +353,7 @@ realize (GtkWidget *widget)
{
CajaDesktopWindow *window;
CajaDesktopWindowDetails *details;
-#if GTK_CHECK_VERSION(3, 21, 0)
+#if GTK_CHECK_VERSION (3, 22, 0)
GdkVisual *visual;
#endif
window = CAJA_DESKTOP_WINDOW (widget);
@@ -362,7 +362,7 @@ realize (GtkWidget *widget)
/* Make sure we get keyboard events */
gtk_widget_set_events (widget, gtk_widget_get_events (widget)
| GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK);
-#if GTK_CHECK_VERSION(3, 21, 0)
+#if GTK_CHECK_VERSION (3, 22, 0)
visual = gdk_screen_get_rgba_visual (gtk_widget_get_screen (widget));
if (visual) {
gtk_widget_set_visual (widget, visual);
@@ -399,7 +399,7 @@ caja_desktop_window_class_init (CajaDesktopWindowClass *klass)
{
GtkWidgetClass *wclass = GTK_WIDGET_CLASS (klass);
CajaWindowClass *nclass = CAJA_WINDOW_CLASS (klass);
-#if GTK_CHECK_VERSION(3, 21, 0)
+#if GTK_CHECK_VERSION (3, 22, 0)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->finalize = caja_desktop_window_finalize;
@@ -408,7 +408,7 @@ caja_desktop_window_class_init (CajaDesktopWindowClass *klass)
wclass->realize = realize;
wclass->unrealize = unrealize;
wclass->map = map;
-#if GTK_CHECK_VERSION(3, 21, 0)
+#if GTK_CHECK_VERSION (3, 22, 0)
wclass->composited_changed = caja_desktop_window_composited_changed;
wclass->draw = caja_desktop_window_draw;
#endif
diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
index 2a16f494..fc39497c 100644
--- a/src/file-manager/fm-desktop-icon-view.c
+++ b/src/file-manager/fm-desktop-icon-view.c
@@ -38,7 +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)
+#if !GTK_CHECK_VERSION (3, 22, 0)
#include <libcaja-private/caja-directory-background.h>
#endif
#include <libcaja-private/caja-directory-notify.h>
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 02a22da6..04233fac 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -61,7 +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)
+#if !GTK_CHECK_VERSION (3, 22, 0)
#include <libcaja-private/caja-directory-background.h>
#endif
#include <libcaja-private/caja-directory.h>
@@ -419,7 +419,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)
+#if !GTK_CHECK_VERSION (3, 22, 0)
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, get_background_widget)
#endif
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, get_selection)
@@ -3616,7 +3616,7 @@ fm_directory_view_can_zoom_out (FMDirectoryView *view)
can_zoom_out, (view));
}
-#if !GTK_CHECK_VERSION(3, 21, 0)
+#if !GTK_CHECK_VERSION (3, 22, 0)
GtkWidget *
fm_directory_view_get_background_widget (FMDirectoryView *view)
{
@@ -7678,7 +7678,7 @@ 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)
+#if !GTK_CHECK_VERSION (3, 22, 0)
g_signal_connect_object (fm_directory_view_get_background (view), "settings_changed",
G_CALLBACK (schedule_update_menus), G_OBJECT (view),
G_CONNECT_SWAPPED);
@@ -11036,7 +11036,7 @@ 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;
-#if !GTK_CHECK_VERSION(3, 21, 0)
+#if !GTK_CHECK_VERSION (3, 22, 0)
klass->set_is_active = real_set_is_active;
#endif
/* Function pointers that subclasses must override */
@@ -11046,7 +11046,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)
+#if !GTK_CHECK_VERSION (3, 22, 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);
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index a388a3fb..8aec9188 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -30,7 +30,7 @@
#include "fm-desktop-icon-view.h"
#include "fm-error-reporting.h"
#include <stdlib.h>
-#if !GTK_CHECK_VERSION(3, 21, 0)
+#if !GTK_CHECK_VERSION (3, 22, 0)
#include <eel/eel-background.h>
#endif
#include <eel/eel-glib-extensions.h>
@@ -45,7 +45,7 @@
#include <glib/gi18n.h>
#include <gio/gio.h>
#include <libcaja-private/caja-clipboard-monitor.h>
-#if !GTK_CHECK_VERSION(3, 21, 0)
+#if !GTK_CHECK_VERSION (3, 22, 0)
#include <libcaja-private/caja-directory-background.h>
#endif
#include <libcaja-private/caja-directory.h>
@@ -1273,7 +1273,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)
+#if !GTK_CHECK_VERSION (3, 22, 0)
/* FIXME bugzilla.gnome.org 45060: Should use methods instead
* of hardcoding desktop knowledge in here.
*/
@@ -1296,8 +1296,8 @@ 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)))
{
@@ -1503,7 +1503,7 @@ fm_icon_view_can_zoom_out (FMDirectoryView *view)
> CAJA_ZOOM_LEVEL_SMALLEST;
}
-#if !GTK_CHECK_VERSION(3, 21, 0)
+#if !GTK_CHECK_VERSION (3, 22, 0)
static GtkWidget *
fm_icon_view_get_background_widget (FMDirectoryView *view)
{
@@ -3173,7 +3173,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)
+#if !GTK_CHECK_VERSION (3, 22, 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;
@@ -3340,7 +3340,7 @@ fm_icon_view_create (CajaWindowSlotInfo *slot)
"window-slot", slot,
"compact", FALSE,
NULL);
-#if GTK_CHECK_VERSION (3, 19, 0)
+#if GTK_CHECK_VERSION (3, 20, 0)
gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (view)), GTK_STYLE_CLASS_VIEW);
#endif
return CAJA_VIEW (view);
@@ -3355,7 +3355,7 @@ fm_compact_view_create (CajaWindowSlotInfo *slot)
"window-slot", slot,
"compact", TRUE,
NULL);
-#if GTK_CHECK_VERSION (3, 19, 0)
+#if GTK_CHECK_VERSION (3, 20, 0)
gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (view)), GTK_STYLE_CLASS_VIEW);
#endif
return CAJA_VIEW (view);
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index 26d3cf74..1d370484 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -47,7 +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)
+#if !GTK_CHECK_VERSION (3, 22, 0)
#include <libcaja-private/caja-directory-background.h>
#endif
#include <libcaja-private/caja-dnd.h>
@@ -2125,7 +2125,7 @@ fm_list_view_file_changed (FMDirectoryView *view, CajaFile *file, CajaDirectory
}
}
-#if !GTK_CHECK_VERSION(3, 21, 0)
+#if !GTK_CHECK_VERSION (3, 22, 0)
static GtkWidget *
fm_list_view_get_background_widget (FMDirectoryView *view)
{
@@ -3296,7 +3296,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)
+#if !GTK_CHECK_VERSION (3, 22, 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;
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index 87afdc5a..24617e90 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -3406,7 +3406,7 @@ create_emblems_page (FMPropertiesWindow *window)
gtk_container_set_border_width (GTK_CONTAINER (emblems_table), 12);
/*stop GTK 3.22 builds from ballooning the properties dialog to full screen height */
-#if GTK_CHECK_VERSION(3,21,0)
+#if GTK_CHECK_VERSION (3, 22, 0)
gtk_scrolled_window_set_max_content_height(scroller, 300);
#endif
gtk_widget_show (scroller);
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-03 08:26:31 +0000