зеркало из https://github.com/mozilla/gecko-dev.git
96921 r=suresh sr=mscott. fix mlk of nsSupportsArray elements because they were
being addref'ed twice.
This commit is contained in:
Родитель
a0c586aa4f
Коммит
892139d126
|
@ -1364,7 +1364,7 @@ nsMsgDBFolder::AutoCompact(nsIMsgWindow *aWindow)
|
|||
PRInt32 offlineSupportLevel;
|
||||
if ( numServers > 0 )
|
||||
{
|
||||
nsCOMPtr <nsISupports> serverSupports = allServers->ElementAt(serverIndex);
|
||||
nsCOMPtr <nsISupports> serverSupports = getter_AddRefs(allServers->ElementAt(serverIndex));
|
||||
nsCOMPtr<nsIMsgIncomingServer> server = do_QueryInterface(serverSupports);
|
||||
NS_ENSURE_SUCCESS(rv,rv);
|
||||
nsCOMPtr<nsISupportsArray> folderArray;
|
||||
|
@ -1423,7 +1423,7 @@ nsMsgDBFolder::AutoCompact(nsIMsgWindow *aWindow)
|
|||
}
|
||||
}
|
||||
}
|
||||
serverSupports = allServers->ElementAt(++serverIndex);
|
||||
serverSupports = getter_AddRefs(allServers->ElementAt(++serverIndex));
|
||||
server = do_QueryInterface(serverSupports, &rv);
|
||||
}
|
||||
while (serverIndex < numServers);
|
||||
|
@ -1555,7 +1555,7 @@ nsMsgDBFolder::ChangeFilterDestination(nsIMsgFolder *newFolder, PRBool caseInsen
|
|||
rv = allServers->Count(&numServers);
|
||||
for (PRUint32 serverIndex=0; serverIndex < numServers; serverIndex++)
|
||||
{
|
||||
nsCOMPtr <nsISupports> serverSupports = allServers->ElementAt(serverIndex);
|
||||
nsCOMPtr <nsISupports> serverSupports = getter_AddRefs(allServers->ElementAt(serverIndex));
|
||||
nsCOMPtr <nsIMsgIncomingServer> server = do_QueryInterface(serverSupports, &rv);
|
||||
if (server && NS_SUCCEEDED(rv))
|
||||
{
|
||||
|
|
|
@ -469,7 +469,7 @@ LocateMessageFolder(nsIMsgIdentity *userIdentity,
|
|||
// Now that we have the server...we need to get the named message folder
|
||||
nsCOMPtr<nsIMsgIncomingServer> inServer;
|
||||
nsCOMPtr<nsISupports>ptr;
|
||||
ptr = retval->ElementAt(i);
|
||||
ptr = getter_AddRefs(retval->ElementAt(i));
|
||||
|
||||
inServer = do_QueryInterface(ptr, &rv);
|
||||
if(NS_FAILED(rv) || (!inServer))
|
||||
|
|
|
@ -1569,14 +1569,13 @@ nsMsgComposeAndSend::ProcessMultipartRelated(PRInt32 *aMailboxCount, PRInt32 *aN
|
|||
// to process this element.
|
||||
//
|
||||
nsCOMPtr<nsIDOMNode> node;
|
||||
nsISupports *isupp = aNodeList->ElementAt(locCount);
|
||||
nsCOMPtr <nsISupports> isupp = getter_AddRefs(aNodeList->ElementAt(locCount));
|
||||
|
||||
if (!isupp) {
|
||||
return NS_ERROR_MIME_MPART_ATTACHMENT_ERROR;
|
||||
}
|
||||
|
||||
node = do_QueryInterface(isupp);
|
||||
NS_IF_RELEASE(isupp); // make sure we cleanup
|
||||
if (!node) {
|
||||
return NS_ERROR_MIME_MPART_ATTACHMENT_ERROR;
|
||||
}
|
||||
|
|
|
@ -123,11 +123,10 @@ nsresult nsImapOfflineSync::AdvanceToNextServer()
|
|||
|
||||
while (serverIndex < numServers)
|
||||
{
|
||||
nsISupports* serverSupports = m_allServers->ElementAt(serverIndex);
|
||||
nsCOMPtr <nsISupports> serverSupports = getter_AddRefs(m_allServers->ElementAt(serverIndex));
|
||||
serverIndex++;
|
||||
|
||||
nsCOMPtr<nsIMsgIncomingServer> server = do_QueryInterface(serverSupports);
|
||||
NS_RELEASE(serverSupports);
|
||||
nsCOMPtr <nsINntpIncomingServer> newsServer = do_QueryInterface(server);
|
||||
if (newsServer) // news servers aren't involved in offline imap
|
||||
continue;
|
||||
|
|
|
@ -395,11 +395,10 @@ nsresult nsMsgDownloadAllNewsgroups::AdvanceToNextServer(PRBool *done)
|
|||
|
||||
while (serverIndex < numServers)
|
||||
{
|
||||
nsISupports* serverSupports = m_allServers->ElementAt(serverIndex);
|
||||
nsCOMPtr <nsISupports> serverSupports = getter_AddRefs(m_allServers->ElementAt(serverIndex));
|
||||
serverIndex++;
|
||||
|
||||
nsCOMPtr<nsIMsgIncomingServer> server = do_QueryInterface(serverSupports);
|
||||
NS_RELEASE(serverSupports);
|
||||
nsCOMPtr <nsINntpIncomingServer> newsServer = do_QueryInterface(server);
|
||||
if (!newsServer) // we're only looking for news servers
|
||||
continue;
|
||||
|
|
Загрузка…
Ссылка в новой задаче