diff options
| author | Laurent Montel <lmontel@mandriva.org> | 2006-08-31 15:46:19 +0000 |
|---|---|---|
| committer | Laurent Montel <lmontel@mandriva.org> | 2006-08-31 15:46:19 +0000 |
| commit | 5a6af3fe56ab0c9a8e42bd17eed7b2aeae45080f (patch) | |
| tree | fa93adc41bc862e1757f39f869844fcbbd5983d2 | |
| parent | 56cb8aa48f3dc9fcf6cfd78468d6157ecd84ad2f (diff) | |
| download | common-data-5a6af3fe56ab0c9a8e42bd17eed7b2aeae45080f.tar common-data-5a6af3fe56ab0c9a8e42bd17eed7b2aeae45080f.tar.gz common-data-5a6af3fe56ab0c9a8e42bd17eed7b2aeae45080f.tar.bz2 common-data-5a6af3fe56ab0c9a8e42bd17eed7b2aeae45080f.tar.xz common-data-5a6af3fe56ab0c9a8e42bd17eed7b2aeae45080f.zip | |
Use kmenuedit menu file if it's generated.
| -rw-r--r-- | desktop-common-data.spec | 2 | ||||
| -rw-r--r-- | menu/applications-discovery.menu | 11 |
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> |