[almanah] UI: Removed deprecated GdkColor



commit 8b4ed6dfe86287153637b8ce6006147712dc3047
Author: Álvaro Peña <alvaropg gmail com>
Date:   Mon Oct 19 18:49:00 2015 +0200

    UI: Removed deprecated GdkColor

 src/event-factories/e-cell-renderer-color.c |    8 ++++----
 src/event-factories/e-source-selector.c     |    4 ++--
 src/printing.c                              |   12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/event-factories/e-cell-renderer-color.c b/src/event-factories/e-cell-renderer-color.c
index 39ff77e..15e7fe5 100644
--- a/src/event-factories/e-cell-renderer-color.c
+++ b/src/event-factories/e-cell-renderer-color.c
@@ -35,7 +35,7 @@ enum {
 };
 
 struct _ECellRendererColorPrivate {
-       GdkColor *color;
+       GdkRGBA *color;
 };
 
 G_DEFINE_TYPE (
@@ -127,7 +127,7 @@ cell_renderer_color_render (GtkCellRenderer *cell,
        if (!gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect))
                return;
 
-       gdk_cairo_set_source_color (cr, priv->color);
+       gdk_cairo_set_source_rgba (cr, priv->color);
        cairo_rectangle (cr, pix_rect.x, pix_rect.y, draw_rect.width, draw_rect.height);
 
        cairo_fill (cr);
@@ -146,7 +146,7 @@ cell_renderer_color_set_property (GObject *object,
        switch (property_id) {
                case PROP_COLOR:
                        if (priv->color != NULL)
-                               gdk_color_free (priv->color);
+                               gdk_rgba_free (priv->color);
                        priv->color = g_value_dup_boxed (value);
                        return;
        }
@@ -181,7 +181,7 @@ cell_renderer_color_finalize (GObject *object)
        priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (object);
 
        if (priv->color != NULL)
-               gdk_color_free (priv->color);
+               gdk_rgba_free (priv->color);
 
        /* Chain up to parent's finalize() method. */
        G_OBJECT_CLASS (e_cell_renderer_color_parent_class)->finalize (object);
diff --git a/src/event-factories/e-source-selector.c b/src/event-factories/e-source-selector.c
index 925d9cd..70619a7 100644
--- a/src/event-factories/e-source-selector.c
+++ b/src/event-factories/e-source-selector.c
@@ -270,7 +270,7 @@ source_selector_update_row (ESourceSelector *selector,
                extension = e_source_get_extension (source, extension_name);
 
        if (extension != NULL) {
-               GdkColor color;
+               GdkRGBA color;
                const gchar *color_spec = NULL;
                gboolean show_color = FALSE;
                gboolean show_toggle;
@@ -284,7 +284,7 @@ source_selector_update_row (ESourceSelector *selector,
                                E_SOURCE_SELECTABLE (extension));
 
                if (color_spec != NULL && *color_spec != '\0')
-                       show_color = gdk_color_parse (color_spec, &color);
+                       show_color = gdk_rgba_parse (&color, color_spec);
 
                show_toggle = e_source_selector_get_show_toggles (selector);
 
diff --git a/src/printing.c b/src/printing.c
index 09cb993..a53f08f 100644
--- a/src/printing.c
+++ b/src/printing.c
@@ -86,20 +86,20 @@ get_iter_attrs (GtkTextIter *iter, GtkTextIter *limit)
 
                if (bg_set)
                {
-                       GdkColor *color = NULL;
+                       GdkRGBA *color = NULL;
                        if (bg) pango_attribute_destroy (bg);
-                       g_object_get (tag, "background-gdk", &color, NULL);
+                       g_object_get (tag, "background-rgba", &color, NULL);
                        bg = pango_attr_background_new (color->red, color->green, color->blue);
-                       gdk_color_free (color);
+                       gdk_rgba_free (color);
                }
 
                if (fg_set)
                {
-                       GdkColor *color = NULL;
+                       GdkRGBA *color = NULL;
                        if (fg) pango_attribute_destroy (fg);
-                       g_object_get (tag, "foreground-gdk", &color, NULL);
+                       g_object_get (tag, "foreground-rgba", &color, NULL);
                        fg = pango_attr_foreground_new (color->red, color->green, color->blue);
-                       gdk_color_free (color);
+                       gdk_rgba_free (color);
                }
 
                if (style_set)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]