[popfile-commit] windows adduser-EmailConfig.nsh,1.1.2.3,1.1.2.4 adduser-Uninstall.nsh,1.2.2.3,1.2.2.4 adduser-Version.nsh,1.6.2.5,1.6.2.6 adduser.nsi,1.59.4.5,1.59.4.6

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

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

Modified Files:
      Tag: b0_22_2
	adduser-EmailConfig.nsh adduser-Uninstall.nsh 
	adduser-Version.nsh adduser.nsi 
Log Message:
Change GPL license to remove the option for the person using POPFile
to license it under any version of the GPL other than v2

Index: adduser-Uninstall.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/adduser-Uninstall.nsh,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -d -r1.2.2.3 -r1.2.2.4
*** adduser-Uninstall.nsh	19 Dec 2005 11:45:36 -0000	1.2.2.3
--- adduser-Uninstall.nsh	6 Feb 2006 16:26:03 -0000	1.2.2.4
***************
*** 4,13 ****
  #                           script (adduser.nsi) used to build the 'Add POPFile User' wizard.
  #
! # Copyright (c) 2005 John Graham-Cumming
  #
  #   This file is part of POPFile
  #
  #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
  #   published by the Free Software Foundation.
  #
--- 4,13 ----
  #                           script (adduser.nsi) used to build the 'Add POPFile User' wizard.
  #
! # Copyright (c) 2005-2006 John Graham-Cumming
  #
  #   This file is part of POPFile
  #
  #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms of version 2 of the GNU General Public License as
  #   published by the Free Software Foundation.
  #
***************
*** 75,81 ****
    ; running the uninstaller so we can check if the email settings can be safely restored
  
! 	ClearErrors
! 	UserInfo::GetName
! 	IfErrors 0 got_name
  
    ; Assume Win9x system, so user has 'Admin' rights
--- 75,81 ----
    ; running the uninstaller so we can check if the email settings can be safely restored
  
!   ClearErrors
!   UserInfo::GetName
!   IfErrors 0 got_name
  
    ; Assume Win9x system, so user has 'Admin' rights
***************
*** 87,91 ****
  
  got_name:
! 	Pop $G_WINUSERNAME
    StrCmp $G_WINUSERNAME "" 0 get_usertype
    StrCpy $G_WINUSERNAME "UnknownUser"
--- 87,91 ----
  
  got_name:
!   Pop $G_WINUSERNAME
    StrCmp $G_WINUSERNAME "" 0 get_usertype
    StrCpy $G_WINUSERNAME "UnknownUser"
***************
*** 93,97 ****
  get_usertype:
    UserInfo::GetAccountType
! 	Pop $G_WINUSERTYPE
    StrCmp $G_WINUSERTYPE "Admin" exit
    StrCmp $G_WINUSERTYPE "Power" exit
--- 93,97 ----
  get_usertype:
    UserInfo::GetAccountType
!   Pop $G_WINUSERTYPE
    StrCmp $G_WINUSERTYPE "Admin" exit
    StrCmp $G_WINUSERTYPE "Power" exit

Index: adduser-EmailConfig.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/adduser-EmailConfig.nsh,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** adduser-EmailConfig.nsh	19 Dec 2005 11:45:36 -0000	1.1.2.3
--- adduser-EmailConfig.nsh	6 Feb 2006 16:26:03 -0000	1.1.2.4
***************
*** 5,14 ****
  #                             when offering to reconfigure email accounts.
  #
! # Copyright (c) 2005 John Graham-Cumming
  #
  #   This file is part of POPFile
  #
  #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
  #   published by the Free Software Foundation.
  #
--- 5,14 ----
  #                             when offering to reconfigure email accounts.
  #
! # Copyright (c) 2005-2006 John Graham-Cumming
  #
  #   This file is part of POPFile
  #
  #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms of version 2 of the GNU General Public License as
  #   published by the Free Software Foundation.
  #

Index: adduser-Version.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/adduser-Version.nsh,v
retrieving revision 1.6.2.5
retrieving revision 1.6.2.6
diff -C2 -d -r1.6.2.5 -r1.6.2.6
*** adduser-Version.nsh	27 Sep 2005 11:47:33 -0000	1.6.2.5
--- adduser-Version.nsh	6 Feb 2006 16:26:03 -0000	1.6.2.6
***************
*** 7,11 ****
  #--------------------------------------------------------------------------
  
!   !define C_PFI_VERSION  "0.2.75"
  
  #--------------------------------------------------------------------------
--- 7,11 ----
  #--------------------------------------------------------------------------
  
!   !define C_PFI_VERSION  "0.2.77"
  
  #--------------------------------------------------------------------------

Index: adduser.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/adduser.nsi,v
retrieving revision 1.59.4.5
retrieving revision 1.59.4.6
diff -C2 -d -r1.59.4.5 -r1.59.4.6
*** adduser.nsi	19 Dec 2005 11:45:36 -0000	1.59.4.5
--- adduser.nsi	6 Feb 2006 16:26:03 -0000	1.59.4.6
***************
*** 8,17 ****
  #                 be done using this wizard.
  #
! # Copyright (c) 2004-2005 John Graham-Cumming
  #
  #   This file is part of POPFile
  #
  #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms version 2 of the GNU General Public License as
  #   published by the Free Software Foundation.
  #
--- 8,17 ----
  #                 be done using this wizard.
  #
! # Copyright (c) 2004-2006 John Graham-Cumming
  #
  #   This file is part of POPFile
  #
  #   POPFile is free software; you can redistribute it and/or modify it
! #   under the terms of version 2 of the GNU General Public License as
  #   published by the Free Software Foundation.
  #