From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 22 Sep 2022 00:53:46 +0000 (-0400)
Subject: Make the nograbs flag always available
X-Git-Tag: archive/raspbian/4.8.3+ds-2+rpi1~3^2~20^2~1^2~39^2~25
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a99b05525dcc687de924265ea30d9ce8d23db270;p=gtk4.git

Make the nograbs flag always available

No need to restrict this to debug builds.
---

diff --git a/gdk/gdk.c b/gdk/gdk.c
index 73b5371c36..46abff469f 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -116,7 +116,7 @@ static const GdkDebugKey gdk_debug_keys[] = {
   { "vulkan",          GDK_DEBUG_VULKAN, "Information about Vulkan" },
   { "selection",       GDK_DEBUG_SELECTION, "Information about selections" },
   { "clipboard",       GDK_DEBUG_CLIPBOARD, "Information about clipboards" },
-  { "nograbs",         GDK_DEBUG_NOGRABS, "Disable pointer and keyboard grabs (X11)" },
+  { "nograbs",         GDK_DEBUG_NOGRABS, "Disable pointer and keyboard grabs (X11)", TRUE },
   { "portals",         GDK_DEBUG_PORTALS, "Force the use of portals" },
   { "gl-disable",      GDK_DEBUG_GL_DISABLE, "Disable OpenGL support" },
   { "gl-software",     GDK_DEBUG_GL_SOFTWARE, "Force OpenGL software rendering" },
diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c
index a8a0461e20..a068b00929 100644
--- a/gdk/x11/gdkdevice-xi2.c
+++ b/gdk/x11/gdkdevice-xi2.c
@@ -333,11 +333,9 @@ gdk_x11_device_xi2_grab (GdkDevice    *device,
                                                         event_mask,
                                                         &mask.mask_len);
 
-#ifdef G_ENABLE_DEBUG
-  if (GDK_DISPLAY_DEBUG_CHECK (display, NOGRABS))
+  if (gdk_display_get_debug_flags (display) & GDK_DEBUG_NOGRABS)
     status = GrabSuccess;
   else
-#endif
     status = XIGrabDevice (GDK_DISPLAY_XDISPLAY (display),
                            device_xi2->device_id,
                            xwindow,