[gnome-software: 11/25] lib: Drop GS_PLUGIN_REFINE_FLAGS_REQUIRE_MENU_PATH

[Philip Withnall <pwithnall src gnome org>]

commit d31c5a029c8ecb95ab2b8ed0071f5b35f0d04af4
Author: Philip Withnall <pwithnall endlessos org>
Date:   Mon Feb 1 23:23:46 2021 +0000

    lib: Drop GS_PLUGIN_REFINE_FLAGS_REQUIRE_MENU_PATH
    
    It’s no longer used or needed, since the menu path is constructed
    generically from the categories and the static desktop data built into
    gnome-software. No plugins provided custom menu paths.
    
    The lists of refine flags which used to use `REQUIRE_MENU_PATH` now use
    `REQUIRE_CATEGORIES` instead, as that was previously implied by
    `REQUIRE_MENU_PATH`. The categories are still used.
    
    Signed-off-by: Philip Withnall <pwithnall endlessos org>

 lib/gs-cmd.c                 | 3 ++-
 lib/gs-plugin-loader.c       | 5 -----
 lib/gs-plugin-types.h        | 3 +--
 lib/gs-plugin.c              | 2 --
 plugins/dummy/gs-self-test.c | 1 -
 src/gs-details-page.c        | 6 +++---
 6 files changed, 6 insertions(+), 14 deletions(-)
---
diff --git a/lib/gs-cmd.c b/lib/gs-cmd.c
index fa9021165..ed656eb6c 100644
--- a/lib/gs-cmd.c
+++ b/lib/gs-cmd.c
@@ -106,7 +106,8 @@ gs_cmd_refine_flag_from_string (const gchar *flag, GError **error)
        if (g_strcmp0 (flag, "related") == 0)
                return GS_PLUGIN_REFINE_FLAGS_REQUIRE_RELATED;
        if (g_strcmp0 (flag, "menu-path") == 0)
-               return GS_PLUGIN_REFINE_FLAGS_REQUIRE_MENU_PATH;
+               /* no longer supported by itself; categories are largely equivalent */
+               return GS_PLUGIN_REFINE_FLAGS_REQUIRE_CATEGORIES;
        if (g_strcmp0 (flag, "upgrade-removed") == 0)
                return GS_PLUGIN_REFINE_FLAGS_REQUIRE_UPGRADE_REMOVED;
        if (g_strcmp0 (flag, "provenance") == 0)
diff --git a/lib/gs-plugin-loader.c b/lib/gs-plugin-loader.c
index 56a71dc21..eb8043de6 100644
--- a/lib/gs-plugin-loader.c
+++ b/lib/gs-plugin-loader.c
@@ -3714,11 +3714,6 @@ gs_plugin_loader_job_process_async (GsPluginLoader *plugin_loader,
                gs_plugin_job_add_refine_flags (plugin_job,
                                                GS_PLUGIN_REFINE_FLAGS_REQUIRE_ORIGIN);
        }
