Backed out changeset 754b3e5c79a0 (Bug 658503) since we seem to have diverged away from Gecko 5 buildability earlier than I thought.
authorJustin Wood <Callek@gmail.com>
Wed, 25 May 2011 21:46:08 -0400
changeset 7798 f3c8b3d47c6c8fc174cc1c54ff9160459b8d74d7
parent 7793 754b3e5c79a001dd10e4f785424e934a60cf828e
child 7799 83bbca25b656a22000918fae29b29ddea6dcd4aa
push id5
push userCallek@gmail.com
push dateThu, 26 May 2011 01:46:43 +0000
treeherdercomm-beta@83bbca25b656 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs658503
backs out754b3e5c79a001dd10e4f785424e934a60cf828e
Backed out changeset 754b3e5c79a0 (Bug 658503) since we seem to have diverged away from Gecko 5 buildability earlier than I thought.
mailnews/imap/src/nsImapProtocol.cpp
--- a/mailnews/imap/src/nsImapProtocol.cpp
+++ b/mailnews/imap/src/nsImapProtocol.cpp
@@ -1254,17 +1254,17 @@ nsImapProtocol::TellThreadToDie()
                 nsImapServerResponseParser::kFolderSelected && m_safeToCloseConnection;
   nsCString command;
   // if a url is writing data, we can't even logout, so we're just
   // going to close the connection as if the user pressed stop.
   if (m_currentServerCommandTagNumber > 0 && !urlWritingData)
   {
     PRBool isAlive = PR_FALSE;
     if (m_transport)
-      rv = m_transport->IsAlive(PR_FALSE, &isAlive);
+      rv = m_transport->IsAlive(&isAlive);
 
     if (TestFlag(IMAP_CONNECTION_IS_OPEN) && m_idle && isAlive)
       EndIdle(PR_FALSE);
 
     if (NS_SUCCEEDED(rv) && isAlive && closeNeeded && GetDeleteIsMoveToTrash() &&
         TestFlag(IMAP_CONNECTION_IS_OPEN) && m_outputStream)
       Close(PR_TRUE, connectionIdle);
 
@@ -2215,17 +2215,17 @@ NS_IMETHODIMP nsImapProtocol::CanHandleU
   if (!m_transport)
   {
     // this connection might not be fully set up yet.
     return NS_ERROR_FAILURE;
   }
   else if (m_currentServerCommandTagNumber != 0)
   {
     PRBool isAlive;
-    rv = m_transport->IsAlive(PR_FALSE, &isAlive);
+    rv = m_transport->IsAlive(&isAlive);
     // if the transport is not alive, and we've ever sent a command with this connection, kill it.
     // otherwise, we've probably just not finished setting it so don't kill it!
     if (NS_FAILED(rv) || !isAlive)
     {
       MutexAutoUnlock unlock(mLock); // TellThreadToDie gets the lock
       TellThreadToDie(PR_FALSE);
       return NS_ERROR_FAILURE;
     }