[gnome-software: 1/15] gs-plugin-loader: Drop popular-overrides GSettings key

[Philip Withnall <pwithnall src gnome org>]

commit 20724d7bfa2976c1b0cd907ddbec2b45399e950c
Author: Philip Withnall <pwithnall endlessos org>
Date:   Tue May 3 16:44:09 2022 +0100

    gs-plugin-loader: Drop popular-overrides GSettings key
    
    Vendors should ship an appstream file which sets the
    `GnomeSoftware::popular` kudo on apps instead — see
    `doc/vendor-customisation.md`.
    
    GSettings are for user preferences.
    
    Signed-off-by: Philip Withnall <pwithnall endlessos org>

 data/appdata/org.gnome.Software.appdata.xml.in | 12 ++++++++++++
 data/org.gnome.software.gschema.xml            |  5 -----
 doc/kudos.md                                   |  5 +----
 lib/gs-plugin-loader.c                         |  2 --
 4 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/data/appdata/org.gnome.Software.appdata.xml.in b/data/appdata/org.gnome.Software.appdata.xml.in
index 6ad871022..4ebe901bf 100644
--- a/data/appdata/org.gnome.Software.appdata.xml.in
+++ b/data/appdata/org.gnome.Software.appdata.xml.in
@@ -66,6 +66,18 @@
    Validate with `appstreamcli validate *.appdata.xml`
   -->
   <releases>
+    <release date="2022-05-06" version="43.alpha" type="unstable">
+      <description>
+        <p>NOT YET RELEASED. Here are the in-progress release notes:</p>
+        <ul>
+          <li>
+            The <code>popular-overrides</code> GSettings key has been removed;
+            distribution vendors wishing to mark their apps as popular should
+            see `doc/vendor-customisation.md` for examples of how to do this now
+          </li>
+        </ul>
+      </description>
+    </release>
     <release date="2022-03-18" version="42.0" type="stable">
       <description>
         <p>This is a stable release with the following changes:</p>
diff --git a/data/org.gnome.software.gschema.xml b/data/org.gnome.software.gschema.xml
index 7eacb116d..aa074f168 100644
--- a/data/org.gnome.software.gschema.xml
+++ b/data/org.gnome.software.gschema.xml
@@ -42,11 +42,6 @@
       <summary>Non-free applications show a warning dialog before install</summary>
       <description>When non-free applications are installed a warning dialog can be shown. This controls if 
that dialog is suppressed.</description>
     </key>
-    <key name="popular-overrides" type="as">
-      <default>[]</default>
-      <summary>A list of popular applications</summary>
-      <description>A list of applications to use, overriding the system defined ones.</description>
-    </key>
     <key name="check-timestamp" type="x">
       <default>0</default>
       <summary>The last update check timestamp</summary>
diff --git a/doc/kudos.md b/doc/kudos.md
index 68a1d52a3..f43aa5197 100644
--- a/doc/kudos.md
+++ b/doc/kudos.md
@@ -67,7 +67,4 @@ with a blocklist rule in the AppStream builder.
 If you are a vendor, or a system distributor and just want to increase the
 number of kudos for your pet proprietary application that's essential to
 business function, a good kudo to manually add would be `FeaturedRecommended`,
-although, perhaps adding the desktop ID to the GSettings key
-`org.gnome.software.popular-overrides` would be a better idea.
-Adding application IDs to this key allows you to show any business-critical
-applications prominently in the GNOME Software application.
+or `GnomeSoftware::popular`.
diff --git a/lib/gs-plugin-loader.c b/lib/gs-plugin-loader.c
index 0b0528069..2c785b780 100644
--- a/lib/gs-plugin-loader.c
+++ b/lib/gs-plugin-loader.c
@@ -4026,8 +4026,6 @@ job_process_cb (GTask *task)
                g_auto(GStrv) apps = NULL;
                if (g_getenv ("GNOME_SOFTWARE_POPULAR") != NULL) {
                        apps = g_strsplit (g_getenv ("GNOME_SOFTWARE_POPULAR"), ",", 0);
-               } else {
-                       apps = g_settings_get_strv (plugin_loader->settings, "popular-overrides");
                }
                if (apps != NULL && g_strv_length (apps) > 0) {
                        GsAppList *list = gs_plugin_job_get_list (plugin_job);