-       if (gs_plugin_job_has_refine_flags (plugin_job,
-                                           GS_PLUGIN_REFINE_FLAGS_REQUIRE_MENU_PATH)) {
-               gs_plugin_job_add_refine_flags (plugin_job,
-                                               GS_PLUGIN_REFINE_FLAGS_REQUIRE_CATEGORIES);
-       }
        if (gs_plugin_job_has_refine_flags (plugin_job,
                                            GS_PLUGIN_REFINE_FLAGS_REQUIRE_ORIGIN_HOSTNAME)) {
                gs_plugin_job_add_refine_flags (plugin_job,
diff --git a/lib/gs-plugin-types.h b/lib/gs-plugin-types.h
index 993b67a31..9414ec390 100644
--- a/lib/gs-plugin-types.h
+++ b/lib/gs-plugin-types.h
@@ -107,7 +107,6 @@ typedef enum {
  * @GS_PLUGIN_REFINE_FLAGS_REQUIRE_UPDATE_DETAILS:     Require update details
  * @GS_PLUGIN_REFINE_FLAGS_REQUIRE_ORIGIN:             Require the origin
  * @GS_PLUGIN_REFINE_FLAGS_REQUIRE_RELATED:            Require related packages
- * @GS_PLUGIN_REFINE_FLAGS_REQUIRE_MENU_PATH:          Require the menu path
  * @GS_PLUGIN_REFINE_FLAGS_REQUIRE_ADDONS:             Require available addons
  * @GS_PLUGIN_REFINE_FLAGS_ALLOW_PACKAGES:             Allow packages to be returned
  * @GS_PLUGIN_REFINE_FLAGS_REQUIRE_UPDATE_SEVERITY:    Require update severity
@@ -145,7 +144,7 @@ typedef enum {
        GS_PLUGIN_REFINE_FLAGS_REQUIRE_UPDATE_DETAILS   = 1 << 9,
        GS_PLUGIN_REFINE_FLAGS_REQUIRE_ORIGIN           = 1 << 10,
        GS_PLUGIN_REFINE_FLAGS_REQUIRE_RELATED          = 1 << 11,
-       GS_PLUGIN_REFINE_FLAGS_REQUIRE_MENU_PATH        = 1 << 12,
+       /* 1 << 12 is currently unused; was previously REQUIRE_MENU_PATH */
        GS_PLUGIN_REFINE_FLAGS_REQUIRE_ADDONS           = 1 << 13,
        GS_PLUGIN_REFINE_FLAGS_ALLOW_PACKAGES           = 1 << 14, /* TODO: move to request */
        GS_PLUGIN_REFINE_FLAGS_REQUIRE_UPDATE_SEVERITY  = 1 << 15,
diff --git a/lib/gs-plugin.c b/lib/gs-plugin.c
index cf1d788df..d147fe02d 100644
--- a/lib/gs-plugin.c
+++ b/lib/gs-plugin.c
@@ -1896,8 +1896,6 @@ gs_plugin_refine_flags_to_string (GsPluginRefineFlags refine_flags)
                g_ptr_array_add (cstrs, "require-origin");
        if (refine_flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_RELATED)
                g_ptr_array_add (cstrs, "require-related");
-       if (refine_flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_MENU_PATH)
-               g_ptr_array_add (cstrs, "require-menu-path");
        if (refine_flags & GS_PLUGIN_REFINE_FLAGS_REQUIRE_ADDONS)
                g_ptr_array_add (cstrs, "require-addons");
        if (refine_flags & GS_PLUGIN_REFINE_FLAGS_ALLOW_PACKAGES)
diff --git a/plugins/dummy/gs-self-test.c b/plugins/dummy/gs-self-test.c
index 98a653714..07b44122d 100644
--- a/plugins/dummy/gs-self-test.c
+++ b/plugins/dummy/gs-self-test.c
@@ -355,7 +355,6 @@ gs_plugins_dummy_installed_func (GsPluginLoader *plugin_loader)
                                                         GS_PLUGIN_REFINE_FLAGS_REQUIRE_ADDONS |
                                                         GS_PLUGIN_REFINE_FLAGS_REQUIRE_LICENSE |
                                                         GS_PLUGIN_REFINE_FLAGS_REQUIRE_KUDOS |
-                                                        GS_PLUGIN_REFINE_FLAGS_REQUIRE_MENU_PATH |
                                                         GS_PLUGIN_REFINE_FLAGS_REQUIRE_ICON |
                                                         GS_PLUGIN_REFINE_FLAGS_REQUIRE_CATEGORIES |
                                                         GS_PLUGIN_REFINE_FLAGS_REQUIRE_PROVENANCE,
diff --git a/src/gs-details-page.c b/src/gs-details-page.c
index 379bb1bda..4845a6111 100644
--- a/src/gs-details-page.c
+++ b/src/gs-details-page.c
@@ -1983,7 +1983,7 @@ gs_details_page_set_local_file (GsDetailsPage *self, GFile *file)
                                                         GS_PLUGIN_REFINE_FLAGS_REQUIRE_VERSION |
                                                         GS_PLUGIN_REFINE_FLAGS_REQUIRE_HISTORY |
                                                         GS_PLUGIN_REFINE_FLAGS_REQUIRE_ORIGIN_HOSTNAME |
-                                                        GS_PLUGIN_REFINE_FLAGS_REQUIRE_MENU_PATH |
+                                                        GS_PLUGIN_REFINE_FLAGS_REQUIRE_CATEGORIES |
                                                         GS_PLUGIN_REFINE_FLAGS_REQUIRE_URL |
                                                         GS_PLUGIN_REFINE_FLAGS_REQUIRE_SETUP_ACTION |
                                                         GS_PLUGIN_REFINE_FLAGS_REQUIRE_PROVENANCE |
@@ -2018,7 +2018,7 @@ gs_details_page_set_url (GsDetailsPage *self, const gchar *url)
                                                         GS_PLUGIN_REFINE_FLAGS_REQUIRE_VERSION |
                                                         GS_PLUGIN_REFINE_FLAGS_REQUIRE_HISTORY |
                                                         GS_PLUGIN_REFINE_FLAGS_REQUIRE_ORIGIN_HOSTNAME |
-                                                        GS_PLUGIN_REFINE_FLAGS_REQUIRE_MENU_PATH |
+                                                        GS_PLUGIN_REFINE_FLAGS_REQUIRE_CATEGORIES |
                                                         GS_PLUGIN_REFINE_FLAGS_REQUIRE_URL |
                                                         GS_PLUGIN_REFINE_FLAGS_REQUIRE_SETUP_ACTION |
                                                         GS_PLUGIN_REFINE_FLAGS_REQUIRE_PROVENANCE |
@@ -2058,7 +2058,7 @@ gs_details_page_load_stage1 (GsDetailsPage *self)
                                                         GS_PLUGIN_REFINE_FLAGS_REQUIRE_HISTORY |
                                                         GS_PLUGIN_REFINE_FLAGS_REQUIRE_SETUP_ACTION |
                                                         GS_PLUGIN_REFINE_FLAGS_REQUIRE_ORIGIN_HOSTNAME |
-                                                        GS_PLUGIN_REFINE_FLAGS_REQUIRE_MENU_PATH |
+                                                        GS_PLUGIN_REFINE_FLAGS_REQUIRE_CATEGORIES |
                                                         GS_PLUGIN_REFINE_FLAGS_REQUIRE_URL |
                                                         GS_PLUGIN_REFINE_FLAGS_REQUIRE_DESCRIPTION |
                                                         GS_PLUGIN_REFINE_FLAGS_REQUIRE_SETUP_ACTION |