Merge ~khurshid-alam/unity:drop-gnomebg into unity:master

[Khurshid Alam]

Drop libgnome-desktop for background drawing. Use libunity-settings-daemon instead. LP: #1863584

Note, it now requires new unity-settings-daemon from https://code.launchpad.net/~khurshid-alam/unity-settings-daemon/drop-gnomebg/+merge/379825

[Sebastien Bacher (seb128)]

Thanks

review: Approve

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 249b8fc..e12a71a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -245,6 +245,7 @@ set(UNITY_PLUGIN_SHARED_DEPS
     json-glib-1.0
     libbamf3>=0.5.3
     gnome-desktop-3.0
+    libunity-settings-daemon
     libnotify
     libstartup-notification-1.0
     nux-4.0>=4.0.5
diff --git a/debian/control b/debian/control
index 05ea690..5018833 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,8 @@ Build-Depends: cmake,
                libgl1-mesa-dri,
                libglib2.0-dev (>= 2.39.1),
                libgnome-desktop-3-dev,
+               libunity-settings-daemon-dev,
+               unity-settings-daemon-dev,
                libgtest-dev,
                libgtk-3-dev (>= 3.1),
                libido3-0.1-dev (>= 13.10.0),
diff --git a/lockscreen/BackgroundSettings.cpp b/lockscreen/BackgroundSettings.cpp
index 7ef4c6b..896c032 100644
--- a/lockscreen/BackgroundSettings.cpp
+++ b/lockscreen/BackgroundSettings.cpp
@@ -20,7 +20,7 @@
 #include <Nux/Nux.h>
 #include "BackgroundSettings.h"
 
-#include <libgnome-desktop/gnome-bg.h>
+#include <libunity-settings-daemon/gsd-bg.h>
 
 #include "LockScreenSettings.h"
 #include "unity-shared/CairoTexture.h"
@@ -40,10 +40,10 @@ inline int GetGridOffset(int size) { return (size % Settings::GRID_SIZE) / 2; }
 }
 
 BackgroundSettings::BackgroundSettings()
-  : gnome_bg_(gnome_bg_new())
+  : gsd_bg_(gsd_bg_new())
 {
   glib::Object<GSettings> settings(g_settings_new(SETTINGS_NAME.c_str()));
-  gnome_bg_load_from_preferences(gnome_bg_, settings);
+  gsd_bg_load_from_preferences(gsd_bg_, settings);
 }
 
 BaseTexturePtr BackgroundSettings::GetBackgroundTexture(int monitor)
@@ -55,26 +55,26 @@ BaseTexturePtr BackgroundSettings::GetBackgroundTexture(int monitor)
   nux::CairoGraphics cairo_graphics(CAIRO_FORMAT_ARGB32, geo.width, geo.height);
   cairo_t* c = cairo_graphics.GetInternalContext();
 
-  glib::Object<GnomeBG> gnome_bg;
+  glib::Object<GsdBG> gsd_bg;
   double s_width = geo.width / scale;
   double s_height = geo.height / scale;
   cairo_surface_t* bg_surface = nullptr;
 
   if (settings.use_user_background())
   {
-    gnome_bg = gnome_bg_;
+    gsd_bg = gsd_bg_;
   }
   else if (!settings.background().empty())
   {
-    gnome_bg = gnome_bg_new();
-    gnome_bg_set_filename(gnome_bg, settings.background().c_str());
-    gnome_bg_set_placement(gnome_bg, G_DESKTOP_BACKGROUND_STYLE_ZOOM);
+    gsd_bg = gsd_bg_new();
+    gsd_bg_set_filename(gsd_bg, settings.background().c_str());
+    gsd_bg_set_placement(gsd_bg, G_DESKTOP_BACKGROUND_STYLE_ZOOM);
   }
 
-  if (gnome_bg)
+  if (gsd_bg)
   {
     auto *root_window = gdk_get_default_root_window();
-    bg_surface = gnome_bg_create_surface(gnome_bg, root_window, geo.width, geo.height, FALSE);
+    bg_surface = gsd_bg_create_surface(gsd_bg, root_window, geo.width, geo.height, FALSE);
   }
 
   auto const& bg_color = settings.background_color();
diff --git a/lockscreen/BackgroundSettings.h b/lockscreen/BackgroundSettings.h
index 2176cb3..161709f 100644
--- a/lockscreen/BackgroundSettings.h
+++ b/lockscreen/BackgroundSettings.h
@@ -28,7 +28,7 @@ namespace nux
 class BaseTexture;
 }
 
-class _GnomeBG;
+class _GsdBG;
 
 namespace unity
 {
@@ -45,7 +45,7 @@ public:
   BaseTexturePtr GetBackgroundTexture(int monitor);
 
 private:
-  glib::Object<_GnomeBG> gnome_bg_;
+  glib::Object<_GsdBG> gsd_bg_;
 };
 
 }