[Libreoffice-commits] .: Branch 'feature/onemsi' - 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 cef52ca2c2a950dd5d8cd61deae0fac721989c49
Author: Andras Timar <atimar at suse.com>
Date:   Mon Nov 21 21:41:35 2011 +0100

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

diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp
index db3e5b1..d00148a 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -31,7 +31,11 @@ FolderItem gid_Folderitem_Soffice
     Name = "%PRODUCTNAME";
     Name (pt-BR) = "%PRODUCTNAME_BR";
     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 91e6302..08614c7 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