From: ZhaoQiang <zhaoqiang@gnome.org>
Date: Wed, 24 Jul 2019 12:12:51 +0000 (+0800)
Subject: x11-render-plugin: Use GTK 3.22's method to get screen size to avoid
X-Git-Tag: 0.9.5~35^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da9353120a1854846d84f349fefd1bc9c2274936;p=thirdparty%2Fplymouth.git

x11-render-plugin: Use GTK 3.22's method to get screen size to avoid
deprecate warning in compile.
---

diff --git a/src/plugins/renderers/x11/plugin.c b/src/plugins/renderers/x11/plugin.c
index 7d2a7301..bfb039a6 100644
--- a/src/plugins/renderers/x11/plugin.c
+++ b/src/plugins/renderers/x11/plugin.c
@@ -223,10 +223,17 @@ create_fullscreen_single_head_setup (ply_renderer_backend_t *backend)
         GdkRectangle monitor_geometry;
         int width_mm, height_mm;
 
+#if GTK_CHECK_VERSION(3,22,0)
+        GdkDisplay* const display = gdk_display_get_default();
+        GdkMonitor* const monitor = gdk_display_get_primary_monitor(display);
+        gdk_monitor_get_geometry(monitor, &monitor_geometry);
+        width_mm = gdk_monitor_get_width_mm (monitor);
+        height_mm = gdk_monitor_get_height_mm (monitor);
+#else
         gdk_screen_get_monitor_geometry (gdk_screen_get_default (), 0, &monitor_geometry);
         width_mm = gdk_screen_get_monitor_width_mm (gdk_screen_get_default (), 0);
         height_mm = gdk_screen_get_monitor_height_mm (gdk_screen_get_default (), 0);
-
+#endif
         head = calloc (1, sizeof(ply_renderer_head_t));
 
         head->backend = backend;