diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2011-09-11 23:28:06 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2011-09-11 23:28:45 -0400 |
| commit | 75c989b9ab7e5f4b55ec21c82184904557d86759 (patch) | |
| tree | bfbeb66a692e22e7a30dcff1e5a96ff4b72ee7bf | |
| parent | 938e57dd4b403c3fe494c8c63b50abfb3673c6f6 (diff) | |
| download | glib-75c989b9ab7e5f4b55ec21c82184904557d86759.tar.gz | |
Revert "Fix default setting generation in g_desktop_app_info_set_as_last_used"
This reverts commit a13f5ca4da05c3a7edaed9a70c508f63772897cb.
| -rw-r--r-- | gio/gdesktopappinfo.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c index d4a5615a0..2df933fac 100644 --- a/gio/gdesktopappinfo.c +++ b/gio/gdesktopappinfo.c @@ -1688,29 +1688,18 @@ update_mimeapps_list (const char *desktop_id, */ if (!explicit_default) { - 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); + system_list = get_all_desktop_entries_for_mime_type (content_type, (const char **) list, FALSE, 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) + 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); } } |