From 57d3c8f702887516504c54c398d40e7343e93138 Mon Sep 17 00:00:00 2001
From: ZenWalker <scow@riseup.net>
Date: Mon, 14 Aug 2017 03:29:29 +0200
Subject: gtk 3.22: avoid deprecated gdk_screen_get_monitor... functions:

avoid deprecated:

gdk_screen_get_monitor_geometry
gdk_screen_get_monitor_at_window
gdk_screen_get_monitor_at_point
---
 mate-panel/panel-multiscreen.c |  4 ++++
 mate-panel/xstuff.c            | 12 ++++++++++++
 2 files changed, 16 insertions(+)

(limited to 'mate-panel')

diff --git a/mate-panel/panel-multiscreen.c b/mate-panel/panel-multiscreen.c
index 49738270..d085413f 100644
--- a/mate-panel/panel-multiscreen.c
+++ b/mate-panel/panel-multiscreen.c
@@ -218,7 +218,11 @@ panel_multiscreen_get_gdk_monitors_for_screen (GdkScreen     *screen,
 	geometries = g_new (GdkRectangle, num_monitors);
 
 	for (i = 0; i < num_monitors; i++)
+#if GTK_CHECK_VERSION (3, 22, 0)
+		gdk_monitor_get_geometry (gdk_display_get_monitor (display, i), &(geometries[i]));
+#else
 		gdk_screen_get_monitor_geometry (screen, i, &(geometries[i]));
+#endif
 
 	*monitors_ret = num_monitors;
 	*geometries_ret = geometries;
diff --git a/mate-panel/xstuff.c b/mate-panel/xstuff.c
index 931b8255..20f1dfe9 100644
--- a/mate-panel/xstuff.c
+++ b/mate-panel/xstuff.c
@@ -335,7 +335,12 @@ xstuff_zoom_animate (GtkWidget *widget,
 	GdkScreen *gscreen;
 	GdkRectangle rect, dest;
 	GtkAllocation allocation;
+#if GTK_CHECK_VERSION (3, 22, 0)
+	GdkMonitor *monitor;
+	GdkDisplay *display;
+#else
 	int monitor;
+#endif
 
 	if (opt_rect)
 		rect = *opt_rect;
@@ -358,9 +363,16 @@ xstuff_zoom_animate (GtkWidget *widget,
 						rect.width, rect.height,
 						pixbuf, orientation);
 	else {
+#if GTK_CHECK_VERSION (3, 22, 0)
+		display = gdk_screen_get_display (gscreen);
+		monitor = gdk_display_get_monitor_at_window (display,
+							     gtk_widget_get_window (widget));
+		gdk_monitor_get_geometry (monitor, &dest);
+#else
 		monitor = gdk_screen_get_monitor_at_window (gscreen,
 							    gtk_widget_get_window (widget));
 		gdk_screen_get_monitor_geometry (gscreen, monitor, &dest);
+#endif
 
 		draw_zoom_animation (gscreen,
 				     rect.x, rect.y, rect.width, rect.height,
-- 
cgit v1.2.1