[Xfce4-commits] <garcon:master> Add excludes for toplevel desktop files in categories.

[Nick Schermer]

Updating branch refs/heads/master
         to f64fb983e29ed30c8e1cb32cb66b8a66c03bd247 (commit)
       from 3df4d212ad2b3a282b5a7c646ea69bbcdfa1627c (commit)

commit f64fb983e29ed30c8e1cb32cb66b8a66c03bd247
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Jan 2 18:44:25 2011 +0100

    Add excludes for toplevel desktop files in categories.
    
    This way we don't show duplicates in the menu.

 data/xfce/xfce-applications.menu |   51 ++++++++++++++++++++++++++------------
 1 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/data/xfce/xfce-applications.menu b/data/xfce/xfce-applications.menu
index 2a54a10..d4a641a 100644
--- a/data/xfce/xfce-applications.menu
+++ b/data/xfce/xfce-applications.menu
@@ -3,10 +3,10 @@
 
 <Menu>
     <Name>Xfce</Name>
-    
+
     <DefaultAppDirs/>
     <DefaultDirectoryDirs/>
-    
+
     <Include>
         <Category>X-Xfce-Toplevel</Category>
     </Include>
@@ -27,20 +27,20 @@
         <Filename>xfce4-about.desktop</Filename>
         <Filename>xfce4-session-logout.desktop</Filename>
     </Layout>
-    
+
     <Menu>
         <Name>Settings</Name>
         <Directory>xfce-settings.directory</Directory>
         <Include>
             <Category>Settings</Category>
         </Include>
-        
+
         <Layout>
             <Filename>xfce-settings-manager.desktop</Filename>
             <Separator/>
             <Merge type="all"/>
         </Layout>
-        
+
         <Menu>
             <Name>Screensavers</Name>
             <Directory>xfce-screensavers.directory</Directory>
@@ -49,7 +49,7 @@
             </Include>
         </Menu>
     </Menu>
-    
+
     <Menu>
         <Name>Accessories</Name>
         <Directory>xfce-accessories.directory</Directory>
@@ -61,8 +61,16 @@
                 <Category>Utility</Category>
             </Or>
         </Include>
+        <Exclude>
+            <Or>
+                <Filename>exo-file-manager.desktop</Filename>
+                <Filename>exo-terminal-emulator.desktop</Filename>
+                <Filename>xfce4-about.desktop</Filename>
+                <Filename>xfrun4.desktop</Filename>
+            </Or>
+        </Exclude>
     </Menu>
-    
+
     <Menu>
         <Name>Development</Name>
         <Directory>xfce-development.directory</Directory>
@@ -70,7 +78,7 @@
             <Category>Development</Category>
         </Include>
     </Menu>
-    
+
     <Menu>
         <Name>Education</Name>
         <Directory>xfce-education.directory</Directory>
@@ -78,7 +86,7 @@
             <Category>Education</Category>
         </Include>
     </Menu>
-    
+
     <Menu>
         <Name>Games</Name>
         <Directory>xfce-games.directory</Directory>
@@ -86,7 +94,7 @@
             <Category>Game</Category>
         </Include>
     </Menu>
-    
+
     <Menu>
         <Name>Graphics</Name>
         <Directory>xfce-graphics.directory</Directory>
@@ -94,7 +102,7 @@
             <Category>Graphics</Category>
         </Include>
     </Menu>
-    
+
     <Menu>
         <Name>Multimedia</Name>
         <Directory>xfce-multimedia.directory</Directory>
@@ -104,15 +112,21 @@
             <Category>AudioVideo</Category>
         </Include>
     </Menu>
-    
+
     <Menu>
         <Name>Network</Name>
         <Directory>xfce-network.directory</Directory>
         <Include>
             <Category>Network</Category>
         </Include>
+        <Exclude>
+            <Or>
+                <Filename>exo-mail-reader.desktop</Filename>
+                <Filename>exo-web-browser.desktop</Filename>
+            </Or>
+        </Exclude>
     </Menu>
-    
+
     <Menu>
         <Name>Office</Name>
         <Directory>xfce-office.directory</Directory>
@@ -128,7 +142,7 @@
             <Category>Science</Category>
         </Include>
     </Menu>
-    
+
     <Menu>
         <Name>System</Name>
         <Directory>xfce-system.directory</Directory>
@@ -138,8 +152,13 @@
                 <Category>System</Category>
             </Or>
         </Include>
+        <Exclude>
+            <Or>
+                <Filename>xfce4-session-logout.desktop</Filename>
+            </Or>
+        </Exclude>
     </Menu>
-    
+
     <Menu>
         <Name>Other</Name>
         <Directory>xfce-other.directory</Directory>
@@ -148,5 +167,5 @@
             <All/>
         </Include>
     </Menu>
-    
+
 </Menu>