Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3324
Modified Files:
Tag: b0_22_2
getssl.nsh
Log Message:
IO::Socket::SSL v1.01 (released yesterday) is not compatible with the
Windows version of POPFile 0.22.4 so the SSL Setup wizard has been
updated to cope with this. Patch problems are now reported instead of
simply being logged.
Updated to use the latest version of the Inetc plugin. By default the
install details are hidden and in order to avoid a strange looking display
the "Show Details" button is disabled whilst downloading the SSL files
(for some reason the new version of Inetc does not hide that button).
Index: getssl.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/getssl.nsh,v
retrieving revision 1.6.2.7
retrieving revision 1.6.2.8
diff -C2 -d -r1.6.2.7 -r1.6.2.8
*** getssl.nsh 29 Aug 2006 15:52:48 -0000 1.6.2.7
--- getssl.nsh 14 Sep 2006 13:55:38 -0000 1.6.2.8
***************
*** 17,20 ****
--- 17,24 ----
# be applied to downgrade the relevant file to the compatible v0.97 version.
#
+ # On 13 September 2006 the University of Winnipeg repository was updated to
+ # provide IO::Socket::SSL v1.01 which is not compatible with POPFile so this
+ # utility will apply a patch to downgrade this to the compatible v0.97 version.
+ #
# Copyright (c) 2005-2006 John Graham-Cumming
#
***************
*** 87,94 ****
--- 91,100 ----
; GenPat.exe SSL_0.99.pm SSL_0.97.pm SSL_pm.pat
; GenPat.exe SSL_0.999.pm SSL_0.97.pm SSL_pm.pat
+ ; GenPat.exe SSL_1.01.pm SSL_0.97.pm SSL_pm.pat
;
; where SSL_0.97.pm was the SSL.pm file from v0.97 of the IO::Socket:SSL module
; and SSL_0.99.pm was the SSL.pm file from v0.99 of the IO::Socket:SSL module
; and SSL_0.999.pm was the SSL.pm file from v0.999 of the IO::Socket:SSL module
+ ; and SSL_1.01.pm was the SSL.pm file from v1.01 of the IO::Socket:SSL module
#--------------------------------------------------------------------------
***************
*** 299,303 ****
DetailPrint ""
- StrCmp $G_PLS_FIELD_2 "No suitable patches were found" label_a
StrCmp $G_PLS_FIELD_2 "OK" 0 show_downgrade_status
!insertmacro PFI_BACKUP_123_DP "$G_PLS_FIELD_1" "SSL.pm"
--- 305,308 ----
***************
*** 440,443 ****
--- 445,452 ----
Pop $G_SSL_FILEURL
+ !define L_DLG_ITEM $R9
+
+ Push ${L_DLG_ITEM}
+
StrCpy $G_PLS_FIELD_1 $G_SSL_FILEURL
Push $G_PLS_FIELD_1
***************
*** 451,456 ****
--- 460,479 ----
DetailPrint ""
DetailPrint "$(PFI_LANG_PROG_STARTDOWNLOAD)"
+
+ ; The current version of the Inetc plugin (dated 8 September 2006) leaves the "Show Details"
+ ; button in view so we temporarily disable it during the download to avoid a messy display
+ ; (if the user has already clicked the button then they'll just need to put up with the mess)
+
+ FindWindow ${L_DLG_ITEM} "#32770" "" $HWNDPARENT
+ GetDlgItem ${L_DLG_ITEM} ${L_DLG_ITEM} 0x403
+ EnableWindow ${L_DLG_ITEM} 0
+
inetc::get /RESUME "$(PFI_LANG_MB_CHECKINTERNET)" ${C_NSISDL_TRANSLATIONS} "$G_SSL_FILEURL" "$PLUGINSDIR\$G_PLS_FIELD_1" /END
Pop $G_PLS_FIELD_2
+
+ ; Enable the "Show Details" button now that the download has been completed
+
+ EnableWindow ${L_DLG_ITEM} 1
+
StrCmp $G_PLS_FIELD_2 "OK" file_received
SetDetailsPrint both
***************
*** 471,474 ****
--- 494,501 ----
file_received:
+ Pop ${L_DLG_ITEM}
+
+ !undef L_DLG_ITEM
+
FunctionEnd
|
