[glib/glib-2-30: 17/41] Revert "Fix default setting generation in g_desktop_app_info_set_as_last_used"

[Ryan Lortie <ryanl src gnome org>]

commit 8c8f8e56de69b00f9c0ab978d6fd3b3df01ebb6a
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Sep 11 23:29:40 2011 -0400

    Revert "Fix default setting generation in g_desktop_app_info_set_as_last_used"
    
    This reverts commit 62a681453993e8618dd5fc41e987fa7308d617b0.

 gio/gdesktopappinfo.c |   17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)
---
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index d065c80..64f0349 100644
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -1686,29 +1686,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);
             }
         }