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

[Kalev Lember <klember src gnome org>]

commit 950ab99e54b7313c06e748872fbe623463c0cf0f
Author: Kalev Lember <klember redhat com>
Date:   Wed Oct 14 15:59:02 2015 +0200

    Revert "Fix refining for apps that have no AppStream metadata"
    
    Commit da72e8ea72e6f3e5ff09eb38bbac7bea7c133885 fixes it in a better
    way.
    
    This reverts commit 9dd5be703fa15c904e710fa5f4d4f3acb888ceb5.

 src/plugins/gs-plugin-packagekit-refine.c |   44 ++++++++++++++--------------
 1 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/src/plugins/gs-plugin-packagekit-refine.c b/src/plugins/gs-plugin-packagekit-refine.c
index 248f9b4..a6f3fa4 100644
--- a/src/plugins/gs-plugin-packagekit-refine.c
+++ b/src/plugins/gs-plugin-packagekit-refine.c
@@ -794,28 +794,6 @@ gs_plugin_refine (GsPlugin *plugin,
                        goto out;
        }
 
-       /* set the package-id for an installed desktop file */
-       ptask = as_profile_start_literal (plugin->profile,
-                                         "packagekit-refine[desktop-filename->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;
-       }
-       as_profile_task_free (ptask);
-
        /* can we resolve in one go? */
        ptask = as_profile_start_literal (plugin->profile, "packagekit-refine[name->id]");
        for (l = *list; l != NULL; l = l->next) {
@@ -842,6 +820,28 @@ gs_plugin_refine (GsPlugin *plugin,
        }
        as_profile_task_free (ptask);
 
+       /* set the package-id for an installed desktop file */
+       ptask = as_profile_start_literal (plugin->profile,
+                                         "packagekit-refine[desktop-filename->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;
+       }
+       as_profile_task_free (ptask);
+
        /* any update details missing? */
        ptask = as_profile_start_literal (plugin->profile,
                                          "packagekit-refine[id->update-details]");