[libwnck/wip/muktupavels/prepare-for-wnck-handle: 8/8] xutils: change _wnck_close screen parameter type

[Alberts Muktupāvels <muktupavels src gnome org>]

commit c69cf54d22fcfb58531f31044b7bdc36d251f498
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Aug 20 21:57:58 2019 +0300

    xutils: change _wnck_close screen parameter type

 libwnck/window.c |  5 ++---
 libwnck/xutils.c | 16 +++++++++-------
 libwnck/xutils.h |  6 +++---
 3 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/libwnck/window.c b/libwnck/window.c
index 5f25e3f..fadda82 100644
--- a/libwnck/window.c
+++ b/libwnck/window.c
@@ -1469,12 +1469,11 @@ wnck_window_is_sticky                 (WnckWindow *window)
  **/
 void
 wnck_window_close (WnckWindow *window,
-                  guint32     timestamp)
+                   guint32     timestamp)
 {
   g_return_if_fail (WNCK_IS_WINDOW (window));
 
-  _wnck_close (WNCK_SCREEN_XSCREEN (window->priv->screen),
-              window->priv->xwindow, timestamp);
+  _wnck_close (window->priv->screen, window->priv->xwindow, timestamp);
 }
 
 /**
diff --git a/libwnck/xutils.c b/libwnck/xutils.c
index 89ed697..74e455d 100644
--- a/libwnck/xutils.c
+++ b/libwnck/xutils.c
@@ -882,16 +882,18 @@ _wnck_deiconify (Screen *screen,
 }
 
 void
-_wnck_close (Screen *screen,
-            Window  xwindow,
-            Time    timestamp)
+_wnck_close (WnckScreen *screen,
+             Window      xwindow,
+             Time        timestamp)
 {
+  Screen *xscreen;
   Display *display;
-  Window   root;
-  XEvent   xev;
+  Window root;
+  XEvent xev;
 
-  display = DisplayOfScreen (screen);
-  root = RootWindowOfScreen (screen);
+  xscreen = _wnck_screen_get_xscreen (screen);
+  display = DisplayOfScreen (xscreen);
+  root = RootWindowOfScreen (xscreen);
 
   xev.xclient.type = ClientMessage;
   xev.xclient.serial = 0;
diff --git a/libwnck/xutils.h b/libwnck/xutils.h
index 9d63996..e09666f 100644
--- a/libwnck/xutils.h
+++ b/libwnck/xutils.h
@@ -99,9 +99,9 @@ void _wnck_iconify   (Screen *screen,
 void _wnck_deiconify (Screen *screen,
                       Window  xwindow);
 
-void _wnck_close     (Screen *screen,
-                     Window  xwindow,
-                     Time    timestamp);
+void _wnck_close (WnckScreen *screen,
+                  Window      xwindow,
+                  Time        timestamp);
 
 void _wnck_change_state (WnckScreen *screen,
                          Window      xwindow,