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

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

commit bccbb73d5b5eb39c4e336384d5a18730da4155cf
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Aug 20 21:40:06 2019 +0300

    xutils: change _wnck_keyboard_move screen parameter type

 libwnck/window.c |  2 +-
 libwnck/xutils.c | 14 ++++++++------
 libwnck/xutils.h |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/libwnck/window.c b/libwnck/window.c
index ac6ed6b..dd07e1d 100644
--- a/libwnck/window.c
+++ b/libwnck/window.c
@@ -1784,7 +1784,7 @@ wnck_window_keyboard_move (WnckWindow *window)
 {
   g_return_if_fail (WNCK_IS_WINDOW (window));
 
-  _wnck_keyboard_move (WNCK_SCREEN_XSCREEN (window->priv->screen),
+  _wnck_keyboard_move (window->priv->screen,
                        window->priv->xwindow);
 }
 
diff --git a/libwnck/xutils.c b/libwnck/xutils.c
index 042e183..df4a363 100644
--- a/libwnck/xutils.c
+++ b/libwnck/xutils.c
@@ -928,15 +928,17 @@ _wnck_close (Screen *screen,
 #define _NET_WM_MOVERESIZE_MOVE_KEYBOARD    10
 
 void
-_wnck_keyboard_move (Screen *screen,
-                     Window  xwindow)
+_wnck_keyboard_move (WnckScreen *screen,
+                     Window      xwindow)
 {
+  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 f3b768f..ebeccb6 100644
--- a/libwnck/xutils.h
+++ b/libwnck/xutils.h
@@ -147,8 +147,8 @@ int    _wnck_select_input     (Screen  *screen,
                                int      mask,
                                gboolean update);
 
-void   _wnck_keyboard_move    (Screen *screen,
-                               Window  xwindow);
+void _wnck_keyboard_move (WnckScreen *screen,
+                          Window      xwindow);
 
 void _wnck_keyboard_size (WnckScreen *screen,
                           Window      xwindow);