diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2014-05-22 09:05:58 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2014-05-22 09:09:55 -0400 |
| commit | 49cf5142ba9e9542e3e848f0fc55c4fd2eaa9f7f (patch) | |
| tree | 2b0794b7842a9d9fe093db0389765ad3dd89b739 /gtk/gtkbuilder.c | |
| parent | c3a9a20839955a98266463c6fad4f0190feaccc2 (diff) | |
| download | gtk+-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/gtkbuilder.c')
| -rw-r--r-- | gtk/gtkbuilder.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c index 165e9e5269..f6e5c52e4f 100644 --- a/gtk/gtkbuilder.c +++ b/gtk/gtkbuilder.c @@ -122,7 +122,7 @@ * as %FALSE), enumerations (can be specified by their name, nick or * integer value), flags (can be specified by their name, nick, integer * value, optionally combined with “|”, e.g. “GTK_VISIBLE|GTK_REALIZED”) - * and colors (in a format understood by gdk_color_parse()). Pixbufs can + * and colors (in a format understood by gdk_rgba_parse()). Pixbufs can * be specified as a filename of an image file to load. Objects can be * referred to by their name and by default refer to objects declared * in the local xml fragment and objects exposed via @@ -1977,10 +1977,11 @@ gtk_builder_value_from_string_type (GtkBuilder *builder, } break; case G_TYPE_BOXED: - if (G_VALUE_HOLDS (value, GDK_TYPE_COLOR)) + if (G_VALUE_HOLDS (value, g_type_from_name ("GdkColor"))) { GdkColor color = { 0, }; +G_GNUC_BEGIN_IGNORE_DEPRECATIONS if (gdk_color_parse (string, &color)) g_value_set_boxed (value, &color); else @@ -1992,6 +1993,7 @@ gtk_builder_value_from_string_type (GtkBuilder *builder, string); ret = FALSE; } +G_GNUC_END_IGNORE_DEPRECATIONS } else if (G_VALUE_HOLDS (value, GDK_TYPE_RGBA)) { |