aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--desktop-common-data.spec2
-rw-r--r--menu/applications-discovery.menu11
2 files changed, 12 insertions, 1 deletions
diff --git a/desktop-common-data.spec b/desktop-common-data.spec
index 2bf77c1..ac8f11c 100644
--- a/desktop-common-data.spec
+++ b/desktop-common-data.spec
@@ -195,6 +195,8 @@ rm -fr %buildroot
%changelog
* Thu Aug 31 2006 Laurent MONTEL <lmontel@mandriva.com> 2007-10mdv2007.0
- Fix upgrade from 2006
+- Fix discovery menu (merge kmenuedit.menu when it created by kmenuedit, fix
+ kfmclient error)
* Wed Aug 30 2006 Frederic Crozat <fcrozat@mandriva.com> 2007-9mdv2007.0
- update-menus doesn't do anything if DURING_INSTALL is set to 1
diff --git a/menu/applications-discovery.menu b/menu/applications-discovery.menu
index 4f3ff29..8f534a9 100644
--- a/menu/applications-discovery.menu
+++ b/menu/applications-discovery.menu
@@ -213,5 +213,14 @@
<Menu>
<Name>Information</Name>
</Menu>
-
+ <Menu>
+ <Name>.hidden</Name>
+ <Directory>mandriva-hidden.directory</Directory>
+ <Include>
+ <Or>
+ <Category>X-MandrivaLinux-.hidden</Category>
+ </Or>
+ </Include>
+ </Menu>
+<MergeFile>applications-kmenuedit.menu</MergeFile>
</Menu>