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

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

commit 992e014f13f099f8e7975dc4330fe40ffc2f8fb6
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Aug 20 21:43:59 2019 +0300

    xutils: change _wnck_activate screen parameter type

 libwnck/window.c |  2 +-
 libwnck/xutils.c | 16 +++++++++-------
 libwnck/xutils.h |  8 +++++---
 3 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/libwnck/window.c b/libwnck/window.c
index dd07e1d..f8b871d 100644
--- a/libwnck/window.c
+++ b/libwnck/window.c
@@ -1928,7 +1928,7 @@ wnck_window_activate (WnckWindow *window,
 {
   g_return_if_fail (WNCK_IS_WINDOW (window));
 
-  _wnck_activate (WNCK_SCREEN_XSCREEN (window->priv->screen),
+  _wnck_activate (window->priv->screen,
                   window->priv->xwindow,
                   timestamp);
 }
diff --git a/libwnck/xutils.c b/libwnck/xutils.c
index df4a363..05e01f4 100644
--- a/libwnck/xutils.c
+++ b/libwnck/xutils.c
@@ -1072,20 +1072,22 @@ _wnck_change_workspace (Screen     *screen,
 }
 
 void
-_wnck_activate (Screen *screen,
-                Window  xwindow,
-                Time    timestamp)
+_wnck_activate (WnckScreen *screen,
+                Window      xwindow,
+                Time        timestamp)
 {
+  Screen *xscreen;
   Display *display;
-  Window   root;
-  XEvent   xev;
+  Window root;
+  XEvent xev;
 
   if (timestamp == 0)
     g_warning ("Received a timestamp of 0; window activation may not "
                "function properly.\n");
 
-  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 ebeccb6..fac1e99 100644
--- a/libwnck/xutils.h
+++ b/libwnck/xutils.h
@@ -111,9 +111,11 @@ void _wnck_change_state     (Screen  *screen,
 void _wnck_change_workspace (Screen  *screen,
                             Window   xwindow,
                              int      new_space);
-void _wnck_activate         (Screen  *screen,
-                             Window   xwindow,
-                             Time     timestamp);
+
+void _wnck_activate (WnckScreen *screen,
+                     Window      xwindow,
+                     Time        timestamp);
+
 void _wnck_activate_workspace (Screen *screen,
                                int     new_active_space,
                                Time    timestamp);