GNOME.org
 

[gnome-software/gnome-3-20] trivial: Use the management_plugin to match the plugin name

commit 6d73ddcb00c307ef3e4ed473e405c7025923bfce
Author: Richard Hughes <richard hughsie com>
Date:   Thu Apr 14 13:02:33 2016 +0100

    trivial: Use the management_plugin to match the plugin name

 src/plugins/gs-appstream.c                 |    6 ++--
 src/plugins/gs-plugin-epiphany.c           |    6 ++--
 src/plugins/gs-plugin-fwupd.c              |    4 +-
 src/plugins/gs-plugin-limba.c              |   10 +++---
 src/plugins/gs-plugin-packagekit-offline.c |    2 +-
 src/plugins/gs-plugin-packagekit-origin.c  |    2 +-
 src/plugins/gs-plugin-packagekit-refine.c  |   10 +++---
 src/plugins/gs-plugin-packagekit-refresh.c |    4 +-
 src/plugins/gs-plugin-packagekit.c         |   12 ++++----
 src/plugins/gs-plugin-systemd-updates.c    |   22 ++++++++++++-
 src/plugins/gs-plugin-xdg-app.c            |   44 ++++++++++++++--------------
 src/plugins/packagekit-common.c            |    2 +-
 12 files changed, 71 insertions(+), 53 deletions(-)
---
diff --git a/src/plugins/gs-appstream.c b/src/plugins/gs-appstream.c
index a8068fd..2659d35 100644
--- a/src/plugins/gs-appstream.c
+++ b/src/plugins/gs-appstream.c
@@ -326,7 +326,7 @@ gs_refine_item_management_plugin (GsApp *app, AsApp *item)
        for (i = 0; i < bundles->len; i++) {
                AsBundle *bundle = g_ptr_array_index (bundles, i);
                if (as_bundle_get_kind (bundle) == AS_BUNDLE_KIND_XDG_APP) {
-                       management_plugin = "XgdApp";
+                       management_plugin = "xdg-app";
                        gs_app_add_source (app, as_bundle_get_id (bundle));
 
                        /* automatically add runtime */
@@ -343,7 +343,7 @@ gs_refine_item_management_plugin (GsApp *app, AsApp *item)
                        break;
                }
                if (as_bundle_get_kind (bundle) == AS_BUNDLE_KIND_LIMBA) {
-                       management_plugin = "Limba";
+                       management_plugin = "limba";
                        gs_app_add_source (app, as_bundle_get_id (bundle));
                        break;
                }
@@ -352,7 +352,7 @@ gs_refine_item_management_plugin (GsApp *app, AsApp *item)
        /* fall back to PackageKit */
        if (management_plugin == NULL &&
            as_app_get_pkgname_default (item) != NULL)
-               management_plugin = "PackageKit";
+               management_plugin = "packagekit";
        if (management_plugin != NULL)
                gs_app_set_management_plugin (app, management_plugin);
 }
