From 9e2b3dc4f2107e184e21cff9f4a71b00f7eb63a9 Mon Sep 17 00:00:00 2001 From: "bienvenu%nventure.com" Date: Tue, 8 Feb 2005 18:26:09 +0000 Subject: [PATCH] fix regression downloading pop3 mail on startup introduced by fixing js warning, 270343, sr=mscott --- mail/base/content/mailWindowOverlay.js | 25 ++++++------------- .../resources/content/mailWindowOverlay.js | 19 ++++---------- 2 files changed, 13 insertions(+), 31 deletions(-) diff --git a/mail/base/content/mailWindowOverlay.js b/mail/base/content/mailWindowOverlay.js index 3e258fad9d1..fff918024ab 100644 --- a/mail/base/content/mailWindowOverlay.js +++ b/mail/base/content/mailWindowOverlay.js @@ -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++) diff --git a/mailnews/base/resources/content/mailWindowOverlay.js b/mailnews/base/resources/content/mailWindowOverlay.js index 695013230e6..ecd0d6d1928 100644 --- a/mailnews/base/resources/content/mailWindowOverlay.js +++ b/mailnews/base/resources/content/mailWindowOverlay.js @@ -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)