applnk: menus/applications.menu - preamble cleanup - removal of non-existin...

baggins baggins at pld-linux.org
Tue May 11 00:45:00 CEST 2010


Author: baggins                      Date: Mon May 10 22:45:00 2010 GMT
Module: applnk                        Tag: HEAD
---- Log message:
- preamble cleanup
- removal of non-existing gnome stuff

---- Files affected:
applnk/menus:
   applications.menu (1.43 -> 1.44) 

---- Diffs:

================================================================
Index: applnk/menus/applications.menu
diff -u applnk/menus/applications.menu:1.43 applnk/menus/applications.menu:1.44
--- applnk/menus/applications.menu:1.43	Fri Sep 29 21:49:33 2006
+++ applnk/menus/applications.menu	Tue May 11 00:44:55 2010
@@ -3,13 +3,19 @@
 
 <Menu>
 	<Name>Applications</Name>
-	<!-- Search for GNOME capplets -->
-	<LegacyDir>/usr/share/control-center-2.0/capplets/</LegacyDir>
-	<LegacyDir>/usr/share/gnome/capplets/</LegacyDir>
+
+	<!-- Scan legacy dirs first, as later items take priority -->
+	<KDELegacyDirs/>
+	<LegacyDir>/etc/X11/applnk</LegacyDir>
+	<LegacyDir>/usr/share/gnome/apps</LegacyDir>
+
 	<!-- Search the default locations -->
 	<DefaultAppDirs/>
 	<DefaultDirectoryDirs/>
-	<KDELegacyDirs/>
+
+	<!-- Read in overrides and child menus from applications-merged/ -->
+	<DefaultMergeDirs/>
+
 	<Include>
 		<Or>
 		<Category>Core</Category>
@@ -761,7 +767,7 @@
 			<Category>PackageManager</Category>
 			</Or>
 			<Not><Category>X-XFCE</Category></Not>
-			<Not><Category>X-Capplet</Category></Not>
+			<Not><Category>GNOME</Category></Not>
 			</And>
 		</Include>
 		<Menu>
@@ -781,32 +787,17 @@
 				<And>
 				<Category>Settings</Category>
 				<Category>GNOME</Category>
-				<Category>X-Capplet</Category>
-				<Not><Category>AdvancedSettings</Category></Not>
 				<Not><Category>System</Category></Not>
 				<Not><Category>Accessibility</Category></Not>
 				</And>
 			</Include>
 			<Menu>
-				<Name>Advanced</Name>
-				<Directory>gnome-settings-advanced.directory</Directory>
-				<Include>
-					<And>
-					<Category>Settings</Category>
-					<Category>GNOME</Category>
-					<Category>X-Capplet</Category>
-					<Category>AdvancedSettings</Category>
-					</And>
-				</Include>
-			</Menu>
-			<Menu>
 				<Name>System</Name>
 				<Directory>gnome-settings-system.directory</Directory>
 				<Include>
 					<And>
 					<Category>Settings</Category>
 					<Category>GNOME</Category>
-					<Category>X-Capplet</Category>
 					<Category>System</Category>
 					</And>
 				</Include>
@@ -818,7 +809,6 @@
 					<And>
 					<Category>Settings</Category>
 					<Category>GNOME</Category>
-					<Category>X-Capplet</Category>
 					<Category>Accessibility</Category>
 					</And>
 				</Include>
@@ -836,7 +826,7 @@
 			</Or>
 			<Not><Category>Filesystem</Category></Not>
 			<Not><Category>Monitor</Category></Not>
-			<Not><Category>X-Capplet</Category></Not>
+			<Not><Category>GNOME</Category></Not>
 			</And>
 		</Include>
 		<Menu>
@@ -985,7 +975,7 @@
 			</Include>
 		</Menu>
 	</Menu>
-	<DefaultMergeDirs/>
+
 	<!-- For user menu modified with kmenuedit -->
 	<MergeFile>applications-kmenuedit.menu</MergeFile>
 </Menu>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/applnk/menus/applications.menu?r1=1.43&r2=1.44&f=u



More information about the pld-cvs-commit mailing list