[Phpgroupware-cvs] CVS: phpGWShell_Win32_VB frmMain.frm,1.4,1.5 phpGWShell.exe,1.3,1.4 phpGWShell.vbp,1.3,1.4

[Chris Weiss <address@hidden>]

Update of /cvsroot/phpgroupware/phpGWShell_Win32_VB
In directory subversions:/tmp/cvs-serv5242

Modified Files:
        frmMain.frm phpGWShell.exe phpGWShell.vbp 
Log Message:
fixed new mail check

Index: frmMain.frm
===================================================================
RCS file: /cvsroot/phpgroupware/phpGWShell_Win32_VB/frmMain.frm,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** frmMain.frm 24 Apr 2002 15:45:52 -0000      1.4
--- frmMain.frm 26 Mar 2003 22:25:17 -0000      1.5
***************
*** 208,212 ****
  Dim aByte() As Byte, bEnding As Boolean, bSendEmail As Boolean, strEmailTo As 
String
  Dim iCurrSeconds As Integer, lCurrDelay As Long
! Dim iNewEventServer As Integer, iCurrServer As Integer
  Public lEventDelay As Long
  
--- 208,212 ----
  Dim aByte() As Byte, bEnding As Boolean, bSendEmail As Boolean, strEmailTo As 
String
  Dim iCurrSeconds As Integer, lCurrDelay As Long
! Dim iNewEventServer As Integer, iCurrServer As Integer, bNewMailPrompt As 
Boolean
  Public lEventDelay As Long
  
***************
*** 564,569 ****
  Private Sub NewMailPrompt(Index As Integer, Optional NumMsg As Long = 0)
  On Error Resume Next
!     
!     If arrServers(Index).LastNumMsg <> NumMsg Then
          SetInTray True
          SetTrayTip "New email on server """ & arrServers(Index).FriendlyName 
& """"
--- 564,568 ----
  Private Sub NewMailPrompt(Index As Integer, Optional NumMsg As Long = 0)
  On Error Resume Next
!     If arrServers(Index).LastNumMsg < NumMsg Then
          SetInTray True
          SetTrayTip "New email on server """ & arrServers(Index).FriendlyName 
& """"
***************
*** 572,580 ****
              Call PlaySound("MailBeep", 0, SND_ASYNC Or SND_NOWAIT)
          End If
!         If arrServers(Index).EventPrompt Then
              If vbYes = MsgBox("You have new email on server """ & 
arrServers(Index).FriendlyName & """.  Would you like to read it now?", 
vbQuestion + vbYesNo) Then
                  Screen.MousePointer = vbHourglass
                  NavigateMail Index, "email/"
              End If
          End If
      End If
--- 571,581 ----
              Call PlaySound("MailBeep", 0, SND_ASYNC Or SND_NOWAIT)
          End If
!         If arrServers(Index).EventPrompt And Not bNewMailPrompt Then
!             bNewMailPrompt = True
              If vbYes = MsgBox("You have new email on server """ & 
arrServers(Index).FriendlyName & """.  Would you like to read it now?", 
vbQuestion + vbYesNo) Then
                  Screen.MousePointer = vbHourglass
                  NavigateMail Index, "email/"
              End If
+             bNewMailPrompt = False
          End If
      End If
***************
*** 782,786 ****
      tmrTrayDely.Enabled = True
      ShowServer iNewEventServer
-     
  End Sub
  
--- 783,786 ----
***************
*** 833,837 ****
          wbNotify(i).Visible = True
          wbNotify(i).ZOrder 99
-         'Debug.Print DoLogin & " " & arrServers(i).LoggedIn
          If DoLogin And Not arrServers(i).LoggedIn Then
              If arrServers(i).AutoLogin Then
--- 833,836 ----
***************
*** 854,858 ****
      If arrCookies(Index).Domain <> "" Then
          If sAddOn <> "" Then sAddOn = sAddOn & "&"
!         sAddOn = "domain=" & arrCookies(Index).Domain
      End If
      If InStr(Path, "?") = 0 Then
--- 853,857 ----
      If arrCookies(Index).Domain <> "" Then
          If sAddOn <> "" Then sAddOn = sAddOn & "&"
!         sAddOn = sAddOn & "domain=" & arrCookies(Index).Domain
      End If
      If InStr(Path, "?") = 0 Then

Index: phpGWShell.exe
===================================================================
RCS file: /cvsroot/phpgroupware/phpGWShell_Win32_VB/phpGWShell.exe,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
Binary files /tmp/cvspRRdMz and /tmp/cvsCDomI0 differ

Index: phpGWShell.vbp
===================================================================
RCS file: /cvsroot/phpgroupware/phpGWShell_Win32_VB/phpGWShell.vbp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** phpGWShell.vbp      29 Jan 2002 22:55:18 -0000      1.3
--- phpGWShell.vbp      26 Mar 2003 22:25:17 -0000      1.4
***************
*** 1,4 ****
  Type=Exe
! 
Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\WINNT\system32\STDOLE2.TLB#OLE
 Automation
  Object={EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}#1.1#0; shdocvw.dll
  Form=frmMain.frm
--- 1,4 ----
  Type=Exe
! 
Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#..\..\..\..\..\WINNT\System32\stdole2.tlb#OLE
 Automation
  Object={EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B}#1.1#0; shdocvw.dll
  Form=frmMain.frm