From 3fe58ca8a766c4338854474bc507e7c4f9267366 Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Wed, 30 Aug 2006 16:01:44 +0000 Subject: - Add missing directory file for adventure (Mdv bug #24829) - Add empty menu nodes for KDE in discovery menu - Remove old X-MandrakeLinux* categories for main menu, all entries must now use X-MandrivaLinux - fix default directories creation if translation contains spaces (Mdv bug #24677) --- desktop-common-data.spec | 9 +- menu/applications-discovery.menu | 16 ++- menu/applications-mdk.menu | 118 --------------------- ...a-moreapplications-games-adventure.directory.in | 5 + menu/menustyle.csh | 2 +- menu/menustyle.sh | 2 +- xinit.d/desktop-directories | 6 +- 7 files changed, 32 insertions(+), 126 deletions(-) create mode 100644 menu/desktop-directories/mandriva-moreapplications-games-adventure.directory.in diff --git a/desktop-common-data.spec b/desktop-common-data.spec index c8ddaa4..e09fdf1 100644 --- a/desktop-common-data.spec +++ b/desktop-common-data.spec @@ -3,7 +3,7 @@ Summary: Desktop common files Name: desktop-common-data Version: 2007 -Release: %mkrel 7 +Release: %mkrel 8 License: GPL URL: http://www.mandrivalinux.com/ Group: System/Configuration/Other @@ -192,6 +192,13 @@ rm -fr %buildroot %changelog +* Wed Aug 30 2006 Frederic Crozat 2007-8mdv2007.0 +- Add missing directory file for adventure (Mdv bug #24829) +- Add empty menu nodes for KDE in discovery menu +- Remove old X-MandrakeLinux* categories for main menu, all entries + must now use X-MandrivaLinux +- fix default directories creation if translation contains spaces (Mdv bug #24677) + * Thu Aug 17 2006 Frederic Crozat 2007-7mdv2007.0 - Add discovery menu and script to support MDV_MENU_STYLE diff --git a/menu/applications-discovery.menu b/menu/applications-discovery.menu index 7998215..4f3ff29 100644 --- a/menu/applications-discovery.menu +++ b/menu/applications-discovery.menu @@ -147,7 +147,11 @@ X-MandrivaLinux-System-Configuration-Users X-MandrivaLinux-System-Configuration-Other - + + + + ScreenSaver + Documentation @@ -201,5 +205,13 @@ X-MandrivaLinux-MoreApplications-Sciences-Other - + + + + Settings + + + Information + + diff --git a/menu/applications-mdk.menu b/menu/applications-mdk.menu index 1dd457e..d501533 100644 --- a/menu/applications-mdk.menu +++ b/menu/applications-mdk.menu @@ -24,7 +24,6 @@ mandrivalinux.directory - X-Mandrakelinux X-MandrivaLinux @@ -49,7 +48,6 @@ mandriva-office.directory - X-Mandrakelinux-Office X-MandrivaLinux-Office @@ -64,7 +62,6 @@ mandriva-office-accessories.directory - X-Mandrakelinux-Office-Accessories X-MandrivaLinux-Office-Accessories Calculator @@ -80,7 +77,6 @@ mandriva-office-addressbooks.directory - X-Mandrakelinux-Office-AddressBooks X-MandrivaLinux-Office-AddressBooks ContactManagement @@ -99,7 +95,6 @@ mandriva-office-communications.directory - X-Mandrakelinux-Office-Communications X-MandrivaLinux-Office-Communications @@ -107,7 +102,6 @@ Fax mandriva-office-communications-fax.directory - X-Mandrakelinux-Office-Communications-Fax X-MandrivaLinux-Office-Communications-Fax @@ -122,7 +116,6 @@ PDA - X-Mandrakelinux-Office-Communications-PDA X-MandrivaLinux-Office-Communications-PDA @@ -132,7 +125,6 @@ mandriva-office-communications-phone.directory - X-Mandrakelinux-Office-Communications-Phone X-MandrivaLinux-Office-Communications-Phone @@ -142,7 +134,6 @@ mandriva-office-communications-other.directory - X-Mandrakelinux-Office-Communications-Other X-MandrivaLinux-Office-Communications-Other @@ -158,7 +149,6 @@ mandriva-office-drawing.directory - X-Mandrakelinux-Office-Drawing X-MandrivaLinux-Office-Drawing @@ -173,7 +163,6 @@ mandriva-office-graphs.directory - X-Mandrakelinux-Office-Graphs X-MandrivaLinux-Office-Graphs @@ -188,7 +177,6 @@ mandriva-office-presentations.directory - X-Mandrakelinux-Office-Presentations X-MandrivaLinux-Office-Presentations Presentation @@ -205,7 +193,6 @@ mandriva-office-publishing.directory - X-Mandrakelinux-Office-Publishing X-MandrivaLinux-Office-Publishing Scanning OCR @@ -226,7 +213,6 @@ mandriva-office-spreadsheets.directory - X-Mandrakelinux-Office-Spreadsheets X-MandrivaLinux-Office-Spreadsheets Spreadsheet @@ -242,7 +228,6 @@ mandriva-office-tasksmanagement.directory - X-Mandrakelinux-Office-TasksManagement X-MandrivaLinux-Office-TasksManagement @@ -257,7 +242,6 @@ mandriva-office-timemanagement.directory - X-Mandrakelinux-Office-TimeManagement X-MandrivaLinux-Office-TimeManagement Calendar @@ -268,7 +252,6 @@ mandriva-office-other.directory - X-Mandrakelinux-Office-Other X-MandrivaLinux-Office-Other @@ -284,7 +267,6 @@ mandriva-office-wordprocessors.directory - X-Mandrakelinux-Office-Wordprocessors X-MandrivaLinux-Office-Wordprocessors WordProcessor @@ -310,7 +292,6 @@ mandriva-internet.directory - X-Mandrakelinux-Internet X-MandrivaLinux-Internet @@ -324,7 +305,6 @@ mandriva-internet-chat.directory - X-Mandrakelinux-Internet-Chat X-MandrivaLinux-Internet-Chat IRCClient @@ -341,7 +321,6 @@ mandriva-internet-filetransfer.directory - X-Mandrakelinux-Internet-FileTransfer X-MandrivaLinux-Internet-FileTransfer FileTransfer P2P @@ -360,7 +339,6 @@ mandriva-internet-instantmessaging.directory - X-Mandrakelinux-Internet-InstantMessaging X-MandrivaLinux-Internet-InstantMessaging InstantMessaging @@ -378,7 +356,6 @@ mandriva-internet-mail.directory - X-Mandrakelinux-Internet-Mail X-MandrivaLinux-Internet-Mail Email @@ -394,7 +371,6 @@ mandriva-internet-news.directory - X-Mandrakelinux-Internet-News X-MandrivaLinux-Internet-News News @@ -405,7 +381,6 @@ mandriva-internet-videoconference.directory - X-Mandrakelinux-Internet-VideoConference X-MandrivaLinux-Internet-VideoConference @@ -415,7 +390,6 @@ mandriva-internet-other.directory - X-Mandrakelinux-Internet-Other X-MandrivaLinux-Internet-Other @@ -430,7 +404,6 @@ mandriva-internet-remoteaccess.directory - X-Mandrakelinux-Internet-RemoteAccess X-MandrivaLinux-Internet-RemoteAccess RemoteAccess Dialup @@ -451,7 +424,6 @@ mandriva-internet-webbrowsers.directory - X-Mandrakelinux-Internet-WebBrowsers X-MandrivaLinux-Internet-WebBrowsers WebBrowser @@ -462,7 +434,6 @@ mandriva-internet-webeditors.directory - X-Mandrakelinux-Internet-WebEditors X-MandrivaLinux-Internet-WebEditors WebDevelopment @@ -490,7 +461,6 @@ mandriva-moreapplications.directory - X-Mandrakelinux-MoreApplications X-MandrivaLinux-MoreApplications @@ -504,7 +474,6 @@ mandriva-moreapplications-accessibility.directory - X-Mandrakelinux-MoreApplications-Accessibility X-MandrivaLinux-MoreApplications-Accessibility Accessibility @@ -515,7 +484,6 @@ mandriva-moreapplications-communications.directory - X-Mandrakelinux-MoreApplications-Communications X-MandrivaLinux-MoreApplications-Communications Communications @@ -526,7 +494,6 @@ mandriva-moreapplications-finances.directory - X-Mandrakelinux-MoreApplications-Finances X-MandrivaLinux-MoreApplications-Finances Finance @@ -537,7 +504,6 @@ mandriva-moreapplications-databases.directory - X-Mandrakelinux-MoreApplications-Databases X-MandrivaLinux-MoreApplications-Databases @@ -555,7 +521,6 @@ mandriva-moreapplications-development.directory - X-Mandrakelinux-MoreApplications-Development X-MandrivaLinux-MoreApplications-Development @@ -569,7 +534,6 @@ mandriva-moreapplications-development-developmentenvironments.directory - X-Mandrakelinux-MoreApplications-Development-DevelopmentEnvironments X-MandrivaLinux-MoreApplications-Development-DevelopmentEnvironments IDE GUIDesigner @@ -586,7 +550,6 @@ mandriva-moreapplications-development-interpreters.directory - X-Mandrakelinux-MoreApplications-Development-Interpreters X-MandrivaLinux-MoreApplications-Development-Interpreters @@ -601,7 +564,6 @@ mandriva-moreapplications-development-tools.directory - X-Mandrakelinux-MoreApplications-Development-Tools X-MandrivaLinux-MoreApplications-Development-Tools Profiling Debugger @@ -618,7 +580,6 @@ mandriva-moreapplications-development-other.directory - X-Mandrakelinux-MoreApplications-Development-Other X-MandrivaLinux-MoreApplications-Development-Other @@ -629,7 +590,6 @@ mandriva-moreapplications-documentation.directory - X-Mandrakelinux-MoreApplications-Documentation X-MandrivaLinux-MoreApplications-Documentation @@ -639,7 +599,6 @@ mandriva-moreapplications-other.directory - X-Mandrakelinux-MoreApplications-Other X-MandrivaLinux-MoreApplications-Other @@ -656,7 +615,6 @@ mandriva-moreapplications-editors.directory - X-Mandrakelinux-MoreApplications-Editors X-MandrivaLinux-MoreApplications-Editors TextEditor @@ -679,7 +637,6 @@ mandriva-moreapplications-education.directory - X-Mandrakelinux-MoreApplications-Education X-MandrivaLinux-MoreApplications-Education @@ -688,7 +645,6 @@ mandriva-moreapplications-education-economy.directory - X-Mandrakelinux-MoreApplications-Education-Economy X-MandrivaLinux-MoreApplications-Education-Economy @@ -698,7 +654,6 @@ mandriva-moreapplications-educatino-geography.directory - X-Mandrakelinux-MoreApplications-Education-Geography X-MandrivaLinux-MoreApplications-Education-Geography @@ -708,7 +663,6 @@ mandriva-moreapplications-education-history.directory - X-Mandrakelinux-MoreApplications-Education-History X-MandrivaLinux-MoreApplications-Education-History @@ -718,7 +672,6 @@ mandriva-moreapplications-education-languages.directory - X-Mandrakelinux-MoreApplications-Education-Languages X-MandrivaLinux-MoreApplications-Education-Languages Education @@ -732,7 +685,6 @@ mandriva-moreapplications-education-literature.directory - X-Mandrakelinux-MoreApplications-Education-Literature X-MandrivaLinux-MoreApplications-Education-Literature @@ -742,7 +694,6 @@ mandriva-moreapplications-education-sciences.directory - X-Mandrakelinux-MoreApplications-Education-Sciences X-MandrivaLinux-MoreApplications-Education-Sciences Education @@ -756,7 +707,6 @@ mandriva-moreapplications-education-sports.directory - X-Mandrakelinux-MoreApplications-Education-Sports X-MandrivaLinux-MoreApplications-Education-Sports @@ -766,7 +716,6 @@ mandriva-moreapplications-education-other.directory - X-Mandrakelinux-MoreApplications-Education-Other X-MandrivaLinux-MoreApplications-Education-Other Education @@ -799,7 +748,6 @@ mandriva-moreapplications-games.directory - X-Mandrakelinux-MoreApplications-Games X-MandrivaLinux-MoreApplications-Games @@ -808,7 +756,6 @@ mandriva-moreapplications-games-adventure.directory - X-Mandrakelinux-MoreApplications-Games-Adventure X-MandrivaLinux-MoreApplications-Games-Adventure AdventureGame @@ -819,7 +766,6 @@ mandriva-moreapplications-games-arcade.directory - X-Mandrakelinux-MoreApplications-Games-Arcade X-MandrivaLinux-MoreApplications-Games-Arcade ArcadeGame @@ -830,7 +776,6 @@ mandriva-moreapplications-games-boards.directory - X-Mandrakelinux-MoreApplications-Games-Boards X-MandrivaLinux-MoreApplications-Games-Boards BoardGame @@ -841,7 +786,6 @@ mandriva-moreapplications-games-cards.directory - X-Mandrakelinux-MoreApplications-Games-Cards X-MandrivaLinux-MoreApplications-Games-Cards CardGame @@ -852,7 +796,6 @@ mandriva-moreapplications-games-puzzles.directory - X-Mandrakelinux-MoreApplications-Games-Puzzles X-MandrivaLinux-MoreApplications-Games-Puzzles LogicGame BlocksGame @@ -864,7 +807,6 @@ mandriva-moreapplications-games-sports.directory - X-Mandrakelinux-MoreApplications-Games-Sports X-MandrivaLinux-MoreApplications-Games-Sports SportsGame @@ -875,7 +817,6 @@ mandriva-moreapplications-games-strategy.directory - X-Mandrakelinux-MoreApplications-Games-Strategy X-MandrivaLinux-MoreApplications-Games-Strategy StrategyGame @@ -886,7 +827,6 @@ mandriva-moreapplications-games-other.directory - X-Mandrakelinux-MoreApplications-Games-Other X-MandrivaLinux-MoreApplications-Games-Other Game @@ -904,7 +844,6 @@ mandriva-moreapplications-games-toys.directory - X-Mandrakelinux-MoreApplications-Games-Toys X-MandrivaLinux-MoreApplications-Games-Toys Amusement @@ -935,7 +874,6 @@ mandriva-moreapplications-sciences.directory - X-Mandrakelinux-MoreApplications-Sciences X-MandrivaLinux-MoreApplications-Sciences @@ -944,7 +882,6 @@ mandriva-moreapplications-sciences-artificialintelligence.directory - X-Mandrakelinux-MoreApplications-Sciences-ArtificialIntelligence X-MandrivaLinux-MoreApplications-Sciences-ArtificialIntelligence @@ -954,7 +891,6 @@ mandriva-moreapplications-sciences-astronomy.directory - X-Mandrakelinux-MoreApplications-Sciences-Astronomy X-MandrivaLinux-MoreApplications-Sciences-Astronomy Astronomy @@ -965,7 +901,6 @@ mandriva-moreapplications-sciences-biology.directory - X-Mandrakelinux-MoreApplications-Sciences-Biology X-MandrivaLinux-MoreApplications-Sciences-Biology Biology @@ -976,7 +911,6 @@ mandriva-moreapplications-sciences-chemistry.directory - X-Mandrakelinux-MoreApplications-Sciences-Chemistry X-MandrivaLinux-MoreApplications-Sciences-Chemistry Chemistry @@ -987,7 +921,6 @@ mandriva-moreapplications-sciences-computerscience.directory - X-Mandrakelinux-MoreApplications-Sciences-ComputerScience X-MandrivaLinux-MoreApplications-Sciences-ComputerScience @@ -997,7 +930,6 @@ mandriva-moreapplications-sciences-datavisualization.directory - X-Mandrakelinux-MoreApplications-Sciences-DataVisualization X-MandrivaLinux-MoreApplications-Sciences-DataVisualization @@ -1007,7 +939,6 @@ mandriva-moreapplications-sciences-electricity.directory - X-Mandrakelinux-MoreApplications-Sciences-Electricity X-MandrivaLinux-MoreApplications-Sciences-Electricity @@ -1017,7 +948,6 @@ mandriva-moreapplications-sciences-geosciences.directory - X-Mandrakelinux-MoreApplications-Sciences-Geosciences X-MandrivaLinux-MoreApplications-Sciences-Geosciences @@ -1027,7 +957,6 @@ mandriva-moreapplications-sciences-imageprocessing.directory - X-Mandrakelinux-MoreApplications-Sciences-ImageProcessing X-MandrivaLinux-MoreApplications-Sciences-ImageProcessing @@ -1037,7 +966,6 @@ mandriva-moreapplications-sciences-mathematics.directory - X-Mandrakelinux-MoreApplications-Sciences-Mathematics X-MandrivaLinux-MoreApplications-Sciences-Mathematics Math @@ -1048,7 +976,6 @@ mandriva-moreapplications-sciences-numericanalysis.directory - X-Mandrakelinux-MoreApplications-Sciences-NumericAnalysis X-MandrivaLinux-MoreApplications-Sciences-NumericAnalysis @@ -1058,7 +985,6 @@ mandriva-moreapplications-sciences-parallelcomputing.directory - X-Mandrakelinux-MoreApplications-Sciences-ParallelComptuting X-MandrivaLinux-MoreApplications-Sciences-ParallelComptuting @@ -1068,7 +994,6 @@ mandriva-moreapplications-sciences-physics.directory - X-Mandrakelinux-MoreApplications-Sciences-Physics X-MandrivaLinux-MoreApplications-Sciences-Physics Physics @@ -1079,7 +1004,6 @@ mandriva-moreapplications-sciences-robotics.directory - X-Mandrakelinux-MoreApplications-Sciences-Robotics X-MandrivaLinux-MoreApplications-Sciences-Robotics @@ -1089,7 +1013,6 @@ mandriva-moreapplications-sciences-other.directory - X-Mandrakelinux-MoreApplications-Sciences-Other X-MandrivaLinux-MoreApplications-Sciences-Other @@ -1109,7 +1032,6 @@ mandriva-multimedia.directory - X-Mandrakelinux-Multimedia X-MandrivaLinux-Multimedia @@ -1124,7 +1046,6 @@ mandriva-multimedia-graphics.directory - X-Mandrakelinux-Multimedia-Graphics X-MandrivaLinux-Multimedia-Graphics Graphics Photography @@ -1146,7 +1067,6 @@ mandriva-multimedia-sound.directory - X-Mandrakelinux-Multimedia-Sound X-MandrivaLinux-Multimedia-Sound Audio Midi @@ -1174,7 +1094,6 @@ mandriva-multimedia-video.directory - X-Mandrakelinux-Multimedia-Video X-MandrivaLinux-Multimedia-Video Video TV @@ -1194,7 +1113,6 @@ mandriva-multimedia-other.directory - X-Mandrakelinux-Multimedia-Other X-MandrivaLinux-Multimedia-Other @@ -1216,7 +1134,6 @@ mandriva-system.directory - X-Mandrakelinux-System X-MandrivaLinux-System @@ -1233,7 +1150,6 @@ mandriva-system-archiving.directory - X-Mandrakelinux-System-Archiving X-MandrivaLinux-System-Archiving @@ -1247,7 +1163,6 @@ mandriva-system-archiving-backup.directory - X-Mandrakelinux-System-Archiving-Backup X-MandrivaLinux-System-Archiving-Backup Archiving @@ -1263,7 +1178,6 @@ mandriva-system-archiving-cdburning.directory - X-Mandrakelinux-System-Archiving-CDBurning X-MandrivaLinux-System-Archiving-CDBurning DiscBurning @@ -1274,7 +1188,6 @@ mandriva-system-archiving-compression.directory - X-Mandrakelinux-System-Archiving-Compression X-MandrivaLinux-System-Archiving-Compression @@ -1284,7 +1197,6 @@ mandriva-system-archiving-other.directory - X-Mandrakelinux-System-Archiving-Other X-MandrivaLinux-System-Archiving-Other @@ -1308,7 +1220,6 @@ mandriva-system-configuration.directory - X-Mandrakelinux-System-Configuration X-MandrivaLinux-System-Configuration @@ -1317,7 +1228,6 @@ mandriva-system-configuration-bootandinit.directory - X-Mandrakelinux-System-Configuration-BootandInit X-MandrivaLinux-System-Configuration-BootandInit @@ -1327,7 +1237,6 @@ mandriva-system-configuration-hardware.directory - X-Mandrakelinux-System-Configuration-Hardware X-MandrivaLinux-System-Configuration-Hardware HardwareSettings @@ -1337,14 +1246,12 @@ GNOME mandriva-system-configuration-gnome.directory - X-Mandrakelinux-System-Configuration-GNOME Advanced mandriva-system-configuration-gnome-advanced.directory - X-Mandrakelinux-System-Configuration-GNOME-Advanced X-MandrivaLinux-System-Configuration-GNOME-Advanced @@ -1355,7 +1262,6 @@ mandriva-system-configuration-kde.directory - X-Mandrakelinux-System-Configuration-KDE X-MandrivaLinux-System-Configuration-KDE @@ -1364,7 +1270,6 @@ kde-settings-accessibility.directory - X-Mandrakelinux-System-Configuration-KDE-Accessibility X-MandrivaLinux-System-Configuration-KDE-Accessibility @@ -1374,7 +1279,6 @@ kde-settings-components.directory - X-Mandrakelinux-System-Configuration-KDE-Components X-MandrivaLinux-System-Configuration-KDE-Components @@ -1384,7 +1288,6 @@ kde-settings-hardware.directory - X-Mandrakelinux-System-Configuration-KDE-Information X-MandrivaLinux-System-Configuration-KDE-Information @@ -1394,7 +1297,6 @@ kde-settings-looknfeel.directory - X-Mandrakelinux-System-Configuration-KDE-LookNFeel X-MandrivaLinux-System-Configuration-KDE-LookNFeel @@ -1405,7 +1307,6 @@ kde-settings-network.directory - X-Mandrakelinux-System-Configuration-KDE-Network X-MandrivaLinux-System-Configuration-KDE-Network @@ -1415,7 +1316,6 @@ kde-settings-peripherals.directory - X-Mandrakelinux-System-Configuration-KDE-Peripherals X-MandrivaLinux-System-Configuration-KDE-Peripherals @@ -1425,7 +1325,6 @@ kde-settings-power.directory - X-Mandrakelinux-System-Configuration-KDE-PowerControl X-MandrivaLinux-System-Configuration-KDE-PowerControl @@ -1435,7 +1334,6 @@ kde-settings-security.directory - X-Mandrakelinux-System-Configuration-KDE-Security X-MandrivaLinux-System-Configuration-KDE-Security @@ -1445,7 +1343,6 @@ kde-settings-sound.directory - X-Mandrakelinux-System-Configuration-KDE-Sound X-MandrivaLinux-System-Configuration-KDE-Sound @@ -1455,7 +1352,6 @@ kde-settings-webbrowsing.directory - X-Mandrakelinux-System-Configuration-KDE-WebBrowsing X-MandrivaLinux-System-Configuration-KDE-WebBrowsing @@ -1465,7 +1361,6 @@ kde-settings-system.directory - X-Mandrakelinux-System-Configuration-KDE-System X-MandrivaLinux-System-Configuration-KDE-System @@ -1476,7 +1371,6 @@ mandriva-system-configuration-networking.directory - X-Mandrakelinux-System-Configuration-Networking X-MandrivaLinux-System-Configuration-Networking Settings @@ -1490,7 +1384,6 @@ mandriva-system-configuration-packaging.directory - X-Mandrakelinux-System-Configuration-Packaging X-MandrivaLinux-System-Configuration-Packaging PackageManager @@ -1501,7 +1394,6 @@ mandriva-system-configuration-printing.directory - X-Mandrakelinux-System-Configuration-Printing X-MandrivaLinux-System-Configuration-Printing @@ -1511,7 +1403,6 @@ mandriva-system-configuration-users.directory - X-Mandrakelinux-System-Configuration-Users X-MandrivaLinux-System-Configuration-Users @@ -1521,7 +1412,6 @@ mandriva-system-configuration-other.directory - X-Mandrakelinux-System-Configuration-Other X-MandrivaLinux-System-Configuration-Other @@ -1537,7 +1427,6 @@ mandriva-system-filetools.directory - X-Mandrakelinux-System-FileTools X-MandrivaLinux-System-FileTools @@ -1552,7 +1441,6 @@ mandriva-system-monitoring.directory - X-Mandrakelinux-System-Monitoring X-MandrivaLinux-System-Monitoring System @@ -1566,7 +1454,6 @@ mandriva-system-session.directory - X-Mandrakelinux-System-Session X-MandrivaLinux-System-Session @@ -1575,7 +1462,6 @@ mandriva-system-session-windowmanagers.directory - X-Mandrakelinux-System-Session-Windowmanagers X-MandrivaLinux-System-Session-Windowmanagers @@ -1591,7 +1477,6 @@ mandriva-system-terminals.directory - X-Mandrakelinux-System-Terminals X-MandrivaLinux-System-Terminals TerminalEmulator @@ -1607,7 +1492,6 @@ mandriva-system-texttools.directory - X-Mandrakelinux-System-TextTools X-MandrivaLinux-System-TextTools @@ -1618,7 +1502,6 @@ mandriva-other.directory - X-Mandrakelinux-Other X-MandrivaLinux-Other @@ -1628,7 +1511,6 @@ mandriva-hidden.directory - X-Mandrakelinux-.hidden X-MandrivaLinux-.hidden diff --git a/menu/desktop-directories/mandriva-moreapplications-games-adventure.directory.in b/menu/desktop-directories/mandriva-moreapplications-games-adventure.directory.in new file mode 100644 index 0000000..2aa1562 --- /dev/null +++ b/menu/desktop-directories/mandriva-moreapplications-games-adventure.directory.in @@ -0,0 +1,5 @@ +[Desktop Entry] +Type=Directory +Encoding=UTF-8 +_Name=Adventure +Icon=adventure_section diff --git a/menu/menustyle.csh b/menu/menustyle.csh index d2c6502..da29e20 100755 --- a/menu/menustyle.csh +++ b/menu/menustyle.csh @@ -11,7 +11,7 @@ foreach file (/etc/sysconfig/menustyle $HOME/.menustyle) endif end -if ($MDV_MENU_STYLE == discovery ) then +if ($MDV_MENU_STYLE == discovery && ! ${?XDG_CONFIG_DIRS}) then setenv XDG_CONFIG_DIRS /etc/xdg/discovery:/etc/xdg endif diff --git a/menu/menustyle.sh b/menu/menustyle.sh index d9788ab..ba46289 100755 --- a/menu/menustyle.sh +++ b/menu/menustyle.sh @@ -9,7 +9,7 @@ fi [ -r /etc/sysconfig/menustyle ] && source /etc/sysconfig/menustyle [ -r $HOME/.menustyle ] && source $HOME/.menustyle -if [ "$MDV_MENU_STYLE" = "discovery" ]; then +if [ "$MDV_MENU_STYLE" = "discovery" -a "x$XDG_CONFIG_DIRS" = "x" ]; then XDG_CONFIG_DIRS=/etc/xdg/discovery:/etc/xdg export XDG_CONFIG_DIRS fi diff --git a/xinit.d/desktop-directories b/xinit.d/desktop-directories index aa38dd0..9627973 100755 --- a/xinit.d/desktop-directories +++ b/xinit.d/desktop-directories @@ -33,13 +33,13 @@ if [ ! -e $USER_STAMP ]; then DIRECTORY_PATH="$HOME/$TARGET_DIR" - [ -d "$DIRECTORY_PATH" ] || mkdir -p $DIRECTORY_PATH - echo -e [Desktop Entry]\\nHidden=true\\n`grep Icon= $file` > $DIRECTORY_PATH/.directory + [ -d "$DIRECTORY_PATH" ] || mkdir -p "$DIRECTORY_PATH" + echo -e [Desktop Entry]\\nHidden=true\\n`grep Icon= $file` > "$DIRECTORY_PATH/.directory" FILE_PATH=$HOME/.mdk-folders/`basename $file .template` SYMLINK=$HOME/.mdk-folders/`basename $file -mdk.desktop.template` - ln -f -s $DIRECTORY_PATH $SYMLINK + ln -f -s "$DIRECTORY_PATH" $SYMLINK if [ "$CHARSET" != "UTF-8" ]; then DIRECTORY_PATH=`echo $DIRECTORY_PATH | iconv -f "$CHARSET" -t UTF-8 2>/dev/null` -- cgit v1.2.1