fix a minor leak and convert nsIMsgIncomingServer to a nsCOMPtr

git-svn-id: svn://10.0.0.236/trunk@44178 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alecf%netscape.com
1999-08-24 00:31:33 +00:00
parent 9d9481b9d6
commit 0a1b65a323

View File

@@ -15,6 +15,7 @@
* Copyright (C) 1998 Netscape Communications Corporation. All Rights
* Reserved.
*/
#include "nsXPIDLString.h"
#include "nsMsgCopy.h"
#include "nsIPref.h"
#include "nsIMsgCopyService.h"
@@ -413,35 +414,28 @@ MessageFolderIsLocal(nsIMsgIdentity *userIdentity,
const char *aFolderURI)
{
nsresult rv;
char *aType = nsnull;
nsXPIDLCString aType;
nsCOMPtr<nsIMsgFolder> dstFolder = nsnull;
nsIMsgIncomingServer *dstServer = nsnull;
nsCOMPtr<nsIMsgIncomingServer> dstServer = nsnull;
dstFolder = LocateMessageFolder(userIdentity, aFolderType, aFolderURI);
if (!dstFolder)
return PR_TRUE;
rv = dstFolder->GetServer(&dstServer);
if (NS_FAILED(rv) || !dstServer)
rv = dstFolder->GetServer(getter_AddRefs(dstServer));
if (NS_FAILED(rv))
return PR_TRUE;
rv = dstServer->GetType(&aType);
rv = dstServer->GetType(getter_Copies(aType));
if (NS_FAILED(rv) || !aType)
{
NS_IF_RELEASE(dstServer);
return PR_TRUE;
}
if ((aType) && (*aType))
{
if (PL_strcasecmp(aType, "POP3") == 0)
{
NS_IF_RELEASE(dstServer);
return PR_TRUE;
}
}
NS_IF_RELEASE(dstServer);
return PR_FALSE;
}