[gnome-software] trivial: Remove the version from the unique-id

[Richard Hughes <rhughes src gnome org>]

commit 1fc3a22bf42a984e865c0ec1bd2629a3d43c5ad5
Author: Richard Hughes <richard hughsie com>
Date:   Tue Aug 9 09:00:46 2016 +0100

    trivial: Remove the version from the unique-id

 src/gs-app.c                             |    7 +++----
 src/gs-self-test.c                       |   12 ++++++------
 src/plugins/gs-flatpak.c                 |    3 +--
 src/plugins/gs-plugin-dummy.c            |    2 +-
 src/plugins/gs-plugin-limba.c            |    3 +--
 src/plugins/gs-plugin-shell-extensions.c |    3 +--
 src/plugins/gs-plugin-snap.c             |    3 +--
 7 files changed, 14 insertions(+), 19 deletions(-)
---
diff --git a/src/gs-app.c b/src/gs-app.c
index 068fad6..eb713a5 100644
--- a/src/gs-app.c
+++ b/src/gs-app.c
@@ -826,7 +826,7 @@ gs_app_set_kind (GsApp *app, AsAppKind kind)
  * Gets the unique application ID used for de-duplication.
  * If nothing has been set the value from gs_app_get_id() will be used.
  *
- * Returns: The unique ID, e.g. `system/package/fedora/desktop/gimp.desktop/i386/master/1.2.3`, or %NULL
+ * Returns: The unique ID, e.g. `system/package/fedora/desktop/gimp.desktop/i386/master`, or %NULL
  **/
 const gchar *
 gs_app_get_unique_id (GsApp *app)
@@ -846,8 +846,7 @@ gs_app_get_unique_id (GsApp *app)
                                                           app->kind,
                                                           app->id,
                                                           NULL,        /* arch */
-                                                          NULL,        /* branch */
-                                                          app->version);
+                                                          NULL);       /* branch */
        }
        return app->unique_id;
 }
@@ -855,7 +854,7 @@ gs_app_get_unique_id (GsApp *app)
 /**
  * gs_app_set_unique_id:
  * @app: a #GsApp
- * @unique_id: a unique application ID, e.g. `system/package/fedora/desktop/gimp.desktop/i386/master/1.2.3`
+ * @unique_id: a unique application ID, e.g. `system/package/fedora/desktop/gimp.desktop/i386/master`
  *
  * Sets the unique application ID. Any #GsApp using the same ID will be
  * deduplicated. This means that applications that can exist from more than
diff --git a/src/gs-self-test.c b/src/gs-self-test.c
index decd21e..0c19b25 100644
--- a/src/gs-self-test.c
+++ b/src/gs-self-test.c
@@ -155,34 +155,34 @@ gs_plugin_func (void)
        /* respect priority when deduplicating */
        list = gs_app_list_new ();
        app = gs_app_new ("e");
-       gs_app_set_unique_id (app, "user/foo/*/*/e/*/*/*");
+       gs_app_set_unique_id (app, "user/foo/*/*/e/*/*");
        gs_app_list_add (list, app);
        gs_app_set_priority (app, 0);
        g_object_unref (app);
        app = gs_app_new ("e");
-       gs_app_set_unique_id (app, "user/bar/*/*/e/*/*/*");
+       gs_app_set_unique_id (app, "user/bar/*/*/e/*/*");
        gs_app_list_add (list, app);
        gs_app_set_priority (app, 99);
        g_object_unref (app);
        app = gs_app_new ("e");
-       gs_app_set_unique_id (app, "user/baz/*/*/e/*/*/*");
+       gs_app_set_unique_id (app, "user/baz/*/*/e/*/*");
        gs_app_list_add (list, app);
        gs_app_set_priority (app, 50);
        g_object_unref (app);
        g_assert_cmpint (gs_app_list_length (list), ==, 3);
        gs_app_list_filter_duplicates (list, GS_APP_LIST_FILTER_FLAG_PRIORITY);
        g_assert_cmpint (gs_app_list_length (list), ==, 1);
-       g_assert_cmpstr (gs_app_get_unique_id (gs_app_list_index (list, 0)), ==, "user/bar/*/*/e/*/*/*");
+       g_assert_cmpstr (gs_app_get_unique_id (gs_app_list_index (list, 0)), ==, "user/bar/*/*/e/*/*");
        g_object_unref (list);
 
        /* use globs when adding */
        list = gs_app_list_new ();
        app = gs_app_new ("b");
