Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add second parameter to nsISmtpService::FindServer for the datasource

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@69008 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
alecf%netscape.com
2000-05-10 06:44:06 +00:00
parent 0d1f53e951
commit b0b421d185
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/mailnews/compose/public/nsISmtpService.idl
View File

@@ -82,7 +82,7 @@ interface nsISmtpService : nsISupports {
* @param hostname the hostname of the server
* @returns null if no server is found
*/
nsISmtpServer findServer(in string hostname);
nsISmtpServer findServer(in string username, in string hostname);
/**
* look up the server with the given key

20
mozilla/mailnews/compose/src/nsSmtpService.cpp
View File

@@ -46,6 +46,7 @@ typedef struct _findServerByKeyEntry {
typedef struct _findServerByHostnameEntry {
const char *hostname;
const char *username;
nsISmtpServer *server;
} findServerByHostnameEntry;
@@ -836,8 +837,15 @@ nsSmtpService::findServerByHostname(nsISupports *element, void *aData)
rv = server->GetHostname(getter_Copies(hostname));
if (NS_FAILED(rv)) return PR_TRUE;
if (((const char*)hostname) &&
nsCRT::strcmp(hostname, entry->hostname) == 0) {
nsXPIDLCString username;
rv = server->GetUsername(getter_Copies(username));
if (NS_FAILED(rv)) return PR_TRUE;
PRBool checkHostname = PL_strcmp(entry->hostname, "");
PRBool checkUsername = PL_strcmp(entry->username, "");
if ((!checkHostname || (PL_strcasecmp(entry->hostname, hostname)==0)) &&
(!checkUsername || (PL_strcmp(entry->username, username)==0))) {
entry->server = server;
return PR_FALSE; // stop when found
}
@@ -845,13 +853,15 @@ nsSmtpService::findServerByHostname(nsISupports *element, void *aData)
}
NS_IMETHODIMP
nsSmtpService::FindServer(const char *hostname, nsISmtpServer ** aResult)
nsSmtpService::FindServer(const char *aUsername,
const char *aHostname, nsISmtpServer ** aResult)
{
if (!aResult) return NS_ERROR_NULL_POINTER;
NS_ENSURE_ARG_POINTER(aResult);
findServerByHostnameEntry entry;
entry.server=nsnull;
entry.hostname = hostname;
entry.hostname = aHostname;
entry.username = aUsername;
mSmtpServers->EnumerateForwards(findServerByHostname, (void *)&entry);

2
mozilla/mailnews/import/oexpress/nsOESettings.cpp
View File

@@ -528,7 +528,7 @@ void OESettings::SetSmtpServer( nsIMsgAccountManager *pMgr, nsIMsgAccount *pAcc,
if (NS_SUCCEEDED(rv) && smtpService) {
nsCOMPtr<nsISmtpServer> foundServer;
rv = smtpService->FindServer( pServer, getter_AddRefs( foundServer));
rv = smtpService->FindServer( pUser, pServer, getter_AddRefs( foundServer));
if (NS_SUCCEEDED( rv) && foundServer) {
IMPORT_LOG1( "SMTP server already exists: %s\n", pServer);
return;