[gnome-menus] layout: Add a new X-GNOME-Utilities directory

[William Jon McCann <mccann src gnome org>]

commit e644a541b5bab530fe6649c3b8f212faca46eb66
Author: Florian Müllner <fmuellner gnome org>
Date:   Sun Feb 17 02:18:51 2013 +0100

    layout: Add a new X-GNOME-Utilities directory
    
    Rather than using a developer-defined category, this directory
    contains an explicit whitelist of known-good GNOME tools. This
    more or less follows the definition set in the GNOME jhbuild
    moduleset.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=694131

 desktop-directories/Makefile.am                    |    1 +
 desktop-directories/X-GNOME-Utilities.directory.in |    5 ++
 layout/gnome-applications.menu                     |   65 +++++++++++++++++--
 3 files changed, 64 insertions(+), 7 deletions(-)
---
diff --git a/desktop-directories/Makefile.am b/desktop-directories/Makefile.am
index 4d50e64..1206942 100644
--- a/desktop-directories/Makefile.am
+++ b/desktop-directories/Makefile.am
@@ -13,6 +13,7 @@ directory_in_files =                          \
        Utility-Accessibility.directory.in      \
        X-GNOME-Other.directory.in              \
        X-GNOME-Menu-Applications.directory.in  \
+       X-GNOME-Utilities.directory.in          \
        X-GNOME-WebApplications.directory.in    \
        X-GNOME-SystemSettings.directory.in
 
diff --git a/desktop-directories/X-GNOME-Utilities.directory.in 
b/desktop-directories/X-GNOME-Utilities.directory.in
new file mode 100644
index 0000000..00b17cd
--- /dev/null
+++ b/desktop-directories/X-GNOME-Utilities.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+_Name=Utilities
+_Comment=Small but useful GNOME tools
+Icon=applications-accessories
+Type=Directory
diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
index 6472510..a29cc6f 100644
--- a/layout/gnome-applications.menu
+++ b/layout/gnome-applications.menu
@@ -25,16 +25,33 @@
     <Include>
       <And>
         <Category>Utility</Category>
-       <!-- Accessibility spec must have either the Utility or Settings
-            category, and we display an accessibility submenu already for
-            the ones that do not have Settings, so don't display accessibility
-            applications here -->
+       <!-- Accessibility spec must have either the Utility or Settings
+            category, and we display an accessibility submenu already for
+            the ones that do not have Settings, so don't display accessibility
+            applications here -->
         <Not><Category>Accessibility</Category></Not>
         <Not><Category>System</Category></Not>
+
+        <!-- Also exclude everything we put in the X-GNOME-Utilities
+             whitelist -->
+        <Not><Filename>file-roller.desktop</Filename></Not>
+        <Not><Filename>deja-dup-preferences.desktop</Filename></Not>
+        <Not><Filename>gnome-calculator.desktop</Filename></Not>
+        <Not><Filename>gucharmap.desktop</Filename></Not>
+        <Not><Filename>gnome-font-viewer.desktop</Filename></Not>
+        <Not><Filename>seahorse.desktop</Filename></Not>
+        <Not><Filename>gnome-terminal.desktop</Filename></Not>
+        <Not><Filename>gnome-tweak-tool.desktop</Filename></Not>
+        <Not><Filename>gnome-disks.desktop</Filename></Not>
+        <Not><Filename>gnome-screenshot.desktop</Filename></Not>
+        <Not><Filename>gnome-yelp.desktop</Filename></Not>
+        <Not><Filename>yelp.desktop</Filename></Not>
+        <Not><Filename>gnome-control-center.desktop</Filename></Not>
       </And>
     </Include>
   </Menu> <!-- End Accessories -->
 
+
   <!-- Accessibility submenu -->
   <Menu>
     <Name>Universal Access</Name>
@@ -88,6 +105,8 @@
     <Include>
       <And>
         <Category>Graphics</Category>
+        <Not><Filename>eog.desktop</Filename></Not>
+        <Not><Filename>evince.desktop</Filename></Not>
       </And>
     </Include>
   </Menu> <!-- End Graphics -->
@@ -99,9 +118,8 @@
     <Include>
       <And>
         <Category>Network</Category>
-       <Not>
-         <Category>X-GNOME-WebApplication</Category>
-       </Not>
+       <Not><Category>X-GNOME-WebApplication</Category></Not>
+        <Not><Filename>vinagre.desktop</Filename></Not>
       </And>
     </Include>
   </Menu>   <!-- End Internet -->
@@ -136,6 +154,8 @@
     <Include>
       <And>
         <Category>Office</Category>
+        <Not><Filename>evince.desktop</Filename></Not>
+        <Not><Filename>gnome-dictionary.desktop</Filename></Not>
       </And>
     </Include>
   </Menu> <!-- End Office -->
@@ -148,6 +168,9 @@
       <And>
         <Category>System</Category>
         <Not><Category>Settings</Category></Not>
+        <Not><Filename>baobab.desktop</Filename></Not>
+        <Not><Filename>gnome-system-log.desktop</Filename></Not>
+        <Not><Filename>gnome-system-monitor.desktop</Filename></Not>
       </And>
     </Include>
   </Menu>   <!-- End System Tools -->
@@ -161,6 +184,34 @@
     </Include>
   </Menu>
 
+  <!-- Utilities submenu -->
+  <Menu>
+    <Name>Utilities</Name>
+    <Directory>X-GNOME-Utilities.directory</Directory>
+    <Include>
+      <Filename>file-roller.desktop</Filename>
+      <Filename>gnome-calculator.desktop</Filename>
+      <Filename>gnome-font-viewer.desktop</Filename>
+      <Filename>gucharmap.desktop</Filename>
+      <Filename>seahorse.desktop</Filename>
+      <Filename>gnome-terminal.desktop</Filename>
+      <Filename>deja-dup-preferences.desktop</Filename>
+      <Filename>gnome-dictionary.desktop</Filename>
+      <Filename>evince.desktop</Filename>
+      <Filename>eog.desktop</Filename>
+      <Filename>baobab.desktop</Filename>
+      <Filename>gnome-system-log.desktop</Filename>
+      <Filename>gnome-system-monitor.desktop</Filename>
+      <Filename>vinagre.desktop</Filename>
+      <Filename>gnome-tweak-tool.desktop</Filename>
+      <Filename>gnome-disks.desktop</Filename>
+      <Filename>gnome-screenshot.desktop</Filename>
+      <Filename>gnome-yelp.desktop</Filename>
+      <Filename>yelp.desktop</Filename>
+      <Filename>gnome-control-center.desktop</Filename>
+    </Include>
+  </Menu>
+
   <!-- Other -->
   <Menu>
     <Name>Other</Name>