From 543dfb8b220f6c5f17e82455b1ef7eda4b8eb0b2 Mon Sep 17 00:00:00 2001 From: ZenWalker Date: Wed, 16 Aug 2017 03:44:22 +0200 Subject: gtk 3.22: avoid deprecated gdk_screen_get_monitor... functions: avoid deprecated: gdk_screen_get_monitor_geometry gdk_screen_get_monitor_at_point --- mate-volume-control/gvc-stream-status-icon.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mate-volume-control/gvc-stream-status-icon.c b/mate-volume-control/gvc-stream-status-icon.c index e80d4fe..e103a37 100644 --- a/mate-volume-control/gvc-stream-status-icon.c +++ b/mate-volume-control/gvc-stream-status-icon.c @@ -70,7 +70,11 @@ popup_dock (GvcStreamStatusIcon *icon, guint time) GdkScreen *screen; int x; int y; +#if GTK_CHECK_VERSION (3, 22, 0) + GdkMonitor *monitor_num; +#else int monitor_num; +#endif GdkRectangle monitor; GtkRequisition dock_req; @@ -89,8 +93,13 @@ popup_dock (GvcStreamStatusIcon *icon, guint time) gvc_channel_bar_set_orientation (GVC_CHANNEL_BAR (icon->priv->bar), 1 - orientation); +#if GTK_CHECK_VERSION (3, 22, 0) + monitor_num = gdk_display_get_monitor_at_point (gdk_screen_get_display (screen), area.x, area.y); + gdk_monitor_get_geometry (monitor_num, &monitor); +#else monitor_num = gdk_screen_get_monitor_at_point (screen, area.x, area.y); gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); +#endif gtk_container_foreach (GTK_CONTAINER (icon->priv->dock), (GtkCallback) gtk_widget_show_all, NULL); -- cgit v1.2.1