From a5a0682278977df0477ee65a39e2f023022b5370 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Fri, 9 Feb 2018 19:04:56 +0100
Subject: [PATCH] Revert "background: Remove GdkColor deprecation warnings"

This reverts commit ed03e9c49faafba132ab4077daeaf213b541aed7.
---
 meson.build                            |  2 +-
 panels/background/cc-background-item.c | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/meson.build b/meson.build
index 58b5c59aa..e4f709a13 100644
--- a/meson.build
+++ b/meson.build
@@ -106,7 +106,7 @@ colord_dep = dependency('colord', version: '>= 0.1.34')
 gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', version: '>= 2.23.0')
 gio_dep = dependency('gio-2.0')
 glib_dep = dependency('glib-2.0', version: '>= 2.53.0')
-gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>= 3.27.90')
+gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>= 3.1.0')
 gnome_settings_dep = dependency('gnome-settings-daemon', version: '>= 3.25.90')
 goa_dep = dependency('goa-1.0', version: goa_req_version)
 gsettings_desktop_dep = dependency('gsettings-desktop-schemas', version: '>= 3.27.2')
diff --git a/panels/background/cc-background-item.c b/panels/background/cc-background-item.c
index 13c65837d..accf2ed19 100644
--- a/panels/background/cc-background-item.c
+++ b/panels/background/cc-background-item.c
@@ -141,9 +141,8 @@ get_emblemed_pixbuf (CcBackgroundItem *item, GdkPixbuf *pixbuf, gint scale_facto
 static void
 set_bg_properties (CcBackgroundItem *item)
 {
-        GdkRGBA pcolor = { 0, 0, 0, 0 };
-        GdkRGBA scolor = { 0, 0, 0, 0 };
-        GdkColor p, s;
+        GdkColor pcolor = { 0, 0, 0, 0 };
+        GdkColor scolor = { 0, 0, 0, 0 };
 
         if (item->uri) {
 		g_autoptr(GFile) file = NULL;
@@ -155,13 +154,13 @@ set_bg_properties (CcBackgroundItem *item)
 	}
 
         if (item->primary_color != NULL) {
-                gdk_rgba_parse (&pcolor, item->primary_color);
+                gdk_color_parse (item->primary_color, &pcolor);
         }
         if (item->secondary_color != NULL) {
-                gdk_rgba_parse (&scolor, item->secondary_color);
+                gdk_color_parse (item->secondary_color, &scolor);
         }
 
-        gnome_bg_set_rgba (item->bg, item->shading, &pcolor, &scolor);
+        gnome_bg_set_color (item->bg, item->shading, &pcolor, &scolor);
         gnome_bg_set_placement (item->bg, item->placement);
 }
 
@@ -970,12 +969,12 @@ static gboolean
 colors_equal (const char *a,
 	      const char *b)
 {
-	GdkRGBA color1, color2;
+	GdkColor color1, color2;
 
-	gdk_rgba_parse (&color1, a);
-	gdk_rgba_parse (&color2, b);
+	gdk_color_parse (a, &color1);
+	gdk_color_parse (b, &color2);
 
-	return gdk_rgba_equal (&color1, &color2);
+	return gdk_color_equal (&color1, &color2);
 }
 
 gboolean
-- 
2.14.3