[popfile-commit] windows installer.nsi,1.51,1.52

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

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv2142

Modified Files:
	installer.nsi 
Log Message:
OE Configuration now handles case where no Identity Ordinals are found.

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** installer.nsi	24 May 2003 20:56:55 -0000	1.51
--- installer.nsi	25 May 2003 00:36:22 -0000	1.52
***************
*** 793,798 ****
    !define L_OEDATA      $R4   ; some data (it varies) for current OE account
    !define L_OEPATH      $R3   ; holds part of the path used to access OE account data
!   !define L_SEPARATOR   $R2   ; char used to separate the pop3 server from the username
!   !define L_TEMP        $R1
  
    Push ${L_ACCOUNT}
--- 793,799 ----
    !define L_OEDATA      $R4   ; some data (it varies) for current OE account
    !define L_OEPATH      $R3   ; holds part of the path used to access OE account data
!   !define L_ORDINALS    $R2   ; "Identity Ordinals" flag (1 = found, 0 = not found) 
!   !define L_SEPARATOR   $R1   ; char used to separate the pop3 server from the username
!   !define L_TEMP        $R0
  
    Push ${L_ACCOUNT}
***************
*** 803,806 ****
--- 804,808 ----
    Push ${L_OEDATA}
    Push ${L_OEPATH}
+   Push ${L_ORDINALS}
    Push ${L_SEPARATOR}
    Push ${L_TEMP}
***************
*** 820,843 ****
  
    ; Check if this is the GUID for the first "Main Identity" created by OE as the account data
!   ; for that identity is stored separately from the account data for the other OE identities. 
  
    ReadRegDWORD ${L_TEMP} HKCU "Identities\${L_GUID}" "Identity Ordinal"
!   IntCmp ${L_TEMP} 1 firstID otherID otherID
    
! firstID:
    StrCpy ${L_OEPATH} ""
    goto check_accounts
    
! otherID:
    StrCpy ${L_OEPATH} "Identities\${L_GUID}\"
  
  check_accounts:
  
!   ; Now check all of the accounts for this particular identity
  
    StrCpy ${L_ACCT_INDEX} 0
    
-   ; Get the next set of OE account data for the current OE Identity
- 
  next_acct:
    EnumRegKey ${L_ACCOUNT} \
--- 822,851 ----
  
    ; Check if this is the GUID for the first "Main Identity" created by OE as the account data
!   ; for that identity is stored separately from the account data for the other OE identities.
!   ; If no "Identity Ordinal" value found, use the first "Main Identity" created by OE.
  
+   StrCpy ${L_ORDINALS} "1"
+   
    ReadRegDWORD ${L_TEMP} HKCU "Identities\${L_GUID}" "Identity Ordinal"
!   IntCmp ${L_TEMP} 1 firstOrdinal noOrdinals otherOrdinal
    
! firstOrdinal:
!   StrCpy ${L_OEPATH} ""
!   goto check_accounts
! 
! noOrdinals:
!   StrCpy ${L_ORDINALS} "0"
    StrCpy ${L_OEPATH} ""
    goto check_accounts
    
! otherOrdinal:
    StrCpy ${L_OEPATH} "Identities\${L_GUID}\"
  
  check_accounts:
  
!   ; Now check all of the accounts for the current OE Identity
  
    StrCpy ${L_ACCT_INDEX} 0
    
  next_acct:
    EnumRegKey ${L_ACCOUNT} \
***************
*** 856,860 ****
    StrCmp ${L_OEDATA} "127.0.0.1" try_next_account
    
!   ; If 'POP3 Server' contains the separator character, we cannot configure this account
    
    Push ${L_OEDATA}
--- 864,868 ----
    StrCmp ${L_OEDATA} "127.0.0.1" try_next_account
    
!   ; If 'POP3 Server' data contains the separator character, we cannot configure this account
    
    Push ${L_OEDATA}
***************
*** 880,884 ****
    ReadRegStr ${L_OEDATA} HKCU ${L_ACCOUNT} "POP3 User Name"
    
!   ; If 'POP3 User Name' contains the separator character, we cannot configure this account
    
    Push ${L_OEDATA}
--- 888,892 ----
    ReadRegStr ${L_OEDATA} HKCU ${L_ACCOUNT} "POP3 User Name"
    
!   ; If 'POP3 User Name' data contains the separator character, we cannot configure this account
    
    Push ${L_OEDATA}
***************
*** 944,948 ****
  finished_this_guid:
  
!   ; Now move on to the next identity
    
    IntOp ${L_GUID_INDEX} ${L_GUID_INDEX} + 1
--- 952,958 ----
  finished_this_guid:
  
!   ; If no "Identity Ordinal" values were found then exit otherwise move on to the next identity
!   
!   StrCmp ${L_ORDINALS} "0" finished_oe_config
    
    IntOp ${L_GUID_INDEX} ${L_GUID_INDEX} + 1
***************
*** 953,956 ****
--- 963,967 ----
    Pop ${L_TEMP}
    Pop ${L_SEPARATOR}
+   Pop ${L_ORDINALS}
    Pop ${L_OEPATH}
    Pop ${L_OEDATA}
***************
*** 968,971 ****
--- 979,983 ----
    !undef L_OEDATA
    !undef L_OEPATH
+   !undef L_ORDINALS
    !undef L_SEPARATOR
    !undef L_TEMP