[gnome-software] Revert "trivial: Use new libappstream-glib to build the ID"



commit c9dbd646c3f7d23699685f320baefcb12198298f
Author: Kalev Lember <klember redhat com>
Date:   Wed Feb 21 10:29:28 2018 +0100

    Revert "trivial: Use new libappstream-glib to build the ID"
    
    This led to shell extension IDs that don't match what's in the system
    appstream data generated by appstream-builder.
    
    This reverts commit 8d7c0c3ea380df799ae9faf106b5bac6df5aa35c.

 plugins/shell-extensions/gs-plugin-shell-extensions.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/plugins/shell-extensions/gs-plugin-shell-extensions.c 
b/plugins/shell-extensions/gs-plugin-shell-extensions.c
index 08787124..2f8a1e8c 100644
--- a/plugins/shell-extensions/gs-plugin-shell-extensions.c
+++ b/plugins/shell-extensions/gs-plugin-shell-extensions.c
@@ -104,6 +104,12 @@ gs_plugin_adopt_app (GsPlugin *plugin, GsApp *app)
        }
 }
 
+static gchar *
+gs_plugin_shell_extensions_id_from_uuid (const gchar *uuid)
+{
+       return g_strdup_printf ("%s.shell-extension", uuid);
+}
+
 static AsAppState
 gs_plugin_shell_extensions_convert_state (guint value)
 {
@@ -136,7 +142,7 @@ gs_plugin_shell_extensions_parse_installed (GsPlugin *plugin,
        g_autoptr(AsIcon) ic = NULL;
        g_autoptr(GsApp) app = NULL;
 
-       id = as_utils_appstream_id_build (uuid);
+       id = gs_plugin_shell_extensions_id_from_uuid (uuid);
        app = gs_app_new (id);
        gs_app_set_metadata (app, "GnomeSoftware::Creator",
                             gs_plugin_get_name (plugin));
@@ -533,7 +539,7 @@ gs_plugin_shell_extensions_parse_app (GsPlugin *plugin,
        tmp = json_object_get_string_member (json_app, "uuid");
        if (tmp != NULL) {
                g_autofree gchar *id = NULL;
-               id = as_utils_appstream_id_build (tmp);
+               id = gs_plugin_shell_extensions_id_from_uuid (tmp);
                as_app_set_id (app, id);
                as_app_add_metadata (app, "shell-extensions::uuid", tmp);
        }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]