зеркало из https://github.com/mozilla/gecko-dev.git
Bug #270743 --> First launch account creation doesn't honor unchecking [ ] Download messages now option
Port some seamonkey changes to thunderbird to fix this issue. Patch by Henrik Skupin <hskupin@gmail.com>
This commit is contained in:
Родитель
f889a99cbb
Коммит
691194fe1d
|
@ -758,14 +758,22 @@ function MsgGetMessagesForAllServers(defaultServer)
|
||||||
var protocolinfo = Components.classes["@mozilla.org/messenger/protocol/info;1?type=" + currentServer.type].getService(Components.interfaces.nsIMsgProtocolInfo);
|
var protocolinfo = Components.classes["@mozilla.org/messenger/protocol/info;1?type=" + currentServer.type].getService(Components.interfaces.nsIMsgProtocolInfo);
|
||||||
if (protocolinfo.canLoginAtStartUp && currentServer.loginAtStartUp)
|
if (protocolinfo.canLoginAtStartUp && currentServer.loginAtStartUp)
|
||||||
{
|
{
|
||||||
if (currentServer.type == "pop3" && currentServer.downloadOnBiff)
|
if (defaultServer && defaultServer.equals(currentServer) &&
|
||||||
{
|
!defaultServer.isDeferredTo &&
|
||||||
CoalesceGetMsgsForPop3ServersByDestFolder(currentServer, pop3DownloadServersArray, localFoldersToDownloadTo);
|
defaultServer.rootFolder == defaultServer.rootMsgFolder)
|
||||||
pop3Server = currentServer.QueryInterface(Components.interfaces.nsIPop3IncomingServer);
|
{
|
||||||
}
|
dump(currentServer.serverURI + "...skipping, already opened\n");
|
||||||
else
|
}
|
||||||
// Check to see if there are new messages on the server
|
else if (currentServer.type == "pop3" && currentServer.downloadOnBiff)
|
||||||
currentServer.PerformBiff(msgWindow);
|
{
|
||||||
|
CoalesceGetMsgsForPop3ServersByDestFolder(currentServer, pop3DownloadServersArray, localFoldersToDownloadTo);
|
||||||
|
pop3Server = currentServer.QueryInterface(Components.interfaces.nsIPop3IncomingServer);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// Check to see if there are new messages on the server
|
||||||
|
currentServer.PerformBiff(msgWindow);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (var i = 0; i < pop3DownloadServersArray.length; i++)
|
for (var i = 0; i < pop3DownloadServersArray.length; i++)
|
||||||
|
|
|
@ -942,7 +942,7 @@ function loadStartFolder(initialUri)
|
||||||
// or the case where initialUri is non-null (non-startup)
|
// or the case where initialUri is non-null (non-startup)
|
||||||
if (!initialUri && isLoginAtStartUpEnabled && gLoadStartFolder
|
if (!initialUri && isLoginAtStartUpEnabled && gLoadStartFolder
|
||||||
&& !defaultServer.isDeferredTo &&
|
&& !defaultServer.isDeferredTo &&
|
||||||
defaultServer.msgFolder == defaultServer.rootMsgFolder)
|
defaultServer.rootFolder == defaultServer.rootMsgFolder)
|
||||||
defaultServer.PerformBiff(msgWindow);
|
defaultServer.PerformBiff(msgWindow);
|
||||||
|
|
||||||
SelectFolder(startFolder.URI);
|
SelectFolder(startFolder.URI);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче