[gnome-software/wip/william/cherry-pick: 4/9] De-dup based on source

[William Hua <williamhua src gnome org>]

commit dacc0703445470af8f223f5fc28313af94c329f7
Author: Robert Ancell <robert ancell canonical com>
Date:   Wed Feb 17 11:31:07 2016 -0800

    De-dup based on source

 src/gs-app-list.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/src/gs-app-list.c b/src/gs-app-list.c
index 19e4cd5..baccd9f 100644
--- a/src/gs-app-list.c
+++ b/src/gs-app-list.c
@@ -155,26 +155,33 @@ gs_app_list_filter_duplicates (GsAppList **list)
        GsAppList *l;
        GsAppList *new = NULL;
        GsApp *app;
-       GsApp *found;
-       const gchar *id;
+       GsApp *found, *found_source;
+       const gchar *id, *source;
        g_autoptr(GHashTable) hash = NULL;
+       g_autoptr(GHashTable) source_hash = NULL;
 
        g_return_if_fail (list != NULL);
 
        /* create a new list with just the unique items */
        hash = g_hash_table_new (g_str_hash, g_str_equal);
+       source_hash = g_hash_table_new (g_str_hash, g_str_equal);
        for (l = *list; l != NULL; l = l->next) {
                app = GS_APP (l->data);
                id = gs_app_get_id (app);
+               source = gs_app_get_source_default (app);
                if (id == NULL) {
                        gs_app_list_add (&new, app);
                        continue;
                }
                found = g_hash_table_lookup (hash, id);
-               if (found == NULL) {
+               found_source = source != NULL ? g_hash_table_lookup (source_hash, source) : NULL;
+               if (found == NULL && found_source == NULL) {
                        gs_app_list_add (&new, app);
                        g_hash_table_insert (hash, (gpointer) id,
                                             GUINT_TO_POINTER (1));
+                       if (source != NULL)
+                               g_hash_table_insert (source_hash, (gpointer) source,
+                                                    GUINT_TO_POINTER (1));
                        continue;
                }
                g_debug ("ignoring duplicate %s", id);