summaryrefslogtreecommitdiff
path: root/gtk/gtkcssstylefuncs.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2014-05-22 09:05:58 -0400
committerMatthias Clasen <mclasen@redhat.com>2014-05-22 09:09:55 -0400
commit49cf5142ba9e9542e3e848f0fc55c4fd2eaa9f7f (patch)
tree2b0794b7842a9d9fe093db0389765ad3dd89b739 /gtk/gtkcssstylefuncs.c
parentc3a9a20839955a98266463c6fad4f0190feaccc2 (diff)
downloadgtk+-49cf5142ba9e9542e3e848f0fc55c4fd2eaa9f7f.tar.gz
Deprecate GdkColor
It has been replaced by GdkRGBA. Time to make it official. http://bugzilla.gnome.org/show_bug.cgi?id=636695
Diffstat (limited to 'gtk/gtkcssstylefuncs.c')
-rw-r--r--gtk/gtkcssstylefuncs.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/gtk/gtkcssstylefuncs.c b/gtk/gtkcssstylefuncs.c
index 9bb5406b31..8b5393a79b 100644
--- a/gtk/gtkcssstylefuncs.c
+++ b/gtk/gtkcssstylefuncs.c
@@ -272,7 +272,9 @@ color_value_print (const GValue *value,
g_string_append (string, "none");
else
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
char *s = gdk_color_to_string (color);
+G_GNUC_END_IGNORE_DEPRECATIONS
g_string_append (string, s);
g_free (s);
}
@@ -976,13 +978,14 @@ gtk_css_style_funcs_init (void)
rgba_value_parse,
rgba_value_print,
rgba_value_compute);
+
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+
register_conversion_function (GDK_TYPE_COLOR,
color_value_parse,
color_value_print,
color_value_compute);
- G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-
register_conversion_function (GTK_TYPE_SYMBOLIC_COLOR,
symbolic_color_value_parse,
symbolic_color_value_print,