[gnome-software/1336-change-how-categories-are-merged] gs-desktop-data: Rearrange Music-related categories

[Milan Crha <mcrha src gnome org>]

commit 22f91cdebb911cc28e903d9c28baaa2b237865cf
Author: Milan Crha <mcrha redhat com>
Date:   Thu Aug 5 16:48:56 2021 +0200

    gs-desktop-data: Rearrange Music-related categories
    
    Place the Music-related categories from Play to Create category,
    leaving the Play category only for the Games.
    
    Closes https://gitlab.gnome.org/GNOME/gnome-software/-/issues/1336

 lib/gs-desktop-data.c        | 37 +++++++++++++++++++------------------
 plugins/dummy/gs-self-test.c |  2 +-
 2 files changed, 20 insertions(+), 19 deletions(-)
---
diff --git a/lib/gs-desktop-data.c b/lib/gs-desktop-data.c
index 3ad887735..5336c880c 100644
--- a/lib/gs-desktop-data.c
+++ b/lib/gs-desktop-data.c
@@ -45,6 +45,13 @@ static const GsDesktopMap map_create[] = {
        { "fonts",              NC_("Menu of Add-ons", "Fonts"),
                                        { "Addon::Font",
                                          NULL} },
+       { "music-players",      NC_("Menu of Audio & Video", "Music Players"),
+                                       { "AudioVideo::Music",
+                                         "AudioVideo::Player",
+                                         NULL} },
+       { "codecs",             NC_("Menu of Add-ons", "Codecs"),
+                                       { "Addon::Codec",
+                                         NULL} },
        { NULL }
 };
 
@@ -53,6 +60,7 @@ static const GsDesktopMap map_work[] = {
                                        { "Office",
                                          "Utility",
                                          "Addon",
+                                         "Network::WebBrowser",
                                          NULL } },
        { "featured",           NC_("Menu of Productivity", "Featured"),
                                        { "Office::Featured",
@@ -76,6 +84,9 @@ static const GsDesktopMap map_work[] = {
        { "text-editors",       NC_("Menu of Utilities", "Text Editors"),
                                        { "Utility::TextEditor",
                                          NULL} },
+       { "web-browsers",       NC_("Menu of Communication & News", "Web Browsers"),
+                                       { "Network::WebBrowser",
+                                         NULL} },
        { "input-sources",      NC_("Menu of Add-ons", "Input Sources"),
                                        { "Addon::InputSource",
                                          NULL} },
@@ -93,16 +104,10 @@ static const GsDesktopMap map_work[] = {
 
 static const GsDesktopMap map_play[] = {
        { "all",                NC_("Menu of Audio & Video", "All"),
-                                       { "AudioVideo",
-                                         "Game",
+                                       { "Game",
                                          NULL } },
        { "featured",           NC_("Menu of Audio & Video", "Featured"),
-                                       { "AudioVideo::Featured",
-                                         "Game::Featured",
-                                         NULL} },
-       { "music-players",      NC_("Menu of Audio & Video", "Music Players"),
-                                       { "AudioVideo::Music",
-                                         "AudioVideo::Player",
+                                       { "Game::Featured",
                                          NULL} },
        { "action",             NC_("Menu of Games", "Action"),
                                        { "Game::ActionGame",
@@ -141,9 +146,6 @@ static const GsDesktopMap map_play[] = {
        { "strategy",           NC_("Menu of Games", "Strategy"),
                                        { "Game::StrategyGame",
                                          NULL} },
-       { "codecs",             NC_("Menu of Add-ons", "Codecs"),
-                                       { "Addon::Codec",
-                                         NULL} },
        { NULL }
 };
 
@@ -161,13 +163,6 @@ static const GsDesktopMap map_socialize[] = {
                                          "Network::VideoConference",
                                          "Network::Email",
                                          NULL} },
-       { "news",               NC_("Menu of Communication & News", "News"),
-                                       { "Network::Feed",
-                                         "Network::News",
-                                         NULL} },
-       { "web-browsers",       NC_("Menu of Communication & News", "Web Browsers"),
-                                       { "Network::WebBrowser",
-                                         NULL} },
        { NULL }
 };
 
@@ -176,6 +171,8 @@ static const GsDesktopMap map_learn[] = {
                                        { "Education",
                                          "Science",
                                          "Reference",
+                                         "Network::Feed",
+                                         "Network::News",
                                          NULL } },
        { "featured",           NC_("Menu of Education & Science", "Featured"),
                                        { "Education::Featured",
@@ -204,6 +201,10 @@ static const GsDesktopMap map_learn[] = {
                                          "Science::Physics",
                                          "Science::NumericalAnalysis",
                                          NULL} },
+       { "news",               NC_("Menu of Communication & News", "News"),
+                                       { "Network::Feed",
+                                         "Network::News",
+                                         NULL} },
        { "robotics",           NC_("Menu of Education & Science", "Robotics"),
                                        { "Science::Robotics",
                                          NULL} },
diff --git a/plugins/dummy/gs-self-test.c b/plugins/dummy/gs-self-test.c
index a2a2332a0..2ecd860a3 100644
--- a/plugins/dummy/gs-self-test.c
+++ b/plugins/dummy/gs-self-test.c
@@ -393,7 +393,7 @@ gs_plugins_dummy_installed_func (GsPluginLoader *plugin_loader)
        g_assert (!gs_app_has_category (app, "ImageProcessing"));
        g_assert (gs_app_get_menu_path (app) != NULL);
        menu_path = g_strjoinv ("->", gs_app_get_menu_path (app));
-       g_assert_cmpstr (menu_path, ==, "Play->Music Players");
+       g_assert_cmpstr (menu_path, ==, "Create->Music Players");
 
        /* check addon */
        addons = gs_app_get_addons (app);