[gtk+/wip/baedert/box: 1/11] builder: Stop parsing GdkColor values
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/baedert/box: 1/11] builder: Stop parsing GdkColor values
- Date: Thu, 20 Oct 2016 18:11:34 +0000 (UTC)
commit 2437e97da1e58a9c071f711cb5226b21e784bca7
Author: Timm Bäder <mail baedert org>
Date: Mon Oct 17 18:44:46 2016 +0200
builder: Stop parsing GdkColor values
gtk/gtkbuilder.c | 22 ++--------------------
1 files changed, 2 insertions(+), 20 deletions(-)
---
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index a550e92..f415b2c 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 };
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]