76 lines
2.5 KiB
Diff
76 lines
2.5 KiB
Diff
diff -ur kdelibs-4.1.0/kded/applications.menu kdelibs-4.1.0-xdg-menu/kded/applications.menu
|
|
--- kdelibs-4.1.0/kded/applications.menu 2008-05-21 13:07:34.000000000 +0200
|
|
+++ kdelibs-4.1.0-xdg-menu/kded/applications.menu 2008-08-23 09:45:03.000000000 +0200
|
|
@@ -31,29 +31,31 @@
|
|
<Category>Core</Category>
|
|
<Not><Category>KDE</Category></Not>
|
|
</And>
|
|
+ <Category>X-Red-Hat-Base</Category>
|
|
<!-- Don't list SUSE's YaST in here -->
|
|
<Category>X-SuSE-YaST</Category>
|
|
- <Category>X-KDE-settings-hardware</Category>
|
|
- <Category>X-KDE-settings-accessibility</Category>
|
|
- <Category>X-KDE-settings-components</Category>
|
|
- <Category>X-KDE-settings-desktop</Category>
|
|
- <Category>X-KDE-settings-looknfeel</Category>
|
|
- <Category>X-KDE-settings-network</Category>
|
|
- <Category>X-KDE-settings-webbrowsing</Category>
|
|
- <Category>X-KDE-settings-peripherals</Category>
|
|
- <Category>X-KDE-settings-hardware</Category>
|
|
- <Category>X-KDE-settings-power</Category>
|
|
- <Category>X-KDE-settings-security</Category>
|
|
- <Category>X-KDE-settings-sound</Category>
|
|
- <Category>X-KDE-settings-system</Category>
|
|
- <Category>X-KDE-information</Category>
|
|
- <Filename>kde-kcm_knetworkconfmodule_ss.desktop</Filename>
|
|
- <Filename>kde-medianotifications.desktop</Filename>
|
|
- <Filename>kde-audioencoding.desktop</Filename>
|
|
</Not>
|
|
</Include>
|
|
</Menu>
|
|
<Menu>
|
|
+ <Name>System Settings</Name>
|
|
+ <Directory>SystemConfig.directory</Directory>
|
|
+ <Include>
|
|
+ <And>
|
|
+ <Category>System</Category>
|
|
+ <Category>Settings</Category>
|
|
+ <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
|
|
+ </And>
|
|
+ </Include>
|
|
+ <Menu>
|
|
+ <Name>Server</Name>
|
|
+ <Directory>ServerConfig.directory</Directory>
|
|
+ <Include>
|
|
+ <Category>X-Red-Hat-ServerConfig</Category>
|
|
+ </Include>
|
|
+ </Menu>
|
|
+ </Menu>
|
|
+ <Menu>
|
|
<Name>Development</Name>
|
|
<Directory>kde-development.directory</Directory>
|
|
<Menu>
|
|
@@ -358,7 +360,11 @@
|
|
<Name>Settingsmenu</Name>
|
|
<Directory>kde-settingsmenu.directory</Directory>
|
|
<Include>
|
|
- <Category>Settings</Category>
|
|
+ <And>
|
|
+ <Category>Settings</Category>
|
|
+ <Not><Category>System</Category></Not>
|
|
+ <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
|
|
+ </And>
|
|
</Include>
|
|
</Menu>
|
|
<Menu>
|
|
@@ -367,7 +373,9 @@
|
|
<Include>
|
|
<And>
|
|
<Category>System</Category>
|
|
+ <Not><Category>Settings</Category></Not>
|
|
<Not><Category>X-KDE-More</Category></Not>
|
|
+ <Not><Category>X-Red-Hat-ServerConfig</Category></Not>
|
|
</And>
|
|
</Include>
|
|
<Menu>
|