[tomboy] Fixed installer asking to install gtk# when it's already installed



commit 9e053a3dad9db45f9a1e86d38e478c59a6fbd794
Author: Alex Tereschenko <frozen and blue gmail com>
Date:   Tue May 28 22:30:44 2013 +0200

    Fixed installer asking to install gtk# when it's already installed
    
    Some systems may have AllwaysInstallElevated property set to "1" and as a
    result some of the crucial properties our installer uses are not passed
    between the installation phases, because they're not listed as secure.
    
    That causes the installer to think user doesn't have gtk# installed.
    
    This patch marks all properties as secure explicitly and fixed that
    behavior.
    
    Signed-off-by: Jared Jennings <jared jaredjennings org>

 Setup/Setup.wxs |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/Setup/Setup.wxs b/Setup/Setup.wxs
index 4b70201..ac4b4c7 100644
--- a/Setup/Setup.wxs
+++ b/Setup/Setup.wxs
@@ -48,12 +48,12 @@
                                to be able to install this as smoothly (outside of the
                                "Program Files" folder), we need to fall back to HKCU?
                -->
-               <Property Id="INSTALLDIR">
+               <Property Id="INSTALLDIR" Secure="yes">
                        <RegistrySearch Id='SearchTomboyInstallDir' Type='directory' Root='HKLM' 
Key='Software\Tomboy' Name='InstallDir' />
                </Property>
                
                
-               <Property Id="GTKSHARPNOVELLINSTALLVERSION">
+               <Property Id="GTKSHARPNOVELLINSTALLVERSION" Secure="yes">
                        <RegistrySearch Id='GtksharpnovellRegistry' Type='raw' Root='HKLM' 
Key='Software\Xamarin\GtkSharp\Version' />
                </Property>
                <Condition Message="This setup requires Gtk# for .NET (version 2.12.20 or higher). Please 
download the latest installer from http://www.mono-project.com/GtkSharp ">
@@ -104,14 +104,14 @@
                        features but adds a dialog to let the user choose a 
                        directory where the product will be installed
                -->
-               <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
+               <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" Secure="yes"/>
                <UIRef Id="WixUI_InstallDir"/>
 
                <Icon Id="Tomboy.exe" SourceFile="..\bin\Debug\Tomboy.exe" />
                
                <!-- Icon for "Add/Remove programs" entry and help link -->
                <Icon Id="icon.ico" SourceFile="..\data\icons\tomboy.ico" />
-               <Property Id="ARPPRODUCTICON" Value="icon.ico" />
-               <Property Id="ARPHELPLINK" Value="http://projects.gnome.org/tomboy/"; />
+               <Property Id="ARPPRODUCTICON" Value="icon.ico" Secure="yes"/>
+               <Property Id="ARPHELPLINK" Value="http://projects.gnome.org/tomboy/"; Secure="yes"/>
        </Product>
 </Wix>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]