luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-26 05:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix default setting generation in g_desktop_app_info_set_as_last_used

Browse Source 
* Do not ignore the system default
 * Do not exclude the last used being set from the default list

This fixes the default applications dialog in control-center.

https://bugzilla.gnome.org/show_bug.cgi?id=658188
This commit is contained in:
Josselin Mouette 2011-09-10 08:26:12 +02:00
parent 011c0b488f
commit a13f5ca4da
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gio/gdesktopappinfo.c
View File

@ -1688,18 +1688,29 @@ update_mimeapps_list (const char *desktop_id,
*/
if (!explicit_default)
{
system_list = get_all_desktop_entries_for_mime_type (content_type, (const char **) list, FALSE, NULL);
char *user_default;
/* 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);
if (system_list != NULL)
string = 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;
}
if (string)
{
g_key_file_set_string (key_file,
DEFAULT_APPLICATIONS_GROUP,
content_types[k],
string);
}
g_free (user_default);
g_list_free_full (system_list, g_free);
}
}