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

Fix default app lookup wrt parent types and defaults.list

Browse Source 
There was an issue when looking up the default handler
for a type where a supertype was listed in defaults.list.
We would pick the default for the parent type even if
there was a handler for the more specific type.

In the case of the new-style defaults marking (
"Default Applications" in mimeapps.list) we were already
checking for a more specific handler befor using a default,
but we also need to do a similar check for the defaults.list
case.

https://bugzilla.gnome.org/show_bug.cgi?id=678944
This commit is contained in:
Alexander Larsson 2012-06-28 14:50:37 +02:00
parent 1ae3080640
commit f14c0112d0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gdesktopappinfo.c
View File

@ -3326,7 +3326,7 @@ get_all_desktop_entries_for_mime_type (const char *base_mime_type,
default_entries = g_hash_table_lookup (dir->defaults_list_map, mime_type); default_entries = g_hash_table_lookup (dir->defaults_list_map, mime_type);
for (j = 0; default_entries != NULL && default_entries[j] != NULL; j++) for (j = 0; default_entries != NULL && default_entries[j] != NULL; j++)
{ {
if (default_entry == NULL && old_default_entry == NULL) if (default_entry == NULL && old_default_entry == NULL && desktop_entries == NULL)
old_default_entry = g_strdup (default_entries[j]); old_default_entry = g_strdup (default_entries[j]);
desktop_entries = append_desktop_entry (desktop_entries, default_entries[j], removed_entries); desktop_entries = append_desktop_entry (desktop_entries, default_entries[j], removed_entries);