[Xfce4-commits] [apps/xfce4-dict] 02/43: Replace GdkColor by GdkRGBA

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

andre pushed a commit to branch master
in repository apps/xfce4-dict.

commit 3fe58a7a4627d30bd470c7104d74f251978399bf
Author: Andre Miranda <andre42m at gmail.com>
Date:   Tue Jun 21 22:58:49 2016 -0300

    Replace GdkColor by GdkRGBA
---
 lib/common.c | 39 ++++++++++++---------------------------
 lib/common.h |  8 ++++----
 lib/prefs.c  |  8 ++++----
 3 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/lib/common.c b/lib/common.c
index e80b051..259202e 100644
--- a/lib/common.c
+++ b/lib/common.c
@@ -314,21 +314,6 @@ static gdouble scale_round(gdouble val, gdouble factor)
 }
 
 
-static gchar *get_hex_from_color(GdkColor *color)
-{
-	gchar *buffer = g_malloc0(9);
-
-	g_return_val_if_fail(color != NULL, NULL);
-
-	g_snprintf(buffer, 8, "#%02X%02X%02X",
-	      (guint) (scale_round(color->red / 256, 255)),
-	      (guint) (scale_round(color->green / 256, 255)),
-	      (guint) (scale_round(color->blue / 256, 255)));
-
-	return buffer;
-}
-
-
 static gchar *get_spell_program(void)
 {
 	gchar *path;
@@ -450,14 +435,14 @@ void dict_read_rc_file(DictData *dd)
 	else
 		dd->spell_dictionary = spell_dictionary_default;
 
-	dd->color_link = g_new0(GdkColor, 1);
-	gdk_color_parse(link_color_str, dd->color_link);
-	dd->color_phonetic = g_new0(GdkColor, 1);
-	gdk_color_parse(phon_color_str, dd->color_phonetic);
-	dd->color_incorrect = g_new0(GdkColor, 1);
-	gdk_color_parse(error_color_str, dd->color_incorrect);
-	dd->color_correct = g_new0(GdkColor, 1);
-	gdk_color_parse(success_color_str, dd->color_correct);
+	dd->color_link = g_new0(GdkRGBA, 1);
+	gdk_rgba_parse(dd->color_link, link_color_str);
+	dd->color_phonetic = g_new0(GdkRGBA, 1);
+	gdk_rgba_parse(dd->color_phonetic, phon_color_str);
+	dd->color_incorrect = g_new0(GdkRGBA, 1);
+	gdk_rgba_parse(dd->color_incorrect, error_color_str);
+	dd->color_correct = g_new0(GdkRGBA, 1);
+	gdk_rgba_parse(dd->color_correct, success_color_str);
 
 	dd->speedreader_mark_paragraphs = mark_paragraphs;
 	dd->speedreader_wpm = wpm;
@@ -489,10 +474,10 @@ void dict_write_rc_file(DictData *dd)
 		xfce_rc_write_entry(rc, "spell_bin", dd->spell_bin);
 		xfce_rc_write_entry(rc, "spell_dictionary", dd->spell_dictionary);
 
-		link_color_str = get_hex_from_color(dd->color_link);
-		phon_color_str = get_hex_from_color(dd->color_phonetic);
-		error_color_str = get_hex_from_color(dd->color_incorrect);
-		success_color_str = get_hex_from_color(dd->color_correct);
+		link_color_str = gdk_rgba_to_string(dd->color_link);
+		phon_color_str = gdk_rgba_to_string(dd->color_phonetic);
+		error_color_str = gdk_rgba_to_string(dd->color_incorrect);
+		success_color_str = gdk_rgba_to_string(dd->color_correct);
 		xfce_rc_write_entry(rc, "link_color", link_color_str);
 		xfce_rc_write_entry(rc, "phonetic_color", phon_color_str);
 		xfce_rc_write_entry(rc, "error_color", error_color_str);
diff --git a/lib/common.h b/lib/common.h
index 2525b66..089eae4 100644
--- a/lib/common.h
+++ b/lib/common.h
@@ -110,10 +110,10 @@ typedef struct
 	GtkTextMark *mark_click;
 	GdkPixbuf *icon;
 
-	GdkColor *color_link;
-	GdkColor *color_phonetic;
-	GdkColor *color_correct;
-	GdkColor *color_incorrect;
+	GdkRGBA *color_link;
+	GdkRGBA *color_phonetic;
+	GdkRGBA *color_correct;
+	GdkRGBA *color_incorrect;
 
 	/* speed reader */
 	gint speedreader_wpm;
diff --git a/lib/prefs.c b/lib/prefs.c
index d321bba..d8bc6dd 100644
--- a/lib/prefs.c
+++ b/lib/prefs.c
@@ -352,10 +352,10 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent, DictData *dd)
 		label2 = gtk_label_new(_("Phonetics:"));
 		label3 = gtk_label_new(_("Spelled correctly:"));
 		label4 = gtk_label_new(_("Spelled incorrectly:"));
-		color_link = gtk_color_button_new_with_color(dd->color_link);
-		color_phon = gtk_color_button_new_with_color(dd->color_phonetic);
-		color_error = gtk_color_button_new_with_color(dd->color_incorrect);
-		color_success = gtk_color_button_new_with_color(dd->color_correct);
+		color_link = gtk_color_button_new_with_rgba(dd->color_link);
+		color_phon = gtk_color_button_new_with_rgba(dd->color_phonetic);
+		color_error = gtk_color_button_new_with_rgba(dd->color_incorrect);
+		color_success = gtk_color_button_new_with_rgba(dd->color_correct);
 		g_signal_connect(color_link, "color-set", G_CALLBACK(color_set_cb), dd->color_link);
 		g_signal_connect(color_phon, "color-set", G_CALLBACK(color_set_cb), dd->color_phonetic);
 		g_signal_connect(color_error, "color-set", G_CALLBACK(color_set_cb), dd->color_incorrect);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.