From dad13ff1885246313b5e51de390600d74183fe81 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Wed, 25 Dec 2013 20:19:03 +0100
Subject: [PATCH] Use less deprecated code with Gtk+ >= 3.4

---
 src/desktop.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/desktop.c b/src/desktop.c
index b41b9d4..d75497d 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -2402,7 +2402,6 @@ static void _preferences_set(Desktop * desktop)
 	String const * p;
 	String * q;
 	String const * filename = NULL;
-	GdkColor color = { 0, 0, 0, 0 };
 	const char black[] = "#000000000000";
 	const char white[] = "#ffffffffffff";
 	int how;
@@ -2492,12 +2491,21 @@ static void _preferences_set_color(Config * config, char const * section,
 		GtkWidget * widget)
 {
 	char const * p;
+#if GTK_CHECK_VERSION(3, 4, 0)
+	GdkRGBA color = { 0.0, 0.0, 0.0, 0.0 };
+#else
 	GdkColor color = { 0, 0, 0, 0 };
+#endif
 
 	if((p = config_get(config, section, variable)) == NULL)
 		p = fallback;
+#if GTK_CHECK_VERSION(3, 4, 0)
+	if(p != NULL && gdk_rgba_parse(&color, p) == TRUE)
+		gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(widget), &color);
+#else
 	if(p != NULL && gdk_color_parse(p, &color) == TRUE)
 		gtk_color_button_set_color(GTK_COLOR_BUTTON(widget), &color);
+#endif
 }