[gnome-software] trivial: Never add the .runtime suffix

[Richard Hughes <rhughes src gnome org>]

commit f872f4b7cc4879876b19b870980232fdc7d1ae90
Author: Richard Hughes <richard hughsie com>
Date:   Wed Feb 22 10:47:19 2017 +0000

    trivial: Never add the .runtime suffix
    
    We dropped doing this in the flatpak plugin some time ago...

 src/gs-self-test.c         |    4 ++--
 src/plugins/gs-appstream.c |    4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/src/gs-self-test.c b/src/gs-self-test.c
index da2ef7a..3fdccd3 100644
--- a/src/gs-self-test.c
+++ b/src/gs-self-test.c
@@ -1300,7 +1300,7 @@ gs_plugin_loader_flatpak_app_with_runtime_func (GsPluginLoader *plugin_loader)
        /* remove the runtime */
        runtime = gs_app_get_runtime (app);
        g_assert (runtime != NULL);
-       g_assert_cmpstr (gs_app_get_unique_id (runtime), ==, 
"user/flatpak/test/runtime/org.test.Runtime.runtime/master");
+       g_assert_cmpstr (gs_app_get_unique_id (runtime), ==, 
"user/flatpak/test/runtime/org.test.Runtime/master");
        ret = gs_plugin_loader_app_action (plugin_loader, runtime,
                                           GS_PLUGIN_ACTION_REMOVE,
                                           GS_PLUGIN_FAILURE_FLAGS_FATAL_ANY,
@@ -1628,7 +1628,7 @@ gs_plugin_loader_flatpak_app_update_func (GsPluginLoader *plugin_loader)
        /* remove the runtime */
        runtime = gs_app_get_runtime (app);
        g_assert (runtime != NULL);
-       g_assert_cmpstr (gs_app_get_unique_id (runtime), ==, 
"user/flatpak/test/runtime/org.test.Runtime.runtime/master");
+       g_assert_cmpstr (gs_app_get_unique_id (runtime), ==, 
"user/flatpak/test/runtime/org.test.Runtime/master");
        ret = gs_plugin_loader_app_action (plugin_loader, runtime,
                                           GS_PLUGIN_ACTION_REMOVE,
                                           GS_PLUGIN_FAILURE_FLAGS_FATAL_ANY,
diff --git a/src/plugins/gs-appstream.c b/src/plugins/gs-appstream.c
index 40f9066..e55fe6c 100644
--- a/src/plugins/gs-appstream.c
+++ b/src/plugins/gs-appstream.c
@@ -307,7 +307,6 @@ gs_appstream_create_runtime (GsPlugin *plugin,
                             const gchar *runtime)
 {
        GsApp *app_cache;
-       g_autofree gchar *id = NULL;
        g_autofree gchar *source = NULL;
        g_auto(GStrv) split = NULL;
        g_autoptr(GsApp) app = NULL;
@@ -318,8 +317,7 @@ gs_appstream_create_runtime (GsPlugin *plugin,
                return NULL;
 
        /* create the complete GsApp from the single string */
-       id = g_strdup_printf ("%s.runtime", split[0]);
-       app = gs_app_new (id);
+       app = gs_app_new (split[0]);
        source = g_strdup_printf ("runtime/%s", runtime);
        gs_app_add_source (app, source);
        gs_app_set_bundle_kind (app, AS_BUNDLE_KIND_FLATPAK);