Merge from stable branch

This commit is contained in:
Kjartan Maraas 2003-04-29 17:52:40 +00:00
parent e3e9279f0c
commit 60980d0fe5
9 changed files with 35 additions and 9 deletions

View file

@ -1,3 +1,9 @@
2003-04-29 Kjartan Maraas <set EMAIL_ADDRESS environment variable>
* mime-type-info.c: (mime_category_info_get_full_name),
(mime_category_info_get_full_description): Use g_string_new (NULL)
instead of g_string_new (""). Reported to be more efficient.
Tue Feb 4 17:09:18 2003 Jonathan Blandford <jrb@redhat.com>
* Release 2.2.0.1

View file

@ -528,7 +528,7 @@ mime_category_info_get_full_name (MimeCategoryInfo *info)
ModelEntry *tmp;
gchar *ret, *s;
string = g_string_new ("");
string = g_string_new (NULL);
for (tmp = MODEL_ENTRY (info); tmp != NULL && tmp->type != MODEL_ENTRY_NONE; tmp = tmp->parent) {
g_string_prepend (string, MIME_CATEGORY_INFO (tmp)->name);
@ -550,7 +550,7 @@ mime_category_info_get_full_description (MimeCategoryInfo *info)
ModelEntry *tmp;
gchar *ret, *s;
string = g_string_new ("");
string = g_string_new (NULL);
for (tmp = MODEL_ENTRY (info); tmp != NULL && tmp->type != MODEL_ENTRY_NONE; tmp = tmp->parent) {
g_string_prepend (string, MIME_CATEGORY_INFO (tmp)->description);