gnome-menus r875 - in trunk: . layout

[vuntz svn gnome org]

Author: vuntz
Date: Sat Apr 12 00:06:58 2008
New Revision: 875
URL: http://svn.gnome.org/viewvc/gnome-menus?rev=875&view=rev

Log:
2008-04-12  Vincent Untz  <vuntz gnome org>

	* layout/applications.menu: do not show a11y in accessories submenu
	since they're already in the a11y one
	Patch by Josselin Mouette <joss malsain org>
	Fix bug #510757


Modified:
   trunk/ChangeLog
   trunk/layout/applications.menu

Modified: trunk/layout/applications.menu
==============================================================================
--- trunk/layout/applications.menu	(original)
+++ trunk/layout/applications.menu	Sat Apr 12 00:06:58 2008
@@ -25,9 +25,12 @@
     <Include>
       <And>
         <Category>Utility</Category>
-        <Not>
-          <Category>System</Category>
-        </Not>
+	<!-- 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>
       </And>
     </Include>
   </Menu> <!-- End Accessories -->
@@ -39,9 +42,7 @@
     <Include>
       <And>
         <Category>Accessibility</Category>
-        <Not>
-          <Category>Settings</Category>
-        </Not>
+        <Not><Category>Settings</Category></Not>
       </And>
     </Include>
   </Menu> <!-- End Accessibility -->