callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set an error if we encounter properties without values set (#451303,

Browse Source 
* gtk/gtkbuilder.h (enum): 
    * gtk/gtkbuilderparser.c (end_element): 
    * tests/buildertest.c (test_parser): 
    Set an error if we encounter properties without values set
    (#451303, Philip Withnall)


svn path=/trunk/; revision=18252
This commit is contained in:
Johan Dahlin
2007-06-27 00:37:50 +00:00
parent 1d2955bcaf
commit ae800a34fa
4 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2007-06-26 Johan Dahlin <jdahlin@async.com.br> 2007-06-26 Johan Dahlin <jdahlin@async.com.br>
* gtk/gtkbuilder.h (enum):
* gtk/gtkbuilderparser.c (end_element):
* tests/buildertest.c (test_parser):
Set an error if we encounter properties without values set
(#451303, Philip Withnall)
* demos/gtk-demo/builder.c (do_builder): Connect the * demos/gtk-demo/builder.c (do_builder): Connect the
destroy signal in the example instead of the ui file. destroy signal in the example instead of the ui file.
Also set the screen and title of the window. Also set the screen and title of the window.

3
gtk/gtkbuilder.h
View File

@ -43,7 +43,8 @@ typedef enum
GTK_BUILDER_ERROR_UNHANDLED_TAG, GTK_BUILDER_ERROR_UNHANDLED_TAG,
GTK_BUILDER_ERROR_MISSING_ATTRIBUTE, GTK_BUILDER_ERROR_MISSING_ATTRIBUTE,
GTK_BUILDER_ERROR_INVALID_ATTRIBUTE, GTK_BUILDER_ERROR_INVALID_ATTRIBUTE,
GTK_BUILDER_ERROR_INVALID_TAG GTK_BUILDER_ERROR_INVALID_TAG,
GTK_BUILDER_ERROR_MISSING_PROPERTY_VALUE
} GtkBuilderError; } GtkBuilderError;
GQuark gtk_builder_error_quark (void); GQuark gtk_builder_error_quark (void);

24
gtk/gtkbuilderparser.c
View File

@ -139,6 +139,24 @@ error_invalid_tag (ParserData *data,
line_number, char_number, tag); line_number, char_number, tag);
} }
static void
error_missing_property_value (ParserData *data,
GError **error)
{
gint line_number, char_number;
g_markup_parse_context_get_position (data->ctx,
&line_number,
&char_number);
g_set_error (error,
GTK_BUILDER_ERROR,
GTK_BUILDER_ERROR_MISSING_PROPERTY_VALUE,
"%s:%d:%d <property> must have a value set",
data->filename,
line_number, char_number);
}
static GObject * static GObject *
builder_construct (ParserData *data, builder_construct (ParserData *data,
ObjectInfo *object_info) ObjectInfo *object_info)
@ -707,6 +725,12 @@ end_element (GMarkupParseContext *context,
PropertyInfo *prop_info = state_pop_info (data, PropertyInfo); PropertyInfo *prop_info = state_pop_info (data, PropertyInfo);
CommonInfo *info = state_peek_info (data, CommonInfo); CommonInfo *info = state_peek_info (data, CommonInfo);
if (!prop_info->data)
{
error_missing_property_value (data, error);
return;
}
/* Normal properties */ /* Normal properties */
if (strcmp (info->tag.name, "object") == 0) if (strcmp (info->tag.name, "object") == 0)
{ {

7
tests/buildertest.c
View File

@ -72,6 +72,13 @@ gboolean test_parser (void)
g_return_val_if_fail (strcmp (error->message, "<input>:1:74 'object' is not a valid tag here") == 0, FALSE); g_return_val_if_fail (strcmp (error->message, "<input>:1:74 'object' is not a valid tag here") == 0, FALSE);
g_error_free (error); g_error_free (error);
error = NULL;
gtk_builder_add_from_string (builder, "<interface><object class=\"GtkWindow\" id=\"a\"><property name=\"type\"/></object></interface>", -1, &error);
g_assert (error != NULL);
g_return_val_if_fail (strcmp (error->message, "<input>:1:67 <property> must have a value set") == 0, FALSE);
g_error_free (error);
return TRUE; return TRUE;
} }