summaryrefslogtreecommitdiff
path: root/mate-panel
diff options
context:
space:
mode:
authorZenWalker <[email protected]>2017-08-14 03:29:29 +0200
committerlukefromdc <[email protected]>2017-08-22 02:16:22 -0400
commit57d3c8f702887516504c54c398d40e7343e93138 (patch)
tree579bb0b0fc5790dd8a69d76e8b74f868e1653e42 /mate-panel
parent4a25da504204639cee268d0fac1516f03d2fe6bb (diff)
downloadmate-panel-57d3c8f702887516504c54c398d40e7343e93138.tar.bz2
mate-panel-57d3c8f702887516504c54c398d40e7343e93138.tar.xz
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
Diffstat (limited to 'mate-panel')
-rw-r--r--mate-panel/panel-multiscreen.c4
-rw-r--r--mate-panel/xstuff.c12
2 files changed, 16 insertions, 0 deletions
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,