Don't insert unnecessary newlines in keyfiles. (#349825, Chris Wilson)

2006-08-05  Matthias Clasen  <mclasen@redhat.com>

	* glib/gkeyfile.c (g_key_file_to_data): Don't insert unnecessary
	newlines in keyfiles.  (#349825, Chris Wilson)
This commit is contained in:
Matthias Clasen 2006-08-05 21:57:35 +00:00 committed by Matthias Clasen
parent 994d642cde
commit e94c42bd46
3 changed files with 9 additions and 4 deletions

View File

@ -1,5 +1,8 @@
2006-08-05 Matthias Clasen <mclasen@redhat.com>
* glib/gkeyfile.c (g_key_file_to_data): Don't insert unnecessary
newlines in keyfiles. (#349825, Chris Wilson)
* glib/guniprop.c (g_unichar_toupper, g_unichar_tolower)
(real_toupper, real_tolower): If a character can't be converted,
don't replace it with a NUL byte, but leave it unchanged.

View File

@ -1,5 +1,8 @@
2006-08-05 Matthias Clasen <mclasen@redhat.com>
* glib/gkeyfile.c (g_key_file_to_data): Don't insert unnecessary
newlines in keyfiles. (#349825, Chris Wilson)
* glib/guniprop.c (g_unichar_toupper, g_unichar_tolower)
(real_toupper, real_tolower): If a character can't be converted,
don't replace it with a NUL byte, but leave it unchanged.

View File

@ -943,12 +943,11 @@ g_key_file_to_data (GKeyFile *key_file,
group = (GKeyFileGroup *) group_node->data;
/* separate groups by an empty line */
if (group_node->next)
g_string_append_c (data_string, '\n');
if (group->comment != NULL)
g_string_append_printf (data_string, "%s\n", group->comment->value);
else if (group_node->next) /* separate groups by at least an empty line */
g_string_append_c (data_string, '\n');
if (group->name != NULL)
g_string_append_printf (data_string, "[%s]\n", group->name);