fix 408861, alert about server not being imap 4 server when connection lost, r=dale, sr=neil, 408861
authordavidbienvenu@Macintosh.local
Mon, 28 Jul 2008 09:19:28 -0700
changeset 39 6e9c4ef897066c0fa97e6d7f8fde11bee064d7f7
parent 38 014093b714605ae1b6ba31da104d013c480ad9ae
child 40 23da5cab793a16a758f400d6f76406ca46987c2d
push id34
push userbienvenu@nventure.com
push dateMon, 28 Jul 2008 16:19:37 +0000
treeherdercomm-central@6e9c4ef89706 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdale, neil, 408861
bugs408861
fix 408861, alert about server not being imap 4 server when connection lost, r=dale, sr=neil, 408861
mailnews/imap/src/nsImapProtocol.cpp
--- a/mailnews/imap/src/nsImapProtocol.cpp
+++ b/mailnews/imap/src/nsImapProtocol.cpp
@@ -1436,17 +1436,18 @@ PRBool nsImapProtocol::ProcessCurrentURL
   {
       /* if we got here, the server's greeting should not have been PREAUTH */
       if (GetServerStateParser().GetCapabilityFlag() == kCapabilityUndefined)
           Capability();
 
       if ( !(GetServerStateParser().GetCapabilityFlag() & (kIMAP4Capability | kIMAP4rev1Capability |
              kIMAP4other) ) )
       {
-        AlertUserEventUsingId(IMAP_SERVER_NOT_IMAP4);
+        if (!DeathSignalReceived() && GetConnectionStatus() >= 0)
+          AlertUserEventUsingId(IMAP_SERVER_NOT_IMAP4);
 
         SetConnectionStatus(-1);        // stop netlib
       }
       else
       {
         if (m_connectionType.Equals("starttls")
             && (m_socketType == nsIMsgIncomingServer::tryTLS
             && (GetServerStateParser().GetCapabilityFlag() & kHasStartTLSCapability))