-       gs_app_set_unique_id (app, "a/b/c/d/e/f/g/h");
+       gs_app_set_unique_id (app, "a/b/c/d/e/f/g");
        gs_app_list_add (list, app);
        g_object_unref (app);
        app = gs_app_new ("b");
-       gs_app_set_unique_id (app, "a/b/c/*/e/f/g/h");
+       gs_app_set_unique_id (app, "a/b/c/*/e/f/g");
        gs_app_list_add (list, app);
        g_object_unref (app);
        g_assert_cmpint (gs_app_list_length (list), ==, 1);
diff --git a/src/plugins/gs-flatpak.c b/src/plugins/gs-flatpak.c
index 4eef283..06155f8 100644
--- a/src/plugins/gs-flatpak.c
+++ b/src/plugins/gs-flatpak.c
@@ -313,8 +313,7 @@ gs_flatpak_build_unique_id (FlatpakInstallation *installation, FlatpakRef *xref)
                                         kind,
                                         id,
                                         flatpak_ref_get_arch (xref),
-                                        flatpak_ref_get_branch (xref),
-                                        NULL); /* version */
+                                        flatpak_ref_get_branch (xref));
 }
 
 static GsApp *
diff --git a/src/plugins/gs-plugin-dummy.c b/src/plugins/gs-plugin-dummy.c
index 24d61fc..b17abd4 100644
--- a/src/plugins/gs-plugin-dummy.c
+++ b/src/plugins/gs-plugin-dummy.c
@@ -305,7 +305,7 @@ gs_plugin_add_popular (GsPlugin *plugin,
 
        /* add again, this time with a prefix so it gets deduplicated */
        app2 = gs_app_new ("zeus.desktop");
-       gs_app_set_unique_id (app2, "user/dummy/*/*/zeus.desktop/*/*/*");
+       gs_app_set_unique_id (app2, "user/dummy/*/*/zeus.desktop/*/*");
        gs_app_set_metadata (app2, "GnomeSoftware::Creator",
                             gs_plugin_get_name (plugin));
        gs_app_list_add (list, app2);
diff --git a/src/plugins/gs-plugin-limba.c b/src/plugins/gs-plugin-limba.c
index 7d187b3..8375b90 100644
--- a/src/plugins/gs-plugin-limba.c
+++ b/src/plugins/gs-plugin-limba.c
@@ -305,8 +305,7 @@ gs_plugin_app_from_pki (LiPkgInfo *pki)
                                              AS_APP_KIND_UNKNOWN,
                                              id,
                                              NULL,     /* arch */
-                                             NULL,     /* branch */
-                                             NULL);    /* version */
+                                             NULL);    /* branch */
 
        gs_app_set_unique_id (app, unique_id);
        gs_app_set_management_plugin (app, "limba");
diff --git a/src/plugins/gs-plugin-shell-extensions.c b/src/plugins/gs-plugin-shell-extensions.c
index 76a7206..117acfa 100644
--- a/src/plugins/gs-plugin-shell-extensions.c
+++ b/src/plugins/gs-plugin-shell-extensions.c
@@ -130,8 +130,7 @@ gs_plugin_shell_extensions_add_app (GsPlugin *plugin,
                                              AS_APP_KIND_SHELL_EXTENSION,
                                              id,
                                              NULL,     /* arch */
-                                             NULL,     /* branch */
-                                             NULL);    /* version */
+                                             NULL);    /* branch */
        gs_app_set_id (app, id);
        gs_app_set_unique_id (app, unique_id);
        gs_app_set_metadata (app, "GnomeSoftware::Creator",
diff --git a/src/plugins/gs-plugin-snap.c b/src/plugins/gs-plugin-snap.c
index 0745e97..6d20adb 100644
--- a/src/plugins/gs-plugin-snap.c
+++ b/src/plugins/gs-plugin-snap.c
@@ -342,8 +342,7 @@ get_apps (GsPlugin *plugin,
                                                      AS_APP_KIND_UNKNOWN,
                                                      id,
                                                      NULL,     /* arch */
-                                                     NULL,     /* branch */
-                                                     NULL);    /* version */
+                                                     NULL);    /* branch */
                app = gs_app_new (id);
                gs_app_set_unique_id (app, unique_id);
                gs_app_set_management_plugin (app, "snap");