diff --git a/src/plugins/gs-plugin-epiphany.c b/src/plugins/gs-plugin-epiphany.c
index 9904354..da43a89 100644
--- a/src/plugins/gs-plugin-epiphany.c
+++ b/src/plugins/gs-plugin-epiphany.c
@@ -234,7 +234,7 @@ gs_plugin_app_remove (GsPlugin *plugin, GsApp *app,
        g_autoptr(GFile) file_app = NULL;
 
        /* only process this app if was created by this plugin */
-       if (g_strcmp0 (gs_app_get_management_plugin (app), "Epiphany") != 0)
+       if (g_strcmp0 (gs_app_get_management_plugin (app), plugin->name) != 0)
                return TRUE;
        epi_desktop = gs_app_get_source_id_default (app);
        if (epi_desktop == NULL)
@@ -280,7 +280,7 @@ gs_plugin_refine_app (GsPlugin *plugin, GsApp *app, GError **error)
        if (g_file_test (fn, G_FILE_TEST_EXISTS)) {
                gs_app_set_state (app, AS_APP_STATE_INSTALLED);
                gs_app_add_source_id (app, fn);
-               gs_app_set_management_plugin (app, "Epiphany");
+               gs_app_set_management_plugin (app, plugin->name);
                return TRUE;
        }
        gs_app_set_state (app, AS_APP_STATE_AVAILABLE);
@@ -325,7 +325,7 @@ gs_plugin_launch (GsPlugin *plugin,
                  GError **error)
 {
        /* only process this app if was created by this plugin */
-       if (g_strcmp0 (gs_app_get_management_plugin (app), "Epiphany") != 0)
+       if (g_strcmp0 (gs_app_get_management_plugin (app), plugin->name) != 0)
                return TRUE;
        return gs_plugin_app_launch (plugin, app, error);
 }
diff --git a/src/plugins/gs-plugin-fwupd.c b/src/plugins/gs-plugin-fwupd.c
index c686449..65c39e6 100644
--- a/src/plugins/gs-plugin-fwupd.c
+++ b/src/plugins/gs-plugin-fwupd.c
@@ -380,7 +380,7 @@ gs_plugin_add_update_app (GsPlugin *plugin,
        }
 
        /* actually add the application */
-       gs_app_set_management_plugin (app, "fwupd");
+       gs_app_set_management_plugin (app, plugin->name);
        gs_app_set_kind (app, AS_APP_KIND_FIRMWARE);
        gs_app_add_source_id (app, filename_cache);
        gs_app_add_category (app, "System");
@@ -907,7 +907,7 @@ gs_plugin_fwupd_install (GsPlugin *plugin,
        gboolean offline = TRUE;
 
        /* only process this app if was created by this plugin */
-       if (g_strcmp0 (gs_app_get_management_plugin (app), "fwupd") != 0)
+       if (g_strcmp0 (gs_app_get_management_plugin (app), plugin->name) != 0)
                return TRUE;
 
        filename = gs_app_get_source_id_default (app);
diff --git a/src/plugins/gs-plugin-limba.c b/src/plugins/gs-plugin-limba.c
index e9f7af5..127c908 100644
--- a/src/plugins/gs-plugin-limba.c
+++ b/src/plugins/gs-plugin-limba.c
@@ -121,7 +121,7 @@ gs_plugin_refine (GsPlugin *plugin,
                app = GS_APP (l->data);
 
                /* not us */
-               if (g_strcmp0 (gs_app_get_management_plugin (app), "Limba") != 0)
+               if (g_strcmp0 (gs_app_get_management_plugin (app), "limba") != 0)
                        continue;
 
                if (!gs_plugin_refine_app (plugin, app, error))
@@ -189,7 +189,7 @@ gs_plugin_app_remove (GsPlugin *plugin,
        g_autoptr(GError) error_local = NULL;
 
        /* not us */
-       if (g_strcmp0 (gs_app_get_management_plugin (app), "Limba") != 0)
+       if (g_strcmp0 (gs_app_get_management_plugin (app), plugin->name) != 0)
                return TRUE;
 
        mgr = li_manager_new ();
@@ -235,7 +235,7 @@ gs_plugin_app_install (GsPlugin *plugin,
        g_autoptr(GError) error_local = NULL;
 
        /* not us */
-       if (g_strcmp0 (gs_app_get_management_plugin (app), "Limba") != 0)
+       if (g_strcmp0 (gs_app_get_management_plugin (app), plugin->name) != 0)
                return TRUE;
 
        /* create new installer and select remote package */
@@ -369,7 +369,7 @@ gs_plugin_add_updates (GsPlugin *plugin,
                        app = gs_app_new (li_pkg_info_get_name (old_pki));
                }
 
-               gs_app_set_management_plugin (app, "Limba");
+               gs_app_set_management_plugin (app, plugin->name);
                gs_app_set_state (app, AS_APP_STATE_UPDATABLE_LIVE);
                gs_app_set_kind (app, AS_APP_KIND_GENERIC);
                gs_plugin_add_app (list, app);
@@ -408,7 +408,7 @@ gs_plugin_app_update (GsPlugin *plugin,
        g_autoptr(GError) error_local = NULL;
 
        /* check if this update request is for us */
-       if (g_strcmp0 (gs_app_get_management_plugin (app), "Limba") != 0)
+       if (g_strcmp0 (gs_app_get_management_plugin (app), plugin->name) != 0)
                return TRUE;
 
        /* sanity check */
diff --git a/src/plugins/gs-plugin-packagekit-offline.c b/src/plugins/gs-plugin-packagekit-offline.c
index ea5c62d..dc46087 100644
--- a/src/plugins/gs-plugin-packagekit-offline.c
+++ b/src/plugins/gs-plugin-packagekit-offline.c
@@ -193,7 +193,7 @@ gs_plugin_add_updates_historical (GsPlugin *plugin,
                split = g_strsplit (package_ids[i], ";", 4);
                gs_app_add_source (app, split[0]);
                gs_app_set_update_version (app, split[1]);
-               gs_app_set_management_plugin (app, "PackageKit");
+               gs_app_set_management_plugin (app, "packagekit");
                gs_app_add_source_id (app, package_ids[i]);
                gs_app_set_state (app, AS_APP_STATE_UPDATABLE);
                gs_app_set_kind (app, AS_APP_KIND_GENERIC);
diff --git a/src/plugins/gs-plugin-packagekit-origin.c b/src/plugins/gs-plugin-packagekit-origin.c
index f685083..0529762 100644
--- a/src/plugins/gs-plugin-packagekit-origin.c
+++ b/src/plugins/gs-plugin-packagekit-origin.c
@@ -138,7 +138,7 @@ gs_plugin_packagekit_origin_refine_app (GsPlugin *plugin,
        const gchar *origin_id;
        const gchar *origin_ui;
 
-       if (g_strcmp0 (gs_app_get_management_plugin (app), "PackageKit") != 0)
+       if (g_strcmp0 (gs_app_get_management_plugin (app), "packagekit") != 0)
                return TRUE;
        if (gs_app_get_origin (app) == NULL)
                return TRUE;
diff --git a/src/plugins/gs-plugin-packagekit-refine.c b/src/plugins/gs-plugin-packagekit-refine.c
index 86e7439..342b6e6 100644
--- a/src/plugins/gs-plugin-packagekit-refine.c
+++ b/src/plugins/gs-plugin-packagekit-refine.c
@@ -155,7 +155,7 @@ gs_plugin_packagekit_set_metadata_from_package (GsPlugin *plugin,
 {
        const gchar *data;
 
-       gs_app_set_management_plugin (app, "PackageKit");
+       gs_app_set_management_plugin (app, "packagekit");
        gs_app_add_source (app, pk_package_get_name (package));
        gs_app_add_source_id (app, pk_package_get_id (package));
        switch (pk_package_get_info (package)) {
@@ -314,7 +314,7 @@ gs_plugin_packagekit_resolve_packages (GsPlugin *plugin,
        packages = pk_results_get_package_array (results);
        for (l = list; l != NULL; l = l->next) {
                app = GS_APP (l->data);
-               if (gs_app_get_metadata_item (app, "PackageKit::local-filename") != NULL)
+               if (gs_app_get_metadata_item (app, "packagekit::local-filename") != NULL)
                        continue;
                gs_plugin_packagekit_resolve_packages_app (plugin, packages, app);
        }
@@ -663,7 +663,7 @@ gs_plugin_refine_require_details (GsPlugin *plugin,
                app = GS_APP (l->data);
                if (gs_app_get_kind (app) == AS_APP_KIND_WEB_APP)
                        continue;
-               if (g_strcmp0 (gs_app_get_management_plugin (app), "PackageKit") != 0)
+               if (g_strcmp0 (gs_app_get_management_plugin (app), "packagekit") != 0)
                        continue;
                if (gs_app_get_source_id_default (app) == NULL)
                        continue;
@@ -835,7 +835,7 @@ gs_plugin_refine (GsPlugin *plugin,
                app = GS_APP (l->data);
                if (gs_app_get_kind (app) == AS_APP_KIND_WEB_APP)
                        continue;
-               if (g_strcmp0 (gs_app_get_management_plugin (app), "PackageKit") != 0)
+               if (g_strcmp0 (gs_app_get_management_plugin (app), "packagekit") != 0)
                        continue;
                sources = gs_app_get_sources (app);
                if (sources->len == 0)
@@ -903,7 +903,7 @@ gs_plugin_refine (GsPlugin *plugin,
                app = GS_APP (l->data);
                if (gs_app_get_state (app) != AS_APP_STATE_UPDATABLE)
                        continue;
-               if (g_strcmp0 (gs_app_get_management_plugin (app), "PackageKit") != 0)
+               if (g_strcmp0 (gs_app_get_management_plugin (app), "packagekit") != 0)
                        continue;
                if (gs_plugin_refine_requires_update_details (app, flags))
                        updatedetails_all = g_list_prepend (updatedetails_all, app);
diff --git a/src/plugins/gs-plugin-packagekit-refresh.c b/src/plugins/gs-plugin-packagekit-refresh.c
index 835d159..2828405 100644
--- a/src/plugins/gs-plugin-packagekit-refresh.c
+++ b/src/plugins/gs-plugin-packagekit-refresh.c
@@ -332,7 +332,7 @@ gs_plugin_filename_to_app (GsPlugin *plugin,
        package_id = pk_details_get_package_id (item);
        split = pk_package_id_split (package_id);
        basename = g_path_get_basename (filename);
-       gs_app_set_management_plugin (app, "PackageKit");
+       gs_app_set_management_plugin (app, "packagekit");
        gs_app_set_kind (app, AS_APP_KIND_GENERIC);
        gs_app_set_state (app, AS_APP_STATE_AVAILABLE_LOCAL);
        if (pk_details_get_summary (item))
@@ -341,7 +341,7 @@ gs_plugin_filename_to_app (GsPlugin *plugin,
        else
                gs_app_set_name (app, GS_APP_QUALITY_LOWEST, split[PK_PACKAGE_ID_NAME]);
        gs_app_set_version (app, split[PK_PACKAGE_ID_VERSION]);
-       gs_app_set_metadata (app, "PackageKit::local-filename", filename);
+       gs_app_set_metadata (app, "packagekit::local-filename", filename);
        gs_app_set_origin (app, basename);
        gs_app_add_source (app, split[PK_PACKAGE_ID_NAME]);
        gs_app_add_source_id (app, package_id);
diff --git a/src/plugins/gs-plugin-packagekit.c b/src/plugins/gs-plugin-packagekit.c
index 8bbe1e5..9cc7640 100644
--- a/src/plugins/gs-plugin-packagekit.c
+++ b/src/plugins/gs-plugin-packagekit.c
@@ -264,7 +264,7 @@ gs_plugin_add_sources (GsPlugin *plugin,
                rd = g_ptr_array_index (array, i);
                id = pk_repo_detail_get_id (rd);
                app = gs_app_new (id);
-               gs_app_set_management_plugin (app, "PackageKit");
+               gs_app_set_management_plugin (app, plugin->name);
                gs_app_set_kind (app, AS_APP_KIND_SOURCE);
                gs_app_set_state (app, AS_APP_STATE_INSTALLED);
                gs_app_set_name (app,
@@ -335,7 +335,7 @@ gs_plugin_app_install (GsPlugin *plugin,
        data.ptask = NULL;
 
        /* only process this app if was created by this plugin */
-       if (g_strcmp0 (gs_app_get_management_plugin (app), "PackageKit") != 0)
+       if (g_strcmp0 (gs_app_get_management_plugin (app), plugin->name) != 0)
                return TRUE;
 
        /* we enable the repo */
@@ -434,7 +434,7 @@ gs_plugin_app_install (GsPlugin *plugin,
                        return FALSE;
                break;
        case AS_APP_STATE_AVAILABLE_LOCAL:
-               package_id = gs_app_get_metadata_item (app, "PackageKit::local-filename");
+               package_id = gs_app_get_metadata_item (app, "packagekit::local-filename");
                if (package_id == NULL) {
                        g_set_error_literal (error,
                                             GS_PLUGIN_ERROR,
@@ -453,7 +453,7 @@ gs_plugin_app_install (GsPlugin *plugin,
                        return FALSE;
 
                /* get the new icon from the package */
-               gs_app_set_metadata (app, "PackageKit::local-filename", NULL);
+               gs_app_set_metadata (app, "packagekit::local-filename", NULL);
                gs_app_set_icon (app, NULL);
                gs_app_set_pixbuf (app, NULL);
                break;
@@ -569,7 +569,7 @@ gs_plugin_app_remove (GsPlugin *plugin,
        data.ptask = NULL;
 
        /* only process this app if was created by this plugin */
-       if (g_strcmp0 (gs_app_get_management_plugin (app), "PackageKit") != 0)
+       if (g_strcmp0 (gs_app_get_management_plugin (app), plugin->name) != 0)
                return TRUE;
 
        /* remove repo and all apps in it */
@@ -750,7 +750,7 @@ gs_plugin_launch (GsPlugin *plugin,
                  GError **error)
 {
        /* only process this app if was created by this plugin */
-       if (g_strcmp0 (gs_app_get_management_plugin (app), "PackageKit") != 0)
+       if (g_strcmp0 (gs_app_get_management_plugin (app), plugin->name) != 0)
                return TRUE;
        return gs_plugin_app_launch (plugin, app, error);
 }
diff --git a/src/plugins/gs-plugin-systemd-updates.c b/src/plugins/gs-plugin-systemd-updates.c
index 952511a..e433ca2 100644
--- a/src/plugins/gs-plugin-systemd-updates.c
+++ b/src/plugins/gs-plugin-systemd-updates.c
@@ -127,7 +127,7 @@ gs_plugin_add_updates (GsPlugin *plugin,
                g_autoptr(GsApp) app = NULL;
                g_auto(GStrv) split = NULL;
                app = gs_app_new (NULL);
-               gs_app_set_management_plugin (app, "PackageKit");
+               gs_app_set_management_plugin (app, "packagekit");
                gs_app_add_source_id (app, package_ids[i]);
                split = pk_package_id_split (package_ids[i]);
                gs_app_add_source (app, split[PK_PACKAGE_ID_NAME]);
@@ -148,7 +148,19 @@ gs_plugin_offline_update (GsPlugin *plugin,
                           GCancellable *cancellable,
                           GError **error)
 {
-       return pk_offline_trigger (PK_OFFLINE_ACTION_REBOOT, cancellable, error);
+       GList *l;
+
+       /* any apps to process offline */
+       for (l = apps; l != NULL; l = l->next) {
+               GsApp *app = GS_APP (l->data);
+
+               /* only process this app if was created by this plugin */
+               if (g_strcmp0 (gs_app_get_management_plugin (app), "packagekit") != 0)
+                       continue;
+               return pk_offline_trigger (PK_OFFLINE_ACTION_REBOOT,
+                                          cancellable, error);
+       }
+       return TRUE;
 }
 
 /**
@@ -160,6 +172,9 @@ gs_plugin_offline_update_cancel (GsPlugin *plugin,
                                 GCancellable *cancellable,
                                 GError **error)
 {
+       /* only process this app if was created by this plugin */
+       if (g_strcmp0 (gs_app_get_management_plugin (app), "packagekit") != 0)
+               return TRUE;
        return pk_offline_cancel (NULL, error);
 }
 
@@ -172,5 +187,8 @@ gs_plugin_app_upgrade_trigger (GsPlugin *plugin,
                                GCancellable *cancellable,
                                GError **error)
 {
+       /* only process this app if was created by this plugin */
+       if (g_strcmp0 (gs_app_get_management_plugin (app), "packagekit") != 0)
+               return TRUE;
        return pk_offline_trigger_upgrade (PK_OFFLINE_ACTION_REBOOT, cancellable, error);
 }
diff --git a/src/plugins/gs-plugin-xdg-app.c b/src/plugins/gs-plugin-xdg-app.c
index 713eb13..99c7bda 100644
--- a/src/plugins/gs-plugin-xdg-app.c
+++ b/src/plugins/gs-plugin-xdg-app.c
@@ -21,8 +21,8 @@
 
 /* Notes:
  *
- * All GsApp's created have management-plugin set to XgdApp
- * Some GsApp's created have have XgdApp::kind of app or runtime
+ * All GsApp's created have management-plugin set to xdg-app
+ * Some GsApp's created have have xdg-app::kind of app or runtime
  * The GsApp:origin is the remote name, e.g. test-repo
  *
  * Some outstanding notes:
@@ -93,15 +93,15 @@ gs_plugin_destroy (GsPlugin *plugin)
 }
 
 /* helpers */
-#define gs_app_get_xdgapp_kind_as_str(app)     gs_app_get_metadata_item(app,"XgdApp::kind")
-#define gs_app_get_xdgapp_name(app)            gs_app_get_metadata_item(app,"XgdApp::name")
-#define gs_app_get_xdgapp_arch(app)            gs_app_get_metadata_item(app,"XgdApp::arch")
-#define gs_app_get_xdgapp_branch(app)          gs_app_get_metadata_item(app,"XgdApp::branch")
-#define gs_app_get_xdgapp_commit(app)          gs_app_get_metadata_item(app,"XgdApp::commit")
-#define gs_app_set_xdgapp_name(app,val)                gs_app_set_metadata(app,"XgdApp::name",val)
-#define gs_app_set_xdgapp_arch(app,val)                gs_app_set_metadata(app,"XgdApp::arch",val)
-#define gs_app_set_xdgapp_branch(app,val)      gs_app_set_metadata(app,"XgdApp::branch",val)
-#define gs_app_set_xdgapp_commit(app,val)      gs_app_set_metadata(app,"XgdApp::commit",val)
+#define gs_app_get_xdgapp_kind_as_str(app)     gs_app_get_metadata_item(app,"xdg-app::kind")
+#define gs_app_get_xdgapp_name(app)            gs_app_get_metadata_item(app,"xdg-app::name")
+#define gs_app_get_xdgapp_arch(app)            gs_app_get_metadata_item(app,"xdg-app::arch")
+#define gs_app_get_xdgapp_branch(app)          gs_app_get_metadata_item(app,"xdg-app::branch")
+#define gs_app_get_xdgapp_commit(app)          gs_app_get_metadata_item(app,"xdg-app::commit")
+#define gs_app_set_xdgapp_name(app,val)                gs_app_set_metadata(app,"xdg-app::name",val)
+#define gs_app_set_xdgapp_arch(app,val)                gs_app_set_metadata(app,"xdg-app::arch",val)
+#define gs_app_set_xdgapp_branch(app,val)      gs_app_set_metadata(app,"xdg-app::branch",val)
+#define gs_app_set_xdgapp_commit(app,val)      gs_app_set_metadata(app,"xdg-app::commit",val)
 
 /**
  * gs_app_get_xdgapp_kind:
@@ -109,7 +109,7 @@ gs_plugin_destroy (GsPlugin *plugin)
 static XdgAppRefKind
 gs_app_get_xdgapp_kind (GsApp *app)
 {
-       const gchar *kind = gs_app_get_metadata_item (app, "XgdApp::kind");
+       const gchar *kind = gs_app_get_metadata_item (app, "xdg-app::kind");
        if (g_strcmp0 (kind, "app") == 0)
                return XDG_APP_REF_KIND_APP;
        if (g_strcmp0 (kind, "runtime") == 0)
@@ -125,9 +125,9 @@ static void
 gs_app_set_xdgapp_kind (GsApp *app, XdgAppRefKind kind)
 {
        if (kind == XDG_APP_REF_KIND_APP)
-               gs_app_set_metadata (app, "XgdApp::kind", "app");
+               gs_app_set_metadata (app, "xdg-app::kind", "app");
        else if (kind == XDG_APP_REF_KIND_RUNTIME)
-               gs_app_set_metadata (app, "XgdApp::kind", "runtime");
+               gs_app_set_metadata (app, "xdg-app::kind", "runtime");
        else
                g_assert_not_reached ();
 }
@@ -301,7 +301,7 @@ gs_plugin_setup (GsPlugin *plugin, GCancellable *cancellable, GError **error)
 static void
 gs_plugin_xdg_app_set_metadata (GsApp *app, XdgAppRef *xref)
 {
-       gs_app_set_management_plugin (app, "XgdApp");
+       gs_app_set_management_plugin (app, "xdg-app");
        gs_app_set_xdgapp_kind (app, xdg_app_ref_get_kind (xref));
        gs_app_set_xdgapp_name (app, xdg_app_ref_get_name (xref));
        gs_app_set_xdgapp_arch (app, xdg_app_ref_get_arch (xref));
@@ -518,7 +518,7 @@ gs_plugin_add_sources (GsPlugin *plugin,
                        continue;
 
                app = gs_app_new (xdg_app_remote_get_name (xremote));
-               gs_app_set_management_plugin (app, "XgdApp");
+               gs_app_set_management_plugin (app, plugin->name);
                gs_app_set_kind (app, AS_APP_KIND_SOURCE);
                gs_app_set_state (app, AS_APP_STATE_INSTALLED);
                gs_app_set_name (app,
@@ -818,7 +818,7 @@ gs_plugin_refine_item_metadata (GsPlugin *plugin,
        g_autoptr(XdgAppRef) xref = NULL;
 
        /* already set */
-       if (gs_app_get_metadata_item (app, "XgdApp::kind") != NULL)
+       if (gs_app_get_metadata_item (app, "xdg-app::kind") != NULL)
                return TRUE;
 
        /* AppStream sets the source to appname/arch/branch, if this isn't set
@@ -1101,7 +1101,7 @@ gs_plugin_refine_item (GsPlugin *plugin,
        g_autoptr(AsProfileTask) ptask = NULL;
 
        /* only process this app if was created by this plugin */
-       if (g_strcmp0 (gs_app_get_management_plugin (app), "XgdApp") != 0)
+       if (g_strcmp0 (gs_app_get_management_plugin (app), plugin->name) != 0)
                return TRUE;
 
        /* profile */
@@ -1174,7 +1174,7 @@ gs_plugin_launch (GsPlugin *plugin,
        const gchar *branch = NULL;
 
        /* only process this app if was created by this plugin */
-       if (g_strcmp0 (gs_app_get_management_plugin (app), "XgdApp") != 0)
+       if (g_strcmp0 (gs_app_get_management_plugin (app), plugin->name) != 0)
                return TRUE;
 
        branch = gs_app_get_xdgapp_branch (app);
@@ -1201,7 +1201,7 @@ gs_plugin_app_remove (GsPlugin *plugin,
        GsPluginHelper helper;
 
        /* only process this app if was created by this plugin */
-       if (g_strcmp0 (gs_app_get_management_plugin (app), "XgdApp") != 0)
+       if (g_strcmp0 (gs_app_get_management_plugin (app), plugin->name) != 0)
                return TRUE;
 
        /* use helper: FIXME: new()&ref? */
@@ -1232,7 +1232,7 @@ gs_plugin_app_install (GsPlugin *plugin,
        g_autoptr(XdgAppInstalledRef) xref = NULL;
 
        /* only process this app if was created by this plugin */
-       if (g_strcmp0 (gs_app_get_management_plugin (app), "XgdApp") != 0)
+       if (g_strcmp0 (gs_app_get_management_plugin (app), plugin->name) != 0)
                return TRUE;
 
        /* ensure we have metadata and state */
@@ -1331,7 +1331,7 @@ gs_plugin_app_update (GsPlugin *plugin,
        g_autoptr(XdgAppInstalledRef) xref = NULL;
 
        /* only process this app if was created by this plugin */
-       if (g_strcmp0 (gs_app_get_management_plugin (app), "XgdApp") != 0)
+       if (g_strcmp0 (gs_app_get_management_plugin (app), plugin->name) != 0)
                return TRUE;
 
        /* use helper: FIXME: new()&ref? */
diff --git a/src/plugins/packagekit-common.c b/src/plugins/packagekit-common.c
index 4f3eecd..0c4be79 100644
--- a/src/plugins/packagekit-common.c
+++ b/src/plugins/packagekit-common.c
@@ -153,7 +153,7 @@ gs_plugin_packagekit_add_results (GsPlugin *plugin,
                gs_app_set_summary (app,
                                    GS_APP_QUALITY_LOWEST,
                                    pk_package_get_summary (package));
-               gs_app_set_management_plugin (app, "PackageKit");
+               gs_app_set_management_plugin (app, "packagekit");
                gs_app_set_version (app, pk_package_get_version (package));
                switch (pk_package_get_info (package)) {
                case PK_INFO_ENUM_INSTALLED:
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]