[Spambayes-checkins] spambayes/Outlook2000/installer spambayes_addin.iss, 1.5, 1.6

[Mark Hammond]

Update of /cvsroot/spambayes/spambayes/Outlook2000/installer
In directory sc8-pr-cvs1:/tmp/cvs-serv14003

Modified Files:
	spambayes_addin.iss 
Log Message:
Ready for the next build, and check that Outlook isn't running at install
time.


Index: spambayes_addin.iss
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/installer/spambayes_addin.iss,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** spambayes_addin.iss	22 Jul 2003 06:25:16 -0000	1.5
--- spambayes_addin.iss	28 Jul 2003 14:05:59 -0000	1.6
***************
*** 5,10 ****
  [Setup]
  AppName=Spambayes Outlook Addin
! AppVerName=Spambayes Outlook Addin 0.5
! AppVersion=0.5
  DefaultDirName={pf}\Spambayes Outlook Addin
  DefaultGroupName=Spambayes Outlook Addin
--- 5,10 ----
  [Setup]
  AppName=Spambayes Outlook Addin
! AppVerName=Spambayes Outlook Addin 0.6
! AppVersion=0.6
  DefaultDirName={pf}\Spambayes Outlook Addin
  DefaultGroupName=Spambayes Outlook Addin
***************
*** 23,36 ****
  function InitializeSetup(): Boolean;
  begin
!   Result := true;
!   if not RegKeyExists( HKCU, 'Software\Microsoft\Office\Outlook') then
!     begin
!       Result := MsgBox(
!             'Outlook appears to not be installed.' + #13 + #13 +
!             'This addin only works with Microsoft Outlook 2000 and later - it' + #13 +
!             'does not work with Outlook express.' + #13 + #13 +
!             'If you know that Outlook is installed, you may with to continue.' + #13 + #13 +
!             'Continue with installation?',
!             mbConfirmation, MB_YESNO) = idYes;
      end;
  end;
--- 23,45 ----
  function InitializeSetup(): Boolean;
  begin
!     Result := true;
!     if not RegKeyExists( HKCU, 'Software\Microsoft\Office\Outlook') then begin
!         Result := MsgBox(
!               'Outlook appears to not be installed.' + #13 + #13 +
!               'This addin only works with Microsoft Outlook 2000 and later - it' + #13 +
!               'does not work with Outlook express.' + #13 + #13 +
!               'If you know that Outlook is installed, you may with to continue.' + #13 + #13 +
!               'Continue with installation?',
!               mbConfirmation, MB_YESNO) = idYes;
!     end;
!     while Result do begin
!         if not CheckForMutexes('_outlook_mutex_') then
!             break;
! 
!           Result := MsgBox(
!               'You must close Outlook before SpamBayes can be installed.' + #13 + #13 +
!               'Please close all Outlook Windows and click Retry' + #13 +
!               'or click Cancel to exit the installation.',
!               mbConfirmation, MB_RETRYCANCEL) = idRetry;
      end;
  end;