fix default special folders account for pop3 deferred accounts, 254016 sr=mscott

This commit is contained in:
bienvenu%nventure.com 2004-08-05 22:57:05 +00:00
Родитель 5224a04c72
Коммит a271f94ef5
1 изменённых файлов: 6 добавлений и 5 удалений
mailnews/base/prefs/resources/content

Просмотреть файл

@ -223,7 +223,7 @@ function FinishAccount()
// transfer all attributes from the accountdata // transfer all attributes from the accountdata
finishAccount(gCurrentAccount, accountData); finishAccount(gCurrentAccount, accountData);
setupCopiesAndFoldersServer(gCurrentAccount); setupCopiesAndFoldersServer(gCurrentAccount, getCurrentServerIsDeferred(pageData));
if (!serverIsNntp(pageData)) if (!serverIsNntp(pageData))
EnableCheckMailAtStartUpIfNeeded(gCurrentAccount); EnableCheckMailAtStartUpIfNeeded(gCurrentAccount);
@ -611,13 +611,14 @@ function verifyLocalFoldersAccount()
} }
function setupCopiesAndFoldersServer(account) function setupCopiesAndFoldersServer(account, accountIsDeferred)
{ {
try { try {
var server = account.incomingServer; var server = account.incomingServer;
var identity = account.identities.QueryElementAt(0, Components.interfaces.nsIMsgIdentity); var identity = account.identities.QueryElementAt(0, Components.interfaces.nsIMsgIdentity);
// for this server, do we default the folder prefs to this server, or to the "Local Folders" server // For this server, do we default the folder prefs to this server, or to the "Local Folders" server
var defaultCopiesAndFoldersPrefsToServer = server.defaultCopiesAndFoldersPrefsToServer; // If it's deferred, we use the local folders account.
var defaultCopiesAndFoldersPrefsToServer = !accountIsDeferred && server.defaultCopiesAndFoldersPrefsToServer;
dump ("verifying local folders account \n"); dump ("verifying local folders account \n");
var copiesAndFoldersServer = null; var copiesAndFoldersServer = null;
@ -889,7 +890,7 @@ function getCurrentServerType(pageData) {
function getCurrentServerIsDeferred(pageData) { function getCurrentServerIsDeferred(pageData) {
var serverDeferred = false; var serverDeferred = false;
if (pageData.server && pageData.server.deferStorage) if (getCurrentServerType(pageData) == "pop3" && pageData.server && pageData.server.deferStorage)
serverDeferred = pageData.server.deferStorage.value; serverDeferred = pageData.server.deferStorage.value;
return serverDeferred; return serverDeferred;