[popfile-commit] windows getssl.nsh,1.6.2.17,1.6.2.18

[Brian S. <xue...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16332

Modified Files:
      Tag: b0_22_2
	getssl.nsh 
Log Message:
Use the new URL for the Patch Control File. If the download fails do not
try to quote the program's name, just refer to the "Add/Remove Programs"
list.

Index: getssl.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/getssl.nsh,v
retrieving revision 1.6.2.17
retrieving revision 1.6.2.18
diff -C2 -d -r1.6.2.17 -r1.6.2.18
*** getssl.nsh	14 Oct 2007 17:22:52 -0000	1.6.2.17
--- getssl.nsh	18 Oct 2007 01:36:42 -0000	1.6.2.18
***************
*** 157,164 ****
  #--------------------------------------------------------------------------
  
!   ; Temporarily use the "downloads" directory on the project's "new" server:
!   
!   !define C_PATCH_WEBSITE     "http://h1212143.stratoserver.net/downloads"
!   
  ;;  !define C_PATCH_WEBSITE     "http://getpopfile.org/ssl-patch"
  
--- 157,164 ----
  #--------------------------------------------------------------------------
  
!   ; Temporarily use the "anonymous" URL for the project's new server:
! 
!   !define C_PATCH_WEBSITE     "http://h1212143.stratoserver.net/installer/ssl-patch"
! 
  ;;  !define C_PATCH_WEBSITE     "http://getpopfile.org/ssl-patch"
  
***************
*** 493,507 ****
      !ifdef INSTALLER
        installer_error_exit:
!         Push $R1    ; No need to preserve $R0 here as it is known as ${L_RESULT} in this 'Section'
! 
!         ; The first system call gets the full pathname (returned in $R0) and the second call
!         ; extracts the filename (and possibly the extension) part (returned in $R1)
! 
!         System::Call 'kernel32::GetModuleFileNameA(i 0, t .R0, i 1024)'
!         System::Call 'comdlg32::GetFileTitleA(t R0, t .R1, i 1024)'
!         StrCpy $G_PLS_FIELD_1 $R1
          MessageBox MB_OK|MB_ICONEXCLAMATION "$(PFI_LANG_MB_REPEATSSL)"
- 
-         Pop $R1
          Goto exit
      !else
--- 493,498 ----
      !ifdef INSTALLER
        installer_error_exit:
!         StrCpy $G_PLS_FIELD_1 "(undefined)"
          MessageBox MB_OK|MB_ICONEXCLAMATION "$(PFI_LANG_MB_REPEATSSL)"
          Goto exit
      !else
***************
*** 1296,1300 ****
  
  #--------------------------------------------------------------------------
! # Code block to be used when installing POPFile (i.e. used in setup.exe)
  #--------------------------------------------------------------------------
  
--- 1287,1291 ----
  
  #--------------------------------------------------------------------------
! # Code block to be used when modifying POPFile (i.e. used in uninstaller.exe)
  #--------------------------------------------------------------------------