From b9126fb21277651c5b7cbd60577e3e3105fa4d00 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@mandriva.com>
Date: Mon, 10 Sep 2007 17:55:44 +0000
Subject: Fix missing some GNOME entries in system tools

---
 menu/applications.menu.in | 52 +++++++++++++++++++++++------------------------
 1 file changed, 25 insertions(+), 27 deletions(-)

(limited to 'menu')

diff --git a/menu/applications.menu.in b/menu/applications.menu.in
index ac6f78f..3d8e7d4 100644
--- a/menu/applications.menu.in
+++ b/menu/applications.menu.in
@@ -273,35 +273,33 @@
         <Merge type="all"/>
       </Layout>
       <Include>
-        <Or>
-          <And>
-            <!-- never show those, they are in a separate menu for GNOME and not relevant for KDE -->
-            <Not>
-              <Category>GNOME</Category>
-            </Not>
-            <Category>HardwareSettings</Category>
-          </And>
-          <And>
-            <Or>
-              <Category>@MAIN_TOOLKIT@</Category>
-              <Category>X-MandrivaLinux-CrossDesktop</Category>
-            </Or>
-            <Or>
-              <And>
-                <Category>System</Category>
-                <Not>
+        <And>
+          <!-- never show those, they are in a separate menu for GNOME and not relevant for KDE -->
+          <Not>
+            <Category>GNOME</Category>
+          </Not>
+          <Category>HardwareSettings</Category>
+        </And>
+        <And>
+          <Or>
+            <Category>@MAIN_TOOLKIT@</Category>
+            <Category>X-MandrivaLinux-CrossDesktop</Category>
+          </Or>
+          <Or>
+            <And>
+              <Category>System</Category>
+              <Not>
+                <And>
                   <Category>GNOME</Category>
-                </Not>
-                <Not>
                   <Category>Settings</Category>
-                </Not>
-              </And>
-              <Category>Monitor</Category>
-              <Category>PackageManager</Category>
-            </Or>
-          </And>
-          <Filename>mandriva-drakconf.desktop</Filename>
-        </Or>
+                </And>
+              </Not>
+            </And>
+            <Category>Monitor</Category>
+            <Category>PackageManager</Category>
+          </Or>
+        </And>
+        <Filename>mandriva-drakconf.desktop</Filename>
       </Include>
     </Menu>
     <Menu>
-- 
cgit v1.2.1