[gnome-software] gs-folders: Update .desktop category lists from gnome-menus

[Kalev Lember <klember src gnome org>]

commit ade27ac6d2787400b28e3c03806c850bfb95a285
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Mon Dec 3 22:11:01 2018 -0500

    gs-folders: Update .desktop category lists from gnome-menus
    
    Update the .desktop filenames from gnome-menus for the
    Sundry & Utilities categories.
    
    Add a comment to explain the source of these lists.
    
    Closes: https://gitlab.gnome.org/GNOME/gnome-software/issues/322

 src/gs-folders.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/src/gs-folders.c b/src/gs-folders.c
index edd2c1de..d4a4845d 100644
--- a/src/gs-folders.c
+++ b/src/gs-folders.c
@@ -542,6 +542,8 @@ gs_folders_revert (GsFolders *folders)
 /* Ensure we have the default folders for Utilities and Sundry.
  * We can't do this as default values, since the schemas have
  * no fixed path.
+ *
+ * The app lists come from gnome-menus: layout/gnome-applications.menu
  */
 void
 gs_folders_convert (void)
@@ -563,22 +565,20 @@ gs_folders_convert (void)
                        NULL
                };
                const gchar * const utilities_apps[] = {
-                       "org.gnome.baobab.desktop",
-                       "deja-dup-preferences.desktop",
                        "eog.desktop",
-                       "evince.desktop",
-                       "org.gnome.FileRoller.desktop",
-                       "gnome-calculator.desktop",
-                       "gnome-dictionary.desktop",
-                       "org.gnome.Characters.desktop",
-                       "org.gnome.DiskUtility.desktop",
-                       "org.gnome.font-viewer.desktop",
-                       "org.gnome.Terminal.desktop",
-                       "org.gnome.Screenshot.desktop",
                        "gnome-system-log.desktop",
                        "gnome-system-monitor.desktop",
-                       "gnome-tweak-tool.desktop",
                        "gucharmap.desktop",
+                       "org.gnome.Calculator.desktop",
+                       "org.gnome.DejaDup.desktop",
+                       "org.gnome.Dictionary.desktop",
+                       "org.gnome.DiskUtility.desktop",
+                       "org.gnome.Evince.desktop",
+                       "org.gnome.FileRoller.desktop",
+                       "org.gnome.font-viewer.desktop",
+                       "org.gnome.Screenshot.desktop",
+                       "org.gnome.Terminal.desktop",
+                       "org.gnome.tweaks.desktop",
                        "seahorse.desktop",
                        "vinagre.desktop",
                        "yelp.desktop",
@@ -597,7 +597,6 @@ gs_folders_convert (void)
                        "flash-player-properties.desktop",
                        "gconf-editor.desktop",
                        "gnome-abrt.desktop",
-                       "gnome-power-statistics.desktop",
                        "ibus-setup-anthy.desktop",
                        "ibus-setup.desktop",
                        "ibus-setup-hangul.desktop",
@@ -614,7 +613,7 @@ gs_folders_convert (void)
                        "log4j-chainsaw.desktop",
                        "log4j-logfactor5.desktop",
                        "nm-connection-editor.desktop",
-                       "orca.desktop",
+                       "org.gnome.PowerStats.desktop",
                        "setroubleshoot.desktop",
                        "system-config-date.desktop",
                        "system-config-firewall.desktop",