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

Revert "Fix default setting generation in g_desktop_app_info_set_as_last_used"

Browse Source 
This reverts commit a13f5ca4da.
This commit is contained in:
Matthias Clasen 2011-09-11 23:28:06 -04:00
parent 938e57dd4b
commit 75c989b9ab
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gio/gdesktopappinfo.c
View File

@ -1688,29 +1688,18 @@ update_mimeapps_list (const char *desktop_id,
*/ */
if (!explicit_default) if (!explicit_default)
{ {
char *user_default; system_list = get_all_desktop_entries_for_mime_type (content_type, (const char **) list, FALSE, NULL);
/* The system default can be in the list, don't exclude it */
system_list = get_all_desktop_entries_for_mime_type (content_type, NULL, FALSE, &user_default);
string = NULL; if (system_list != NULL)
if (user_default != NULL)
{
/* There is an existing default set in a lower priority defaults file, re-use it */
string = user_default;
}
else if (system_list != NULL)
{ {
string = system_list->data; string = system_list->data;
}
if (string)
{
g_key_file_set_string (key_file, g_key_file_set_string (key_file,
DEFAULT_APPLICATIONS_GROUP, DEFAULT_APPLICATIONS_GROUP,
content_types[k], content_types[k],
string); string);
} }
g_free (user_default);
g_list_free_full (system_list, g_free); g_list_free_full (system_list, g_free);
} }
} }