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

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

commit 3a4c3fe07b39e8494dd73c3236d0916a9227e5e9
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Aug 20 21:34:04 2019 +0300

    xutils: change _wnck_keyboard_size 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 ce95626..ac6ed6b 100644
--- a/libwnck/window.c
+++ b/libwnck/window.c
@@ -1799,7 +1799,7 @@ wnck_window_keyboard_size (WnckWindow *window)
 {
   g_return_if_fail (WNCK_IS_WINDOW (window));
 
-  _wnck_keyboard_size (WNCK_SCREEN_XSCREEN (window->priv->screen),
+  _wnck_keyboard_size (window->priv->screen,
                        window->priv->xwindow);
 }
 
diff --git a/libwnck/xutils.c b/libwnck/xutils.c
index a8f62da..042e183 100644
--- a/libwnck/xutils.c
+++ b/libwnck/xutils.c
@@ -961,15 +961,17 @@ _wnck_keyboard_move (Screen *screen,
 }
 
 void
-_wnck_keyboard_size (Screen *screen,
-                     Window  xwindow)
+_wnck_keyboard_size (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 9e660d9..f3b768f 100644
--- a/libwnck/xutils.h
+++ b/libwnck/xutils.h
@@ -150,8 +150,8 @@ int    _wnck_select_input     (Screen  *screen,
 void   _wnck_keyboard_move    (Screen *screen,
                                Window  xwindow);
 
-void   _wnck_keyboard_size    (Screen *screen,
-                               Window  xwindow);
+void _wnck_keyboard_size (WnckScreen *screen,
+                          Window      xwindow);
 
 void _wnck_toggle_showing_desktop (Screen  *screen,
                                    gboolean show);