diff options
| author | Benjamin Otte <otte@redhat.com> | 2010-10-21 07:54:35 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-10-30 01:50:04 +0800 |
| commit | b6cc0f11b8607ef713300f384e279d7ffa4f2abb (patch) | |
| tree | 645b0b1afad2ce20b7bff57756f84ce809767ff0 | |
| parent | a0dbaa944946da38a9ae2557c08c749b865304bc (diff) | |
| download | gsoc2013-evolution-b6cc0f11b8607ef713300f384e279d7ffa4f2abb.tar gsoc2013-evolution-b6cc0f11b8607ef713300f384e279d7ffa4f2abb.tar.gz gsoc2013-evolution-b6cc0f11b8607ef713300f384e279d7ffa4f2abb.tar.bz2 gsoc2013-evolution-b6cc0f11b8607ef713300f384e279d7ffa4f2abb.tar.lz gsoc2013-evolution-b6cc0f11b8607ef713300f384e279d7ffa4f2abb.tar.xz gsoc2013-evolution-b6cc0f11b8607ef713300f384e279d7ffa4f2abb.tar.zst gsoc2013-evolution-b6cc0f11b8607ef713300f384e279d7ffa4f2abb.zip | |
gnome-canvas: Use gdk_parse_color() in GnomeCanvasShape
We don't want to allocate colors anymore. It's not needed with cairo.
| -rw-r--r-- | libgnomecanvas/gnome-canvas-shape.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libgnomecanvas/gnome-canvas-shape.c b/libgnomecanvas/gnome-canvas-shape.c index 334eff8b77..a2ff712085 100644 --- a/libgnomecanvas/gnome-canvas-shape.c +++ b/libgnomecanvas/gnome-canvas-shape.c @@ -249,7 +249,8 @@ gnome_canvas_shape_set_property (GObject *object, switch (param_id) { case PROP_FILL_COLOR: - if (gnome_canvas_get_color (item->canvas, g_value_get_string (value), &color)) { + if (g_value_get_string (value) && + gdk_color_parse (g_value_get_string (value), &color)) { priv->fill_set = TRUE; priv->fill_rgba = get_rgba_from_color (&color); } else if (priv->fill_set) @@ -281,7 +282,8 @@ gnome_canvas_shape_set_property (GObject *object, break; case PROP_OUTLINE_COLOR: - if (gnome_canvas_get_color (item->canvas, g_value_get_string (value), &color)) { + if (g_value_get_string (value) && + gdk_color_parse (g_value_get_string (value), &color)) { priv->outline_set = TRUE; priv->outline_rgba = get_rgba_from_color (&color); } else if (priv->outline_set) |