diff options
author | Timm Bäder <mail@baedert.org> | 2016-10-17 18:44:46 +0200 |
---|---|---|
committer | Timm Bäder <mail@baedert.org> | 2016-10-20 20:12:04 +0200 |
commit | 2437e97da1e58a9c071f711cb5226b21e784bca7 (patch) | |
tree | 4830f6aa7c1a4f4b75341a2f9e45a57e06b8c262 /gtk/gtkbuilder.c | |
parent | 8dd549850c0afb7057a3f6e98338c717e70ed77d (diff) | |
download | gtk+-2437e97da1e58a9c071f711cb5226b21e784bca7.tar.gz |
builder: Stop parsing GdkColor values
Diffstat (limited to 'gtk/gtkbuilder.c')
-rw-r--r-- | gtk/gtkbuilder.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c index a550e92650..f415b2c772 100644 --- a/gtk/gtkbuilder.c +++ b/gtk/gtkbuilder.c @@ -1759,7 +1759,7 @@ gtk_builder_connect_signals_full (GtkBuilder *builder, * initialised beforehand. * * This function can handle char, uchar, boolean, int, uint, long, - * ulong, enum, flags, float, double, string, #GdkColor, #GdkRGBA and + * ulong, enum, flags, float, double, string, #GdkRGBA and * #GtkAdjustment type values. Support for #GtkWidget type values is * still to come. * @@ -1995,25 +1995,7 @@ gtk_builder_value_from_string_type (GtkBuilder *builder, } break; case G_TYPE_BOXED: - 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 - { - g_set_error (error, - GTK_BUILDER_ERROR, - GTK_BUILDER_ERROR_INVALID_VALUE, - "Could not parse color '%s'", - string); - ret = FALSE; - } -G_GNUC_END_IGNORE_DEPRECATIONS - } - else if (G_VALUE_HOLDS (value, GDK_TYPE_RGBA)) + if (G_VALUE_HOLDS (value, GDK_TYPE_RGBA)) { GdkRGBA rgba = { 0 }; |