зеркало из https://github.com/mozilla/pjs.git
fix regression downloading pop3 mail on startup introduced by fixing js warning, 270343, sr=mscott
This commit is contained in:
Родитель
d4eb3b2655
Коммит
9e2b3dc4f2
|
@ -777,23 +777,14 @@ function MsgGetMessagesForAllServers(defaultServer)
|
|||
var protocolinfo = Components.classes["@mozilla.org/messenger/protocol/info;1?type=" + currentServer.type].getService(Components.interfaces.nsIMsgProtocolInfo);
|
||||
if (protocolinfo.canLoginAtStartUp && currentServer.loginAtStartUp)
|
||||
{
|
||||
if (defaultServer && defaultServer.equals(currentServer) &&
|
||||
!defaultServer.isDeferredTo &&
|
||||
defaultServer.rootFolder == defaultServer.rootMsgFolder)
|
||||
{
|
||||
dump(currentServer.serverURI + "...skipping, already opened\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
if (currentServer.type == "pop3" && currentServer.downloadOnBiff)
|
||||
{
|
||||
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);
|
||||
}
|
||||
if (currentServer.type == "pop3" && currentServer.downloadOnBiff)
|
||||
{
|
||||
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++)
|
||||
|
|
|
@ -746,23 +746,14 @@ function MsgGetMessagesForAllServers(defaultServer)
|
|||
var protocolinfo = Components.classes["@mozilla.org/messenger/protocol/info;1?type=" + currentServer.type].getService(Components.interfaces.nsIMsgProtocolInfo);
|
||||
if (protocolinfo.canLoginAtStartUp && currentServer.loginAtStartUp)
|
||||
{
|
||||
if (defaultServer && defaultServer.equals(currentServer) &&
|
||||
!defaultServer.isDeferredTo &&
|
||||
defaultServer.rootFolder == defaultServer.rootMsgFolder)
|
||||
if (currentServer.type == "pop3" && currentServer.downloadOnBiff)
|
||||
{
|
||||
dump(currentServer.serverURI + "...skipping, already opened\n");
|
||||
CoalesceGetMsgsForPop3ServersByDestFolder(currentServer, pop3DownloadServersArray, localFoldersToDownloadTo);
|
||||
pop3Server = currentServer.QueryInterface(Components.interfaces.nsIPop3IncomingServer);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (currentServer.type == "pop3" && currentServer.downloadOnBiff)
|
||||
{
|
||||
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);
|
||||
}
|
||||
// Check to see if there are new messages on the server
|
||||
currentServer.PerformBiff(msgWindow);
|
||||
}
|
||||
}
|
||||
for (i = 0; i < pop3DownloadServersArray.length; ++i)
|
||||
|
|
Загрузка…
Ссылка в новой задаче