[glib] Revert "Fix default setting generation in g_desktop_app_info_set_as_last_used"
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Revert "Fix default setting generation in g_desktop_app_info_set_as_last_used"
- Date: Mon, 12 Sep 2011 03:29:24 +0000 (UTC)
commit 75c989b9ab7e5f4b55ec21c82184904557d86759
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Sep 11 23:28:06 2011 -0400
Revert "Fix default setting generation in g_desktop_app_info_set_as_last_used"
This reverts commit a13f5ca4da05c3a7edaed9a70c508f63772897cb.
gio/gdesktopappinfo.c | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
---
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index d4a5615..2df933f 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);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]