aboutsummaryrefslogtreecommitdiffstats
path: root/menu/applications.menu.in
diff options
context:
space:
mode:
Diffstat (limited to 'menu/applications.menu.in')
-rw-r--r--menu/applications.menu.in24
1 files changed, 15 insertions, 9 deletions
diff --git a/menu/applications.menu.in b/menu/applications.menu.in
index b929f54..6d7cbd7 100644
--- a/menu/applications.menu.in
+++ b/menu/applications.menu.in
@@ -365,9 +365,17 @@
<Category>X-KDE-settings-sound</Category>
<Category>X-KDE-settings-system</Category>
<Category>X-KDE-information</Category>
+ <Category>X-GNOME-Settings-Panel</Category>
<And>
+ <!-- exclude X-GNOME-*Settings only when GNOME is set, as non-GNOME applications may have them
+ these are excluded on GNOME because they either are already in the GNOME settings program
+ or are simply shortcuts to settings of individual GNOME applications -->
<Category>GNOME</Category>
- <Category>Settings</Category>
+ <Or>
+ <Category>X-GNOME-PersonalSettings</Category>
+ <Category>X-GNOME-SystemSettings</Category>
+ <Category>X-GNOME-NetworkSettings</Category>
+ </Or>
</And>
</Or>
<Not>
@@ -389,9 +397,9 @@
</Layout>
<Include>
<And>
- <!-- never show those, they are in a separate menu for GNOME and not relevant for KDE -->
+ <!-- never show those, they are in a separate tool for GNOME and not relevant for KDE -->
<Not>
- <Category>GNOME</Category>
+ <Category>X-GNOME-Settings-Panel</Category>
</Not>
<Category>HardwareSettings</Category>
</And>
@@ -454,11 +462,13 @@
<Name>GNOME Preferences</Name>
<Directory>mandriva-system-configuration-gnome.directory</Directory>
<Include>
+ <Category>X-GNOME-Settings-Panel</Category>
<And>
<Category>GNOME</Category>
<Or>
- <Category>Settings</Category>
- <Category>DesktopSettings</Category>
+ <Category>X-GNOME-PersonalSettings</Category>
+ <Category>X-GNOME-SystemSettings</Category>
+ <Category>X-GNOME-NetworkSettings</Category>
</Or>
</And>
<Category>X-MandrivaLinux-System-Configuration-GNOME-Advanced</Category>
@@ -492,10 +502,6 @@
<Category>X-MandrivaLinux-More</Category>
</Or>
<Not>
- <And>
- <Category>GNOME</Category>
- <Category>Settings</Category>
- </And>
<Category>Accessibility</Category>
<Category>HardwareSettings</Category>
<Category>PackageManager</Category>