im.pidgin.pidgin: ebc8a9808b4bf7b5669684d7082580ddc92e8d93

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: ebc8a9808b4bf7b5669684d7082580ddc92e8d93
Ancestor: 3ab2ccec72324b65dee436800ef9375157c55c20
Author: datallah at pidgin.im
Date: 2008-01-09T19:04:28
Branch: im.pidgin.pidgin

Modified files:
        pidgin/win32/nsis/pidgin-installer.nsi

ChangeLog: 

Fix an issue where the Start Menu shortcut wasn't selected by default when not installed. Fixes #4489.

-------------- next part --------------
============================================================
--- pidgin/win32/nsis/pidgin-installer.nsi	6734d3023e0dc89a2d746e7bfdb84f374a37cab2
+++ pidgin/win32/nsis/pidgin-installer.nsi	0f5342e5f5c1666524ec3509940618d71ce7a97d
@@ -700,7 +700,6 @@ Section Uninstall
     Delete "$INSTDIR\ca-certs\GTE_CyberTrust_Global_Root.pem"
     Delete "$INSTDIR\ca-certs\Microsoft_Secure_Server_Authority.pem"
     Delete "$INSTDIR\ca-certs\StartCom_Free_SSL_CA.pem"
-    Delete "$INSTDIR\ca-certs\Verisign_Class3_Extended_Validation_CA.pem"
     Delete "$INSTDIR\ca-certs\Verisign_Class3_Primary_CA.pem"
     Delete "$INSTDIR\ca-certs\Verisign_RSA_Secure_Server_CA.pem"
     RMDir "$INSTDIR\ca-certs"
@@ -1168,7 +1167,6 @@ Function ${UN}RunCheck
     MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION $(PIDGIN_IS_RUNNING) /SD IDCANCEL IDRETRY retry_runcheck
     Abort
 
-  done:
   Pop $R1
   Pop $R0
 FunctionEnd
@@ -1264,7 +1262,7 @@ Function .onInit
 
   ClearErrors
   ${GetOptions} "$R0" "/DS=" $R1
-  IfErrors +7
+  IfErrors +8
   SectionGetFlags ${SecDesktopShortcut} $R2
   StrCmp "1" $R1 0 +2
   IntOp $R2 $R2 | ${SF_SELECTED}
@@ -1275,7 +1273,7 @@ Function .onInit
 
   ClearErrors
   ${GetOptions} "$R0" "/SMS=" $R1
-  IfErrors +7
+  IfErrors +8
   SectionGetFlags ${SecStartMenuShortcut} $R2
   StrCmp "1" $R1 0 +2
   IntOp $R2 $R2 | ${SF_SELECTED}