From 1f4348652f7f0d62d723ecca38e9072a1d6eaa94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jani=20V=C3=A4limaa?= <wally@mageia.org>
Date: Sun, 22 Apr 2012 17:51:17 +0000
Subject: update applications menu

---
 common/menus/xfce-applications.menu | 50 +++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 19 deletions(-)

(limited to 'common')

diff --git a/common/menus/xfce-applications.menu b/common/menus/xfce-applications.menu
index 42be1c6..54f2bd1 100644
--- a/common/menus/xfce-applications.menu
+++ b/common/menus/xfce-applications.menu
@@ -15,10 +15,9 @@
     </Include>
 
     <Layout>
-        <Filename>xfrun4.desktop</Filename>
-        <Separator/>
         <Filename>exo-terminal-emulator.desktop</Filename>
         <Filename>exo-file-manager.desktop</Filename>
+        <Filename>exo-mail-reader.desktop</Filename>
         <Filename>exo-web-browser.desktop</Filename>
         <Separator/>
         <Menuname>Settings</Menuname>
@@ -79,6 +78,7 @@
             <Category>XFCE</Category>
             <Category>GNOME</Category>
             <Category>GTK</Category>
+            <Category>X-Mageia-CrossDesktop</Category>
             <Category>X-MandrivaLinux-CrossDesktop</Category>
           </Or>
           <Not>
@@ -121,6 +121,7 @@
 		<Category>XFCE</Category>
                 <Category>GNOME</Category>
                 <Category>GTK</Category>
+                <Category>X-Mageia-CrossDesktop</Category>
                 <Category>X-MandrivaLinux-CrossDesktop</Category>
             </Not>
             <Category>X-MandrivaLinux-More</Category>
@@ -164,6 +165,7 @@
             <Category>XFCE</Category>
             <Category>GNOME</Category>
             <Category>GTK</Category>
+            <Category>X-Mageia-CrossDesktop</Category>
             <Category>X-MandrivaLinux-CrossDesktop</Category>
           </Or>
           <Not>
@@ -206,9 +208,10 @@
         <And>
           <Or>
             <Not>
-        	<Category>XFCE</Category>
+              <Category>XFCE</Category>
               <Category>GNOME</Category>
               <Category>GTK</Category>
+              <Category>X-Mageia-CrossDesktop</Category>
               <Category>X-MandrivaLinux-CrossDesktop</Category>
             </Not>
             <Category>X-MandrivaLinux-More</Category>
@@ -235,6 +238,7 @@
             <Category>XFCE</Category>
             <Category>GNOME</Category>
             <Category>GTK</Category>
+            <Category>X-Mageia-CrossDesktop</Category>
             <Category>X-MandrivaLinux-CrossDesktop</Category>
           </Or>
           <Not>
@@ -272,6 +276,7 @@
 	      <Category>XFCE</Category>
               <Category>GNOME</Category>
               <Category>GTK</Category>
+              <Category>X-Mageia-CrossDesktop</Category>
               <Category>X-MandrivaLinux-CrossDesktop</Category>
             </Not>
             <Category>X-MandrivaLinux-More</Category>
@@ -290,8 +295,9 @@
         <Or>
           <Or>
             <Category>XFCE</Category>
-              <Category>GNOME</Category>
-              <Category>GTK</Category>
+            <Category>GNOME</Category>
+            <Category>GTK</Category>
+            <Category>X-Mageia-CrossDesktop</Category>
             <Category>X-MandrivaLinux-CrossDesktop</Category>
           </Or>
           <Not>
@@ -307,8 +313,8 @@
             <Category>Recorder</Category>
             <Category>Music</Category>
             <Category>XFCE</Category>
-              <Category>GNOME</Category>
-              <Category>GTK</Category>
+            <Category>GNOME</Category>
+            <Category>GTK</Category>
           </Not>
         </Or>
         <Or>
@@ -319,11 +325,11 @@
           <Category>Audio</Category>
           <Category>Video</Category>
         </Or>
-    <!--    <Not>
+<!--    <Not>
           <Category>X-MandrivaLinux-More</Category>
           <Category>DiscBurning</Category>
         </Not> 
-        -->
+-->
       </And>
     </Include>
     <Menu>
@@ -337,6 +343,7 @@
               <Category>XFCE</Category>
               <Category>GNOME</Category>
               <Category>GTK</Category>
+              <Category>X-Mageia-CrossDesktop</Category>
               <Category>X-MandrivaLinux-CrossDesktop</Category>
               <Category>DiscBurning</Category>
             </Not>
@@ -372,8 +379,9 @@
         <Or>
           <Or>
             <Category>XFCE</Category>
-              <Category>GNOME</Category>
-              <Category>GTK</Category>
+            <Category>GNOME</Category>
+            <Category>GTK</Category>
+            <Category>X-Mageia-CrossDesktop</Category>
             <Category>X-MandrivaLinux-CrossDesktop</Category>
           </Or>
           <Not>
@@ -384,8 +392,8 @@
             <Category>Clock</Category>
             <Category>TextEditor</Category>
             <Category>XFCE</Category>
-              <Category>GNOME</Category>
-              <Category>GTK</Category>
+            <Category>GNOME</Category>
+            <Category>GTK</Category>
           </Not>
         </Or>
         <Or>
@@ -455,6 +463,7 @@
           <Or>
             <Or>
               <Category>GTK</Category>
+              <Category>X-Mageia-CrossDesktop</Category>
               <Category>X-MandrivaLinux-CrossDesktop</Category>
             </Or>
             <Not>
@@ -539,6 +548,7 @@
               <Category>XFCE</Category>
               <Category>GNOME</Category>
               <Category>GTK</Category>
+              <Category>X-Mageia-CrossDesktop</Category>
               <Category>X-MandrivaLinux-CrossDesktop</Category>
             </Not>
             <Category>X-MandrivaLinux-More</Category>
@@ -570,7 +580,7 @@
     </Menu>
   </Menu>
 
-		 <Menu>
+  <Menu>
     <Name>Development</Name>
     <Layout>
       <Menuname>Databases</Menuname>
@@ -659,7 +669,7 @@
   </Menu>
 
 
-			  <Menu>
+  <Menu>
     <Name>Games</Name>
     <Layout>
       <Menuname>Adventure</Menuname>
@@ -781,7 +791,7 @@
     </Menu>
   </Menu>
 		
-				 <Menu>
+  <Menu>
     <Name>Education</Name>
     <Layout>
       <Menuname>Economy</Menuname>
@@ -894,7 +904,7 @@
     </Menu>
   </Menu>
 
-			 <Menu>
+  <Menu>
     <Name>Sciences</Name>
     <Layout>
       <Menuname>Artificial Intelligence</Menuname>
@@ -1055,7 +1065,8 @@
       <Category>Documentation</Category>
     </Include>
   </Menu>
-  <!--
+
+<!--
   <Menu>
     <Name>Other</Name>
     <Directory>mandriva-other.directory</Directory>
@@ -1067,7 +1078,8 @@
 	    <Category>Core</Category>
     </Exclude>
   </Menu>
-  -->
+-->
+
   <Menu>
     <Name>.hidden</Name>
     <Directory>mandriva-hidden.directory</Directory>
-- 
cgit v1.2.1