[Libreoffice-commits] .: scp2/source solenv/bin

[Andras Timar]

 scp2/source/ooo/folderitem_ooo.scp               |    4 ++++
 solenv/bin/modules/installer/windows/shortcut.pm |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit d9f7b43af4db6352239dd706d8920e02114b0510
Author: Andras Timar <atimar at suse.com>
Date:   Mon Nov 21 22:18:20 2011 +0100

    if silent MSI, put LibreOffice starter icon to Program menu folder

diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp
index 3c41948..7381735 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -30,7 +30,11 @@
 FolderItem gid_Folderitem_Soffice
     Name = "%PRODUCTNAME";
     ModuleID = gid_Module_Root;
+#ifdef ENABLE_SILENT_MSI
+    FolderID = PREDEFINED_STARTMENU;
+#else
     FolderID = gid_Folder_Staroffice51;
+#endif
     FileID = gid_Brand_File_Bin_Soffice;
     IconFile = gid_Brand_File_Bin_Soffice;
     IconID = 0;
diff --git a/solenv/bin/modules/installer/windows/shortcut.pm b/solenv/bin/modules/installer/windows/shortcut.pm
index cb62a0a..6c73f77 100644
--- a/solenv/bin/modules/installer/windows/shortcut.pm
+++ b/solenv/bin/modules/installer/windows/shortcut.pm
@@ -375,7 +375,7 @@ sub get_folderitem_directory
 
     if ( $shortcut->{'FolderID'} eq "PREDEFINED_STARTMENU" )
     {
-        $directory = $installer::globals::startmenufolder;
+        $directory = $installer::globals::programmenufolder;
     }
 
     # saving the directory in the folderitems collector