From c94df5edfa7c0063692ecaa6a35b81a86db5ad59 Mon Sep 17 00:00:00 2001
From: Ahmad Samir <ahmad@mageia.org>
Date: Fri, 25 Mar 2011 02:08:13 +0000
Subject: - common/menus/xfce-applications.menu:  o change kde-*.menu to the
 current kde locations in /etc/xdg/menus/

---
 ChangeLog                           | 4 ++++
 common/menus/xfce-applications.menu | 7 +------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e00f98e..162cfcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-24 04:07 Ahmad Samir <ahmadsamir3891 at gmail.com>
+	* common/menus/xfce-applications.menu:
+	- change kde-*.menu to the current kde locations in /etc/xdg/menus/
+
 2011-03-24 22:54 Ahmad Samir <ahmadsamir3891 at gmail.com>
 	* common/autostart/xfce4-login-sound.desktop:
 	- move it to old, as we don't have a default sound theme with a login
diff --git a/common/menus/xfce-applications.menu b/common/menus/xfce-applications.menu
index 897631e..42be1c6 100644
--- a/common/menus/xfce-applications.menu
+++ b/common/menus/xfce-applications.menu
@@ -523,15 +523,10 @@
       </Include>
     </Menu>
     <!-- always present, just to ensure KDE preferences don't appear in any menu -->
-    <Menu>
-      <Name>KDE Preferences</Name>
-      <Directory>mandriva-system-configuration-kde.directory</Directory>
-      <MergeFile>/etc/xdg/kde/menus/kde-settings.menu</MergeFile>
-    </Menu>
     <Menu>
       <Name>KDE Info Center</Name>
       <Directory>mandriva-system-configuration-kde.directory</Directory>
-      <MergeFile>/etc/xdg/kde/menus/kde-information.menu</MergeFile>
+      <MergeFile>/etc/xdg/menus/kde-information.menu</MergeFile>
     </Menu>
     <Menu>
       <Name>More</Name>
-- 
cgit v1.2.1