luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent data loss in gdesktopappinfo.c

Browse Source 
Don't loose the content of mimeapps.list when it doesn't contain
a [Added Associations] group. Pointed out by Alexander Larsson.

https://bugzilla.gnome.org/show_bug.cgi?id=660130
This commit is contained in:
Matthias Clasen 2011-09-29 23:32:20 -04:00
parent e6c76d9fd4
commit 5156d1b2d4
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gio/gdesktopappinfo.c
View File

@ -1555,7 +1555,10 @@ update_mimeapps_list (const char *desktop_id,
key_file = g_key_file_new (); key_file = g_key_file_new ();
load_succeeded = g_key_file_load_from_file (key_file, filename, G_KEY_FILE_NONE, NULL); load_succeeded = g_key_file_load_from_file (key_file, filename, G_KEY_FILE_NONE, NULL);
if (!load_succeeded || !g_key_file_has_group (key_file, ADDED_ASSOCIATIONS_GROUP)) if (!load_succeeded ||
(!g_key_file_has_group (key_file, ADDED_ASSOCIATIONS_GROUP) &&
!g_key_file_has_group (key_file, REMOVED_ASSOCIATIONS_GROUP) &&
!g_key_file_has_group (key_file, DEFAULT_APPLICATIONS_GROUP)))
{ {
g_key_file_free (key_file); g_key_file_free (key_file);
key_file = g_key_file_new (); key_file = g_key_file_new ();
@ -1727,18 +1730,18 @@ update_mimeapps_list (const char *desktop_id,
g_strfreev (list); g_strfreev (list);
} }
g_strfreev (content_types); g_strfreev (content_types);
data = g_key_file_to_data (key_file, &data_size, error); data = g_key_file_to_data (key_file, &data_size, error);
g_key_file_free (key_file); g_key_file_free (key_file);
res = g_file_set_contents (filename, data, data_size, error); res = g_file_set_contents (filename, data, data_size, error);
mime_info_cache_reload (NULL); mime_info_cache_reload (NULL);
g_free (filename); g_free (filename);
g_free (data); g_free (data);
return res; return res;
} }