Mercurial > pidgin3 / file diff

--- a/pidgin/gtkblist-theme-loader.c	Sat Sep 03 02:50:16 2016 -0400
+++ b/pidgin/gtkblist-theme-loader.c	Sun Sep 04 04:45:09 2016 -0400
@@ -47,25 +47,25 @@
 {
 	const char *font;
 	const char *colordesc;
-	GdkColor color;
+	GdkRGBA color;
 
 	font = purple_xmlnode_get_attrib(node, "font");
 
 	if ((colordesc = purple_xmlnode_get_attrib(node, "color")) == NULL ||
-			!gdk_color_parse(colordesc, &color))
-		gdk_color_parse(DEFAULT_TEXT_COLOR, &color);
+			!gdk_rgba_parse(&color, colordesc))
+		gdk_rgba_parse(&color, DEFAULT_TEXT_COLOR);
 
 	return pidgin_theme_font_new(font, &color);
 }
 
-static GdkColor *
+static GdkRGBA *
 parse_color(PurpleXmlNode *node, const char *tag)
 {
 	const char *temp = purple_xmlnode_get_attrib(node, tag);
-	GdkColor color;
+	GdkRGBA color;
 
-	if (temp && gdk_color_parse(temp, &color)) {
-		return gdk_color_copy(&color);
+	if (temp && gdk_rgba_parse(&color, temp)) {
+		return gdk_rgba_copy(&color);
 	} else {
 		return NULL;
 	}
@@ -78,7 +78,7 @@
 	gchar *dir, *filename_full, *data = NULL;
 	const gchar *temp, *name;
 	gboolean success = TRUE;
-	GdkColor *bgcolor, *expanded_bgcolor, *collapsed_bgcolor, *contact_color;
+	GdkRGBA *bgcolor, *expanded_bgcolor, *collapsed_bgcolor, *contact_color;
 	PidginThemeFont *expanded, *collapsed, *contact, *online, *away, *offline, *idle, *message, *message_nick_said, *status;
 	PidginBlistLayout layout;
 	PidginBlistTheme *theme;
@@ -238,13 +238,13 @@
 	}
 
 	if (bgcolor)
-		gdk_color_free(bgcolor);
+		gdk_rgba_free(bgcolor);
 	if (expanded_bgcolor)
-		gdk_color_free(expanded_bgcolor);
+		gdk_rgba_free(expanded_bgcolor);
 	if (collapsed_bgcolor)
-		gdk_color_free(collapsed_bgcolor);
+		gdk_rgba_free(collapsed_bgcolor);
 	if (contact_color)
-		gdk_color_free(contact_color);
+		gdk_rgba_free(contact_color);
 
 	return PURPLE_THEME(theme);
 }