[gnome-software/gnome-3-18] Revert "Fix refining for apps that have no AppStream metadata"

[Kalev Lember <klember src gnome org>]

commit 2fcb0798a0b0ce112f975cbe59c523f7e20fdccc
Author: Kalev Lember <klember redhat com>
Date:   Wed Oct 14 15:44:31 2015 +0200

    Revert "Fix refining for apps that have no AppStream metadata"
    
    Commit be30dfc1e40eb61e0386b18989e39da95bc7b490 fixes it in a better
    way.
    
    This reverts commit 93d34a9b9bb1cda5f02f6b85a300ffa45226616a.

 src/plugins/gs-plugin-packagekit-refine.c |   46 ++++++++++++++--------------
 1 files changed, 23 insertions(+), 23 deletions(-)
---
diff --git a/src/plugins/gs-plugin-packagekit-refine.c b/src/plugins/gs-plugin-packagekit-refine.c
index 2496bc7..3006784 100644
--- a/src/plugins/gs-plugin-packagekit-refine.c
+++ b/src/plugins/gs-plugin-packagekit-refine.c
@@ -732,29 +732,6 @@ gs_plugin_refine (GsPlugin *plugin,
                        goto out;
        }
 
-       /* set the package-id for an installed desktop file */
-       profile_id = "packagekit-refine[desktop-filename->id]";
-       gs_profile_start (plugin->profile, profile_id);
-       for (l = *list; l != NULL; l = l->next) {
-               if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_SETUP_ACTION) == 0)
-                       continue;
-               app = GS_APP (l->data);
-               if (gs_app_get_source_id_default (app) != NULL)
-                       continue;
-               tmp = gs_app_get_metadata_item (app, "DataDir::desktop-filename");
-               if (tmp == NULL)
-                       continue;
-               ret = gs_plugin_packagekit_refine_from_desktop (plugin,
-                                                               app,
-                                                               tmp,
-                                                               cancellable,
-                                                               error);
-               if (!ret)
-                       goto out;
-       }
-       gs_profile_stop (plugin->profile, profile_id);
-       profile_id = NULL;
-
        /* can we resolve in one go? */
        profile_id = "packagekit-refine[name->id]";
        gs_profile_start (plugin->profile, profile_id);
@@ -783,6 +760,29 @@ gs_plugin_refine (GsPlugin *plugin,
        gs_profile_stop (plugin->profile, profile_id);
        profile_id = NULL;
 
+       /* set the package-id for an installed desktop file */
+       profile_id = "packagekit-refine[desktop-filename->id]";
+       gs_profile_start (plugin->profile, profile_id);
+       for (l = *list; l != NULL; l = l->next) {
+               if ((flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_SETUP_ACTION) == 0)
+                       continue;
+               app = GS_APP (l->data);
+               if (gs_app_get_source_id_default (app) != NULL)
+                       continue;
+               tmp = gs_app_get_metadata_item (app, "DataDir::desktop-filename");
+               if (tmp == NULL)
+                       continue;
+               ret = gs_plugin_packagekit_refine_from_desktop (plugin,
+                                                               app,
+                                                               tmp,
+                                                               cancellable,
+                                                               error);
+               if (!ret)
+                       goto out;
+       }
+       gs_profile_stop (plugin->profile, profile_id);
+       profile_id = NULL;
+
        /* any update details missing? */
        profile_id = "packagekit-refine[id->update-details]";
        gs_profile_start (plugin->profile, profile_id);