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

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

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

    xutils: change _wnck_change_workspace screen parameter type

 libwnck/window.c | 12 ++++++------
 libwnck/xutils.c | 14 ++++++++------
 libwnck/xutils.h |  7 ++++---
 3 files changed, 18 insertions(+), 15 deletions(-)
---
diff --git a/libwnck/window.c b/libwnck/window.c
index f8b871d..235e3f9 100644
--- a/libwnck/window.c
+++ b/libwnck/window.c
@@ -1840,8 +1840,8 @@ wnck_window_move_to_workspace (WnckWindow    *window,
   g_return_if_fail (WNCK_IS_WINDOW (window));
   g_return_if_fail (WNCK_IS_WORKSPACE (space));
 
-  _wnck_change_workspace (WNCK_SCREEN_XSCREEN (window->priv->screen),
-                         window->priv->xwindow,
+  _wnck_change_workspace (window->priv->screen,
+                          window->priv->xwindow,
                           wnck_workspace_get_number (space));
 }
 
@@ -1874,8 +1874,8 @@ wnck_window_pin (WnckWindow *window)
 {
   g_return_if_fail (WNCK_IS_WINDOW (window));
 
-  _wnck_change_workspace (WNCK_SCREEN_XSCREEN (window->priv->screen),
-                         window->priv->xwindow,
+  _wnck_change_workspace (window->priv->screen,
+                          window->priv->xwindow,
                           ALL_WORKSPACES);
 }
 
@@ -1901,8 +1901,8 @@ wnck_window_unpin (WnckWindow *window)
 
   active = wnck_screen_get_active_workspace (window->priv->screen);
 
-  _wnck_change_workspace (WNCK_SCREEN_XSCREEN (window->priv->screen),
-                         window->priv->xwindow,
+  _wnck_change_workspace (window->priv->screen,
+                          window->priv->xwindow,
                           active ? wnck_workspace_get_number (active) : 0);
 }
 
diff --git a/libwnck/xutils.c b/libwnck/xutils.c
index 05e01f4..6a42a51 100644
--- a/libwnck/xutils.c
+++ b/libwnck/xutils.c
@@ -1038,16 +1038,18 @@ _wnck_change_state (Screen  *screen,
 }
 
 void
-_wnck_change_workspace (Screen     *screen,
-                       Window      xwindow,
+_wnck_change_workspace (WnckScreen *screen,
+                        Window      xwindow,
                         int         new_space)
 {
+  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 fac1e99..76a402f 100644
--- a/libwnck/xutils.h
+++ b/libwnck/xutils.h
@@ -108,9 +108,10 @@ void _wnck_change_state     (Screen  *screen,
                              gboolean add,
                              Atom     state1,
                              Atom     state2);
-void _wnck_change_workspace (Screen  *screen,
-                            Window   xwindow,
-                             int      new_space);
+
+void _wnck_change_workspace (WnckScreen *screen,
+                             Window      xwindow,
+                             int         new_space);
 
 void _wnck_activate (WnckScreen *screen,
                      Window      xwindow,