Changes in the mozilla tree are as follow: #3491 - 1. Handle first cancellation of logon dialog (ie, run mail program and then cancel the dialog). In nsImapIncomingServer::CreateImapConnection(), for 'Redirect Logon' url (ie, AOL servers) we simply return error code 'NS_BINDING_ABORTED' to the caller if users cancel the logon dialog. We added code here to detect user cancellation. The caller, in this case is nsImapMailFolder::UpdateFolder(), will then call: NotifyFolderEvent(mFolderLoadedAtom); to handle resetting of the busy cursor business. 2. Users click on 'Get Msg' button after canceling the logon dialog. The code added to nsImapIncomingServer::CreateImapConnection() to detect logon dialog cancellation stays the same (ie, simply returns 'NS_BINDING_ABORTED' error). And in the caller function, nsImapMailFolder::GetNewMessages(), we added code to invoke: inbox->NotifyFolderEvent(mFolderLoadedAtom); when the returned error code is 'NS_BINDING_ABORTED'. #3611 - We added code in nsImapIncomingServer::PossibleImapMailbox() and nsImapMailFolder::CreateSubFolders () to handle folder name conversion and hiding based on the redirector type of a given account. #4696 - We added 'redirector type' parameter to the Logon() method in nsIMsgLogonRedirector interface. Also, implemented a way to automatically migrate the redirector type of existing Netscape webmail accounts to 'netscape' (from 'aol').

Reassign to myself.

a= asa@mozilla.org for checkin to the trunk. (on behalf of drivers)

Fix checked in.

verified fixed, using code verification from lxr/bonsai.