Merge lp:~jbicha/unity-control-center/gd-3-28 into lp:unity-control-center

[Jeremy Bícha]

=== modified file 'configure.ac'
--- configure.ac	2017-12-07 05:41:33 +0000
+++ configure.ac	2018-02-16 13:13:23 +0000
@@ -115,7 +115,7 @@
 POLKIT_REQUIRED_VERSION=0.103
 NETWORK_MANAGER_REQUIRED_VERSION=0.8.992
 LIBNOTIFY_REQUIRED_VERSION=0.7.3
-GNOME_DESKTOP_REQUIRED_VERSION=3.5.91
+GNOME_DESKTOP_REQUIRED_VERSION=3.27.3
 SCHEMAS_REQUIRED_VERSION=3.15.4
 LIBWACOM_REQUIRED_VERSION=0.7
 CLUTTER_REQUIRED_VERSION=1.11.3
 
=== modified file 'debian/changelog'
--- debian/changelog	2017-12-25 19:10:40 +0000
+++ debian/changelog	2018-02-16 13:13:23 +0000
@@ -1,3 +1,11 @@
+unity-control-center (15.04.0+17.10.20171225-0ubuntu3) bionic; urgency=medium
+
+  * Build against latest gnome-desktop3, cherry-picked fix from
+    gnome-control-center.
+  * Bump minimum gnome-desktop3 to 3.27.3
+
+ -- Jeremy Bicha <[e-mail]>  Mon, 12 Feb 2018 21:58:09 -0500
+
 unity-control-center (15.04.0+17.10.20171225-0ubuntu1) bionic; urgency=medium
 
   [ Andrea Azzarone ]
 
=== modified file 'debian/control'
--- debian/control	2017-09-30 22:30:57 +0000
+++ debian/control	2018-02-16 13:13:23 +0000
@@ -26,7 +26,7 @@
                libgeonames-dev,
                libglib2.0-dev (>= 2.31.2),
                libgnome-bluetooth-dev (>= 3.3.4),
-               libgnome-desktop-3-dev (>= 3.5.91),
+               libgnome-desktop-3-dev (>= 3.27.3),
                libgnome-menu-3-dev,
                libgnomekbd-dev,
                libgoa-1.0-dev (>= 3.5.90),
 
=== modified file 'panels/appearance/cc-appearance-item.c'
--- panels/appearance/cc-appearance-item.c	2014-01-28 22:26:00 +0000
+++ panels/appearance/cc-appearance-item.c	2018-02-16 13:13:23 +0000
@@ -93,8 +93,9 @@
 static void
 set_bg_properties (CcAppearanceItem *item)
 {
-        GdkColor pcolor = { 0, 0, 0, 0 };
-        GdkColor scolor = { 0, 0, 0, 0 };
+        GdkRGBA pcolor = { 0, 0, 0, 0 };
+        GdkRGBA scolor = { 0, 0, 0, 0 };
+        GdkColor p, s;
 
         if (item->priv->uri) {
 		GFile *file;
@@ -109,13 +110,13 @@
 	}
 
         if (item->priv->primary_color != NULL) {
-                gdk_color_parse (item->priv->primary_color, &pcolor);
+                gdk_rgba_parse (&pcolor, item->priv->primary_color);
         }
         if (item->priv->secondary_color != NULL) {
-                gdk_color_parse (item->priv->secondary_color, &scolor);
+                gdk_rgba_parse (&scolor, item->priv->secondary_color);
         }
 
-        gnome_bg_set_color (item->priv->bg, item->priv->shading, &pcolor, &scolor);
+        gnome_bg_set_rgba (item->priv->bg, item->priv->shading, &pcolor, &scolor);
         gnome_bg_set_placement (item->priv->bg, item->priv->placement);
 }
 
@@ -904,12 +905,12 @@
 colors_equal (const char *a,
 	      const char *b)
 {
-	GdkColor color1, color2;
-
-	gdk_color_parse (a, &color1);
-	gdk_color_parse (b, &color2);
-
-	return gdk_color_equal (&color1, &color2);
+	GdkRGBA color1, color2;
+
+	gdk_rgba_parse (&color1, a);
+	gdk_rgba_parse (&color2, b);
+ 
+	return gdk_rgba_equal (&color1, &color2);
 }
 
 gboolean