From 87a2f26f7b3b66184d130a8d4400fbbbf620a902 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Tue, 7 Aug 2018 22:41:45 +0200 Subject: Change GTK_CHECK_VERSION to match next gtk+ release --- applets/notification_area/system-tray/na-tray-child.c | 4 ++-- applets/wncklet/window-list.c | 6 +++--- libmate-panel-applet/mate-panel-applet.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/applets/notification_area/system-tray/na-tray-child.c b/applets/notification_area/system-tray/na-tray-child.c index c8f022a3..06540625 100644 --- a/applets/notification_area/system-tray/na-tray-child.c +++ b/applets/notification_area/system-tray/na-tray-child.c @@ -115,7 +115,7 @@ na_tray_child_style_set (GtkWidget *widget, */ } -#if !GTK_CHECK_VERSION (3, 22, 31) +#if !GTK_CHECK_VERSION (3, 23, 0) static void na_tray_child_get_preferred_width (GtkWidget *widget, gint *minimal_width, @@ -384,7 +384,7 @@ na_tray_child_class_init (NaTrayChildClass *klass) widget_class->style_set = na_tray_child_style_set; widget_class->realize = na_tray_child_realize; -#if !GTK_CHECK_VERSION (3, 22, 31) +#if !GTK_CHECK_VERSION (3, 23, 0) widget_class->get_preferred_width = na_tray_child_get_preferred_width; widget_class->get_preferred_height = na_tray_child_get_preferred_height; #endif diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c index 35b87c74..b7097ee6 100644 --- a/applets/wncklet/window-list.c +++ b/applets/wncklet/window-list.c @@ -42,7 +42,7 @@ typedef struct { GtkOrientation orientation; int size; -#if !defined(WNCKLET_INPROCESS) && !GTK_CHECK_VERSION (3, 22, 31) +#if !defined(WNCKLET_INPROCESS) && !GTK_CHECK_VERSION (3, 23, 0) gboolean needs_hints; #endif @@ -322,7 +322,7 @@ static void applet_size_allocate(GtkWidget *widget, GtkAllocation *allocation, T g_assert(len % 2 == 0); -#if !defined(WNCKLET_INPROCESS) && !GTK_CHECK_VERSION (3, 22, 31) +#if !defined(WNCKLET_INPROCESS) && !GTK_CHECK_VERSION (3, 23, 0) /* HACK: When loading the WnckTasklist initially, it reports size hints as though there were * no elements in the Tasklist. This causes a rendering issue when built out-of-process in * HiDPI displays. We keep a flag to skip size hinting until WnckTasklist has something to @@ -427,7 +427,7 @@ gboolean window_list_applet_fill(MatePanelApplet* applet) tasklist->size = mate_panel_applet_get_size(applet); -#if !defined(WNCKLET_INPROCESS) && !GTK_CHECK_VERSION (3, 22, 31) +#if !defined(WNCKLET_INPROCESS) && !GTK_CHECK_VERSION (3, 23, 0) tasklist->needs_hints = FALSE; #endif diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c index 04863304..373f44aa 100644 --- a/libmate-panel-applet/mate-panel-applet.c +++ b/libmate-panel-applet/mate-panel-applet.c @@ -1058,7 +1058,7 @@ mate_panel_applet_get_preferred_width (GtkWidget *widget, minimum_width, natural_width); -#if !GTK_CHECK_VERSION (3, 22, 31) +#if !GTK_CHECK_VERSION (3, 23, 0) MatePanelApplet *applet = MATE_PANEL_APPLET (widget); if (applet->priv->out_of_process) { /* Out-of-process applets end up scaled up doubly with GTK 3.22. @@ -1082,7 +1082,7 @@ mate_panel_applet_get_preferred_height (GtkWidget *widget, minimum_height, natural_height); -#if !GTK_CHECK_VERSION (3, 22, 31) +#if !GTK_CHECK_VERSION (3, 23, 0) MatePanelApplet *applet = MATE_PANEL_APPLET (widget); if (applet->priv->out_of_process) { gint scale; -- cgit v1.2.1