From 65039f9aaac8ff889b628d3a89e9dfc401a74c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 21 Mar 2025 02:04:47 +0100 Subject: [PATCH] subprojects/shew: Ignore GdkX11 deprecations The entire X11 backend was deprecated, to indicate its planned removal in GTK5. Part-of: --- subprojects/shew/src/shew-external-window-x11.c | 4 ++++ subprojects/shew/src/shew-window-exporter.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/subprojects/shew/src/shew-external-window-x11.c b/subprojects/shew/src/shew-external-window-x11.c index 7f08665b1..1df402c57 100644 --- a/subprojects/shew/src/shew-external-window-x11.c +++ b/subprojects/shew/src/shew-external-window-x11.c @@ -63,10 +63,12 @@ check_foreign_xid (GdkDisplay *display, #ifdef GDK_WINDOWING_X11 XWindowAttributes attrs; + G_GNUC_BEGIN_IGNORE_DEPRECATIONS gdk_x11_display_error_trap_push (display); result = XGetWindowAttributes (GDK_DISPLAY_XDISPLAY (display), xid, &attrs); if (gdk_x11_display_error_trap_pop (display)) return FALSE; + G_GNUC_END_IGNORE_DEPRECATIONS #endif return result; @@ -116,9 +118,11 @@ shew_external_window_x11_set_parent_of (ShewExternalWindow *external_window, SHEW_EXTERNAL_WINDOW_X11 (external_window); #ifdef GDK_WINDOWING_X11 + G_GNUC_BEGIN_IGNORE_DEPRECATIONS XSetTransientForHint (GDK_SURFACE_XDISPLAY (child_surface), GDK_SURFACE_XID (child_surface), external_window_x11->foreign_xid); + G_GNUC_END_IGNORE_DEPRECATIONS #endif } diff --git a/subprojects/shew/src/shew-window-exporter.c b/subprojects/shew/src/shew-window-exporter.c index ff4e85b8a..989fed0f5 100644 --- a/subprojects/shew/src/shew-window-exporter.c +++ b/subprojects/shew/src/shew-window-exporter.c @@ -91,7 +91,9 @@ shew_window_exporter_export (ShewWindowExporter *exporter, if (GDK_IS_X11_DISPLAY (gtk_widget_get_display (widget))) { GdkSurface *s = gtk_native_get_surface (GTK_NATIVE (widget)); + G_GNUC_BEGIN_IGNORE_DEPRECATIONS guint32 xid = (guint32) gdk_x11_surface_get_xid (s); + G_GNUC_END_IGNORE_DEPRECATIONS g_task_return_pointer (task, g_strdup_printf ("x11:%x", xid), g_free); }