[gnome-flashback] common: replace GdkScreen parameter with GdkDisplay

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

commit a137fe3984b7417f29da87cf11a16145c69fa55e
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sat Mar 20 21:49:49 2021 +0200

    common: replace GdkScreen parameter with GdkDisplay

 gnome-flashback/libcommon/gf-bg.c                   | 21 +++++++++++----------
 gnome-flashback/libcommon/gf-bg.h                   |  2 +-
 gnome-flashback/libdesktop/gf-background.c          |  7 +++----
 .../libroot-background/gf-root-background.c         |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/gnome-flashback/libcommon/gf-bg.c b/gnome-flashback/libcommon/gf-bg.c
index fb9356d..d16dca8 100644
--- a/gnome-flashback/libcommon/gf-bg.c
+++ b/gnome-flashback/libcommon/gf-bg.c
@@ -1998,31 +1998,32 @@ gf_bg_create_surface (GfBG      *self,
 }
 
 void
-gf_bg_set_surface_as_root (GdkScreen       *screen,
+gf_bg_set_surface_as_root (GdkDisplay      *display,
                            cairo_surface_t *surface)
 {
-  Display *display;
+  GdkScreen *screen;
+  Display *xdisplay;
   int screen_num;
 
-  g_return_if_fail (screen != NULL);
   g_return_if_fail (surface != NULL);
   g_return_if_fail (cairo_surface_get_type (surface) == CAIRO_SURFACE_TYPE_XLIB);
 
+  screen = gdk_display_get_default_screen (display);
   screen_num = gdk_screen_get_number (screen);
 
-  display = GDK_DISPLAY_XDISPLAY (gdk_screen_get_display (screen));
+  xdisplay = gdk_x11_display_get_xdisplay (display);
 
-  gdk_x11_display_grab (gdk_screen_get_display (screen));
+  gdk_x11_display_grab (display);
 
   gf_bg_set_root_pixmap_id (screen, surface);
 
-  XSetWindowBackgroundPixmap (display,
-                              RootWindow (display, screen_num),
+  XSetWindowBackgroundPixmap (xdisplay,
+                              RootWindow (xdisplay, screen_num),
                               cairo_xlib_surface_get_drawable (surface));
-  XClearWindow (display, RootWindow (display, screen_num));
+  XClearWindow (xdisplay, RootWindow (xdisplay, screen_num));
 
-  gdk_display_flush (gdk_screen_get_display (screen));
-  gdk_x11_display_ungrab (gdk_screen_get_display (screen));
+  gdk_display_flush (display);
+  gdk_x11_display_ungrab (display);
 }
 
 cairo_surface_t *
diff --git a/gnome-flashback/libcommon/gf-bg.h b/gnome-flashback/libcommon/gf-bg.h
index 577d982..48d0648 100644
--- a/gnome-flashback/libcommon/gf-bg.h
+++ b/gnome-flashback/libcommon/gf-bg.h
@@ -56,7 +56,7 @@ cairo_surface_t *gf_bg_create_surface                 (GfBG
                                                        int                        height,
                                                        gboolean                   root);
 
-void             gf_bg_set_surface_as_root            (GdkScreen                 *screen,
+void             gf_bg_set_surface_as_root            (GdkDisplay                *display,
                                                        cairo_surface_t           *surface);
 
 cairo_surface_t *gf_bg_get_surface_from_root          (GdkDisplay                *display,
diff --git a/gnome-flashback/libdesktop/gf-background.c b/gnome-flashback/libdesktop/gf-background.c
index ea14582..25a42e6 100644
--- a/gnome-flashback/libdesktop/gf-background.c
+++ b/gnome-flashback/libdesktop/gf-background.c
@@ -95,7 +95,6 @@ fade_cb (gpointer user_data)
   FadeData *fade;
   double current_time;
   double percent_done;
-  GdkScreen *screen;
 
   self = GF_BACKGROUND (user_data);
   fade = self->fade_data;
@@ -127,8 +126,8 @@ fade_cb (gpointer user_data)
 
   g_clear_pointer (&self->fade_data, free_fade_data);
 
-  screen = gtk_widget_get_screen (self->window);
-  gf_bg_set_surface_as_root (screen, self->surface);
+  gf_bg_set_surface_as_root (gtk_widget_get_display (self->window),
+                             self->surface);
 
   g_signal_emit (self, background_signals[CHANGED], 0);
 
@@ -184,7 +183,7 @@ change (GfBackground *self,
                                             height,
                                             TRUE);
 
-      gf_bg_set_surface_as_root (screen, self->surface);
+      gf_bg_set_surface_as_root (display, self->surface);
 
       g_signal_emit (self, background_signals[CHANGED], 0);
     }
diff --git a/gnome-flashback/libroot-background/gf-root-background.c 
b/gnome-flashback/libroot-background/gf-root-background.c
index 2c164a6..a2a0add 100644
--- a/gnome-flashback/libroot-background/gf-root-background.c
+++ b/gnome-flashback/libroot-background/gf-root-background.c
@@ -85,7 +85,7 @@ set_background (GfRootBackground *self)
 
   surface = gf_bg_create_surface (self->bg, root, width, height, TRUE);
 
-  gf_bg_set_surface_as_root (screen, surface);
+  gf_bg_set_surface_as_root (display, surface);
   cairo_surface_destroy (surface);
 }