luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-23 10:42:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Relax the attributes checking of the GBookmarkFile parser for the

Browse Source 
2008-08-31  Emmanuele Bassi  <ebassi@gnome.org>

	* glib/gbookmarkfile.c:
	(parse_bookmark_element), (parse_application_element),
	(parse_mime_type_element), (parse_icon_element): Relax the
	attributes checking of the GBookmarkFile parser for the
	attributes that the desktop bookmark file specification
	defines and controls. (See bug 550096)

svn path=/branches/glib-2-16/; revision=7417
This commit is contained in:
Emmanuele Bassi 2008-08-31 19:47:38 +00:00 committed by Emmanuele Bassi
parent 4ba8781eaf
commit 83eca28279
2 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2008-08-31 Emmanuele Bassi <ebassi@gnome.org>
* glib/gbookmarkfile.c:
(parse_bookmark_element), (parse_application_element),
(parse_mime_type_element), (parse_icon_element): Relax the
attributes checking of the GBookmarkFile parser for the
attributes that the desktop bookmark file specification
defines and controls. (See bug 550096)
2008-07-19 Matthias Clasen <mclasen@redhat.com>
* configure.in: Bump version

33
glib/gbookmarkfile.c
View File

@ -700,6 +700,10 @@ parse_bookmark_element (GMarkupParseContext *context,
visited = attribute_values[i];
else
{
/* bookmark is defined by the XBEL spec, so we need
* to error out if the element has different or
* missing attributes
*/
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE,
_("Unexpected attribute '%s' for element '%s'"),
@ -775,17 +779,9 @@ parse_application_element (GMarkupParseContext *context,
count = attribute_values[i];
else if (IS_ATTRIBUTE (attr, BOOKMARK_TIMESTAMP_ATTRIBUTE))
stamp = attribute_values[i];
else
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE,
_("Unexpected attribute '%s' for element '%s'"),
attr,
BOOKMARK_APPLICATION_ELEMENT);
return;
}
}
/* the "name" and "exec" attributes are mandatory */
if (!name)
{
g_set_error (error, G_MARKUP_ERROR,
@ -854,15 +850,6 @@ parse_mime_type_element (GMarkupParseContext *context,
{
if (IS_ATTRIBUTE (attr, MIME_TYPE_ATTRIBUTE))
type = attribute_values[i];
else
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE,
_("Unexpected attribute '%s' for element '%s'"),
attr,
MIME_TYPE_ELEMENT);
return;
}
}
if (!type)
@ -901,17 +888,9 @@ parse_icon_element (GMarkupParseContext *context,
href = attribute_values[i];
else if (IS_ATTRIBUTE (attr, BOOKMARK_TYPE_ATTRIBUTE))
type = attribute_values[i];
else
{
g_set_error (error, G_MARKUP_ERROR,
G_MARKUP_ERROR_UNKNOWN_ATTRIBUTE,
_("Unexpected attribute '%s' for element '%s'"),
attr,
BOOKMARK_ICON_ELEMENT);
return;
}
}
/* the "href" attribute is mandatory */
if (!href)
{
g_set_error (error, G_MARKUP_ERROR,