From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 5 Nov 2017 23:36:49 +0000 (-0500)
Subject: x11: Drop use of gdk_display_get_toplevel_windows
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~23^2~840
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=28a8d03c0b5dfe415140e959cd9638c9d7c88a76;p=gtk4.git

x11: Drop use of gdk_display_get_toplevel_windows

Use the newly introduced helper for this task.
---

diff --git a/gdk/x11/gdkdevice-core-x11.c b/gdk/x11/gdkdevice-core-x11.c
index ef2aad5757..f165ff46cb 100644
--- a/gdk/x11/gdkdevice-core-x11.c
+++ b/gdk/x11/gdkdevice-core-x11.c
@@ -472,7 +472,7 @@ gdk_x11_device_core_window_at_position (GdkDevice       *device,
 
       /* FIXME: untrusted clients case not multidevice-safe */
       pointer_window = None;
-      toplevels = gdk_display_get_toplevel_windows (display);
+      toplevels = gdk_x11_display_get_toplevel_windows (display);
       for (list = toplevels; list != NULL; list = list->next)
         {
           window = GDK_WINDOW (list->data);
diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c
index b94ae39eec..bbc62943bf 100644
--- a/gdk/x11/gdkdevice-xi2.c
+++ b/gdk/x11/gdkdevice-xi2.c
@@ -545,7 +545,7 @@ gdk_x11_device_xi2_window_at_position (GdkDevice       *device,
       /* FIXME: untrusted clients case not multidevice-safe */
       pointer_window = None;
 
-      toplevels = gdk_display_get_toplevel_windows (display);
+      toplevels = gdk_x11_display_get_toplevel_windows (display);
       for (list = toplevels; list != NULL; list = list->next)
         {
           window = GDK_WINDOW (list->data);
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 1bce293216..c2895e1fb4 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -588,7 +588,7 @@ gdk_window_cache_new (GdkDisplay *display)
       GdkWindowImplX11 *impl;
       gint x, y, width, height;
 
-      toplevel_windows = gdk_display_get_toplevel_windows (display);
+      toplevel_windows = gdk_x11_display_get_toplevel_windows (display);
       for (list = toplevel_windows; list; list = list->next)
         {
           window = GDK_WINDOW (list->data);
diff --git a/gdk/x11/gdkmonitor-x11.c b/gdk/x11/gdkmonitor-x11.c
index 6a32f9ff1d..8cfddfe170 100644
--- a/gdk/x11/gdkmonitor-x11.c
+++ b/gdk/x11/gdkmonitor-x11.c
@@ -25,6 +25,7 @@
 #include "gdkdisplay-x11.h"
 #include "gdkscreen-x11.h"
 #include "gdkdisplayprivate.h"
+#include "gdkprivate-x11.h"
 
 
 G_DEFINE_TYPE (GdkX11Monitor, gdk_x11_monitor, GDK_TYPE_MONITOR)
@@ -36,7 +37,7 @@ gdk_monitor_has_fullscreen_window (GdkMonitor *monitor)
   GdkWindow *window;
   gboolean has_fullscreen;
 
-  toplevels = gdk_display_get_toplevel_windows (monitor->display);
+  toplevels = gdk_x11_display_get_toplevel_windows (monitor->display);
 
   has_fullscreen = FALSE;
   for (l = toplevels; l; l = l->next)
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 8506e4ba2f..3bf4a44567 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -833,7 +833,7 @@ _gdk_x11_screen_set_window_scale (GdkX11Screen *x11_screen,
   root = x11_screen->root_window;
   GDK_WINDOW_IMPL_X11 (root->impl)->window_scale = scale;
 
-  toplevels = gdk_display_get_toplevel_windows (x11_screen->display);
+  toplevels = gdk_x11_display_get_toplevel_windows (x11_screen->display);
 
   for (l = toplevels; l != NULL; l = l->next)
     {