Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bug 39810 - empty trash on exit causes slow shutdow; PR_Wait() too long; r=mscott

Browse Source
This commit is contained in:
jefft%netscape.com 2000-05-25 00:56:28 +00:00
parent 08306a297a
commit 9da2db91e3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mailnews/base/src/nsMsgAccountManager.cpp
View File

@ -835,7 +835,7 @@ PRBool nsMsgAccountManager::emptyTrashOnExit(nsHashKey *aKey, void *aData,
PR_FALSE);
if (isImap)
server->GetPassword(getter_Copies(passwd));
if (!isImap || (isImap && passwd))
if (!isImap || (isImap && passwd && *passwd))
{
nsCOMPtr<nsIUrlListener> urlListener;
nsresult rv;
@ -863,7 +863,7 @@ PRBool nsMsgAccountManager::emptyTrashOnExit(nsHashKey *aKey, void *aData,
{
accountManager->GetEmptyTrashInProgress(&inProgress);
PR_CEnterMonitor(folder);
PR_CWait(folder, 10000UL);
PR_CWait(folder, 1000UL);
PR_CExitMonitor(folder);
if (eventQueue)
eventQueue->ProcessPendingEvents();

3
mailnews/imap/src/nsImapUrl.cpp
View File

@ -674,7 +674,8 @@ NS_IMETHODIMP nsImapUrl::AddOnlineDirectoryIfNecessary(const char *onlineMailbox
// This invariant should be maintained by libmsg when reading/writing the prefs.
// We are only supporting online directories whose online delimiter is /
// Therefore, the online directory must end in a slash.
PR_ASSERT(onlineDir[nsCRT::strlen(onlineDir) - 1] == '/');
NS_ASSERTION (onlineDir[nsCRT::strlen(onlineDir) - 1] == '/',
"online directory not ended with a slash\n");
#endif
nsIMAPNamespace *ns = nsnull;
rv = hostSessionList->GetNamespaceForMailboxForHost(serverKey,