luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-22 15:19:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

(bookmark_app_info_dump): Escape strings before dumping

Browse Source 
them in xml.  (#339340, Morten Welinder)
This commit is contained in:
Matthias Clasen 2006-04-27 20:44:42 +00:00
parent 86eb750432
commit 6305847e29
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -7,6 +7,9 @@
(expand_exec_line): Don't use printf() needlessly, handle (expand_exec_line): Don't use printf() needlessly, handle
trailing '%' gracefully. (#339338, Morten Welinder) trailing '%' gracefully. (#339338, Morten Welinder)
(is_element_full): Silence the compiler. (is_element_full): Silence the compiler.
(g_bookmark_file_dump, bookmark_metadata_dump):
(bookmark_app_info_dump): Escape strings before dumping
them in xml. (#339340, Morten Welinder)
2006-04-27 Behdad Esfahbod <behdad@gnome.org> 2006-04-27 Behdad Esfahbod <behdad@gnome.org>

3
ChangeLog.pre-2-12
View File

@ -7,6 +7,9 @@
(expand_exec_line): Don't use printf() needlessly, handle (expand_exec_line): Don't use printf() needlessly, handle
trailing '%' gracefully. (#339338, Morten Welinder) trailing '%' gracefully. (#339338, Morten Welinder)
(is_element_full): Silence the compiler. (is_element_full): Silence the compiler.
(g_bookmark_file_dump, bookmark_metadata_dump):
(bookmark_app_info_dump): Escape strings before dumping
them in xml. (#339340, Morten Welinder)
2006-04-27 Behdad Esfahbod <behdad@gnome.org> 2006-04-27 Behdad Esfahbod <behdad@gnome.org>

23
glib/gbookmarkfile.c
View File

@ -250,20 +250,27 @@ static gchar *
bookmark_app_info_dump (BookmarkAppInfo *app_info) bookmark_app_info_dump (BookmarkAppInfo *app_info)
{ {
gchar *retval; gchar *retval;
gchar *name, *exec;
g_assert (app_info != NULL); g_assert (app_info != NULL);
if (app_info->count == 0) if (app_info->count == 0)
return NULL; return NULL;
name = g_markup_escape_text (app_info->name, -1);
exec = g_markup_escape_text (app_info->exec, -1);
retval = g_strdup_printf (" <%s:%s %s=\"%s\" %s=\"%s\" %s=\"%ld\" %s=\"%u\"/>\n", retval = g_strdup_printf (" <%s:%s %s=\"%s\" %s=\"%s\" %s=\"%ld\" %s=\"%u\"/>\n",
BOOKMARK_NAMESPACE_NAME, BOOKMARK_NAMESPACE_NAME,
BOOKMARK_APPLICATION_ELEMENT, BOOKMARK_APPLICATION_ELEMENT,
BOOKMARK_NAME_ATTRIBUTE, app_info->name, BOOKMARK_NAME_ATTRIBUTE, name,
BOOKMARK_EXEC_ATTRIBUTE, app_info->exec, BOOKMARK_EXEC_ATTRIBUTE, exec,
BOOKMARK_TIMESTAMP_ATTRIBUTE, (time_t) app_info->stamp, BOOKMARK_TIMESTAMP_ATTRIBUTE, (time_t) app_info->stamp,
BOOKMARK_COUNT_ATTRIBUTE, app_info->count); BOOKMARK_COUNT_ATTRIBUTE, app_info->count);
g_free (name);
g_free (exec);
return retval; return retval;
} }
@ -370,8 +377,9 @@ bookmark_metadata_dump (BookmarkMetadata *metadata)
for (l = g_list_last (metadata->groups); l != NULL; l = l->prev) for (l = g_list_last (metadata->groups); l != NULL; l = l->prev)
{ {
gchar *group_name = (gchar *) l->data; gchar *group_name;
group_name = g_markup_escape_text ((gchar *) l->data, -1);
g_string_append_printf (retval, g_string_append_printf (retval,
" <%s:%s>%s</%s:%s>\n", " <%s:%s>%s</%s:%s>\n",
BOOKMARK_NAMESPACE_NAME, BOOKMARK_NAMESPACE_NAME,
@ -379,6 +387,7 @@ bookmark_metadata_dump (BookmarkMetadata *metadata)
group_name, group_name,
BOOKMARK_NAMESPACE_NAME, BOOKMARK_NAMESPACE_NAME,
BOOKMARK_GROUP_ELEMENT); BOOKMARK_GROUP_ELEMENT);
g_free (group_name);
} }
/* close groups container */ /* close groups container */
@ -519,7 +528,7 @@ bookmark_item_dump (BookmarkItem *item)
modified = timestamp_to_iso8601 (item->modified); modified = timestamp_to_iso8601 (item->modified);
visited = timestamp_to_iso8601 (item->visited); visited = timestamp_to_iso8601 (item->visited);
escaped_uri = g_markup_escape_text (item->uri, strlen (item->uri)); escaped_uri = g_markup_escape_text (item->uri, -1);
g_string_append_printf (retval, g_string_append_printf (retval,
" <%s %s=\"%s\" %s=\"%s\" %s=\"%s\" %s=\"%s\">\n", " <%s %s=\"%s\" %s=\"%s\" %s=\"%s\" %s=\"%s\">\n",
@ -537,7 +546,7 @@ bookmark_item_dump (BookmarkItem *item)
{ {
gchar *escaped_title; gchar *escaped_title;
escaped_title = g_markup_escape_text (item->title, strlen (item->title)); escaped_title = g_markup_escape_text (item->title, -1);
g_string_append_printf (retval, g_string_append_printf (retval,
" <%s>%s</%s>\n", " <%s>%s</%s>\n",
XBEL_TITLE_ELEMENT, XBEL_TITLE_ELEMENT,
@ -550,11 +559,11 @@ bookmark_item_dump (BookmarkItem *item)
{ {
gchar *escaped_desc; gchar *escaped_desc;
escaped_desc = g_markup_escape_text (item->description, strlen (item->description)); escaped_desc = g_markup_escape_text (item->description, -1);
g_string_append_printf (retval, g_string_append_printf (retval,
" <%s>%s</%s>\n", " <%s>%s</%s>\n",
XBEL_DESC_ELEMENT, XBEL_DESC_ELEMENT,
item->description, escaped_desc,
XBEL_DESC_ELEMENT); XBEL_DESC_ELEMENT);
g_free (escaped_desc); g_free (escaped_desc);
} }