diff options
| author | Johan Dahlin <johan@gnome.org> | 2008-03-07 20:03:35 +0000 |
|---|---|---|
| committer | Johan Dahlin <johan@src.gnome.org> | 2008-03-07 20:03:35 +0000 |
| commit | 424cc287f15a271c1068d2d892de07a080d57701 (patch) | |
| tree | f34b3bd814a05171746ab3c0c709c653ddc6e2ee /gtk/gtkbuilder.c | |
| parent | f55db27521932ad1a139308c11287d38f5c61e47 (diff) | |
| download | gtk+-424cc287f15a271c1068d2d892de07a080d57701.tar.gz | |
- Treat enums like enums and not values - Avoid invalid free, in case of
2008-03-07 Johan Dahlin <johan@gnome.org>
* gtk/gtkbuilder.c:
* gtk/gtkbuilderparser.c:
* gtk/gtkbuilderprivate.h:
* gtk/gtkiconfactory.c:
* tests/buildertest.c:
- Treat enums like enums and not values
- Avoid invalid free, in case of more than two sources
- Add better error messages
- Add much improved tests
(#520979, Christian Persch)
svn path=/trunk/; revision=19732
Diffstat (limited to 'gtk/gtkbuilder.c')
| -rw-r--r-- | gtk/gtkbuilder.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c index 11641035dc..dcea632844 100644 --- a/gtk/gtkbuilder.c +++ b/gtk/gtkbuilder.c @@ -50,11 +50,6 @@ static void gtk_builder_get_property (GObject *object, GParamSpec *pspec); static GType gtk_builder_real_get_type_from_name (GtkBuilder *builder, const gchar *type_name); -static gboolean _gtk_builder_enum_from_string (GType type, - const gchar *string, - gint *enum_value, - GError **error); - enum { PROP_0, @@ -1280,7 +1275,7 @@ gtk_builder_value_from_string_type (GtkBuilder *builder, return ret; } -static gboolean +gboolean _gtk_builder_enum_from_string (GType type, const gchar *string, gint *enum_value, |