[gnome-applets] stickynotes: don't use deprecated GdkColor

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 0e26a90424dace4b7c1f2544fb6e4fbb600f2ce2
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Thu Mar 26 12:03:29 2015 +0200

    stickynotes: don't use deprecated GdkColor

 stickynotes/stickynotes_callbacks.c |   53 ++++++-----------------------------
 1 files changed, 9 insertions(+), 44 deletions(-)
---
diff --git a/stickynotes/stickynotes_callbacks.c b/stickynotes/stickynotes_callbacks.c
index 8e640d4..4339fa7 100644
--- a/stickynotes/stickynotes_callbacks.c
+++ b/stickynotes/stickynotes_callbacks.c
@@ -144,22 +144,14 @@ void properties_apply_color_cb(StickyNote *note)
        
        if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(note->w_def_color)))
        {
-               GdkColor color;
-               GdkColor font_color;
-               
-               gtk_color_button_get_color (GTK_COLOR_BUTTON (note->w_color),
-                               &color);
-               gtk_color_button_get_color (
-                               GTK_COLOR_BUTTON (note->w_font_color),
-                               &font_color);
-               color_str = g_strdup_printf ("#%.2x%.2x%.2x",
-                               color.red / 256,
-                               color.green / 256,
-                               color.blue / 256);
-               font_color_str = g_strdup_printf ("#%.2x%.2x%.2x",
-                               font_color.red / 256,
-                               font_color.green / 256,
-                               font_color.blue / 256);
+               GdkRGBA color;
+               GdkRGBA font_color;
+
+               gtk_color_button_get_rgba (GTK_COLOR_BUTTON (note->w_color), &color);
+               gtk_color_button_get_rgba (GTK_COLOR_BUTTON (note->w_font_color), &font_color);
+
+               color_str = gdk_rgba_to_string (&color);
+               font_color_str = gdk_rgba_to_string (&font_color);
        }
        
        stickynote_set_color (note, color_str, font_color_str, TRUE);
@@ -186,34 +178,7 @@ void properties_apply_font_cb(StickyNote *note)
 void
 properties_color_cb (GtkWidget *button, StickyNote *note)
 {
-       char *color_str = NULL;
-       char *font_color_str = NULL;
-       
-       if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(note->w_def_color)))
-       {
-                       GdkColor color;
-                       GdkColor font_color;
-                       
-                       gtk_color_button_get_color (
-                                       GTK_COLOR_BUTTON (note->w_color),
-                                       &color);
-                       gtk_color_button_get_color (
-                                       GTK_COLOR_BUTTON (note->w_font_color),
-                                       &font_color);
-                       color_str = g_strdup_printf ("#%.2x%.2x%.2x",
-                                       color.red / 256,
-                                       color.green / 256,
-                                       color.blue / 256);
-                       font_color_str = g_strdup_printf ("#%.2x%.2x%.2x",
-                                       font_color.red / 256,
-                                       font_color.green / 256,
-                                       font_color.blue / 256);
-               }
-       
-       stickynote_set_color (note, color_str, font_color_str, TRUE);
-
-       g_free (color_str);
-       g_free (font_color_str);
+       properties_apply_color_cb (note);
 }
 
 /* Properties Dialog Callback : Font */