[gnome-flashback] screensaver: use GfBG

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

commit 86c71a8776e40bce50042125b788e696105339fe
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sat Mar 20 16:19:04 2021 +0200

    screensaver: use GfBG

 gnome-flashback/libscreensaver/Makefile.am  |  2 ++
 gnome-flashback/libscreensaver/gf-manager.c | 30 +++++++++++------------------
 2 files changed, 13 insertions(+), 19 deletions(-)
---
diff --git a/gnome-flashback/libscreensaver/Makefile.am b/gnome-flashback/libscreensaver/Makefile.am
index 8d11848..5829927 100644
--- a/gnome-flashback/libscreensaver/Makefile.am
+++ b/gnome-flashback/libscreensaver/Makefile.am
@@ -9,6 +9,7 @@ libscreensaver_la_CPPFLAGS = \
        -DG_LOG_USE_STRUCTURED=1 \
        -DGNOME_DESKTOP_USE_UNSTABLE_API \
        -I$(top_builddir)/backends \
+       -I$(top_builddir)/gnome-flashback/libcommon \
        -I$(top_builddir)/gnome-flashback/libinput-sources \
        -I$(top_builddir)/gnome-flashback/libscreensaver \
        -I$(top_srcdir) \
@@ -62,6 +63,7 @@ libscreensaver_la_LDFLAGS = \
 libscreensaver_la_LIBADD = \
        $(top_builddir)/dbus/libdbus.la \
        $(top_builddir)/backends/libbackends.la \
+       $(top_builddir)/gnome-flashback/libcommon/libcommon.la \
        $(top_builddir)/gnome-flashback/libinput-sources/libinput-sources.la \
        $(SCREENSAVER_LIBS) \
        $(NULL)
diff --git a/gnome-flashback/libscreensaver/gf-manager.c b/gnome-flashback/libscreensaver/gf-manager.c
index aea00cd..c8604c6 100644
--- a/gnome-flashback/libscreensaver/gf-manager.c
+++ b/gnome-flashback/libscreensaver/gf-manager.c
@@ -23,16 +23,15 @@
 #include "config.h"
 #include "gf-manager.h"
 
-#include <libgnome-desktop/gnome-bg.h>
-
 #include "gf-window.h"
+#include "libcommon/gf-bg.h"
 
 struct _GfManager
 {
   GObject           parent;
 
   GSettings        *settings;
-  GnomeBG          *bg;
+  GfBG             *bg;
 
   GfGrab           *grab;
   GfFade           *fade;
@@ -223,25 +222,18 @@ apply_background (GfManager *self,
 
   g_debug ("Creating background: size %dx%d", rect.width, rect.height);
 
-#ifdef HAVE_GNOME_DESKTOP_3_35_4
-  surface = gnome_bg_create_surface (self->bg,
-                                     gtk_widget_get_window (GTK_WIDGET (window)),
-                                     rect.width,
-                                     rect.height);
-#else
-  surface = gnome_bg_create_surface (self->bg,
-                                     gtk_widget_get_window (GTK_WIDGET (window)),
-                                     rect.width,
-                                     rect.height,
-                                     FALSE);
-#endif
+  surface = gf_bg_create_surface (self->bg,
+                                  gtk_widget_get_window (GTK_WIDGET (window)),
+                                  rect.width,
+                                  rect.height,
+                                  FALSE);
 
   gf_window_set_background (window, surface);
   cairo_surface_destroy (surface);
 }
 
 static void
-bg_changed_cb (GnomeBG   *bg,
+bg_changed_cb (GfBG      *bg,
                GfManager *self)
 {
   GSList *l;
@@ -258,7 +250,7 @@ settings_change_event_cb (GSettings *settings,
                           gint       n_keys,
                           GfManager *self)
 {
-  gnome_bg_load_from_preferences (self->bg, self->settings);
+  gf_bg_load_from_preferences (self->bg, self->settings);
 
   return FALSE;
 }
@@ -688,7 +680,7 @@ static void
 gf_manager_init (GfManager *self)
 {
   self->settings = g_settings_new ("org.gnome.desktop.screensaver");
-  self->bg = gnome_bg_new ();
+  self->bg = gf_bg_new ();
 
   g_signal_connect (self->bg, "changed",
                     G_CALLBACK (bg_changed_cb),
@@ -698,7 +690,7 @@ gf_manager_init (GfManager *self)
                     G_CALLBACK (settings_change_event_cb),
                     self);
 
-  gnome_bg_load_from_preferences (self->bg, self->settings);
+  gf_bg_load_from_preferences (self->bg, self->settings);
 }
 
 GfManager *