mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fix for #82019. fix it so importing eudora settings will do the right thing if the user didn't set a return address in eudora. r=cavin, sr=bienvenu, a=asa

This commit is contained in:
sspitzer%netscape.com 2001-05-26 06:02:34 +00:00
Родитель 653062f1b6
Коммит b31117c76d
2 изменённых файлов: 27 добавлений и 17 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

42
mailnews/import/eudora/src/nsEudoraMac.cpp
Просмотреть файл

@ -729,7 +729,7 @@ PRBool nsEudoraMac::BuildPOPAccount( nsIMsgAccountManager *accMgr, nsCString **p
pop3Server->SetLeaveMessagesOnServer(*pStrs[kLeaveOnServerStr][0] == 'Y' ? PR_TRUE : PR_FALSE);
// Fiddle with the identities
SetIdentities( accMgr, account, pStrs);
SetIdentities(accMgr, account, *(pStrs[kPopAccountNameStr]), *(pStrs[kPopServerStr]), pStrs);
result = PR_TRUE;
if (ppAccount)
account->QueryInterface( NS_GET_IID(nsIMsgAccount), (void **)ppAccount);
@ -779,7 +779,7 @@ PRBool nsEudoraMac::BuildIMAPAccount( nsIMsgAccountManager *accMgr, nsCString **
IMPORT_LOG0( "Created an account and set the IMAP server as the incoming server\n");
// Fiddle with the identities
SetIdentities( accMgr, account, pStrs);
SetIdentities(accMgr, account, *(pStrs[kPopAccountNameStr]), *(pStrs[kPopServerStr]), pStrs);
result = PR_TRUE;
if (ppAccount)
account->QueryInterface( NS_GET_IID(nsIMsgAccount), (void **)ppAccount);
@ -793,24 +793,34 @@ PRBool nsEudoraMac::BuildIMAPAccount( nsIMsgAccountManager *accMgr, nsCString **
}
void nsEudoraMac::SetIdentities( nsIMsgAccountManager *accMgr, nsIMsgAccount *acc, nsCString **pStrs)
void nsEudoraMac::SetIdentities(nsIMsgAccountManager *accMgr, nsIMsgAccount *acc, const char *userName, const char *serverName, nsCString **pStrs)
{
nsresult rv;
if (pStrs[kReturnAddressStr]->Length() && pStrs[kFullNameStr]->Length() && pStrs[kSmtpServerStr]->Length()) {
nsCOMPtr<nsIMsgIdentity> id;
rv = accMgr->CreateIdentity( getter_AddRefs( id));
if (id) {
nsString fullName; fullName.AssignWithConversion(*(pStrs[kFullNameStr]));
id->SetFullName( fullName.GetUnicode());
id->SetIdentityName( fullName.GetUnicode());
id->SetEmail( *(pStrs[kReturnAddressStr]));
acc->AddIdentity( id);
IMPORT_LOG0( "Created identity and added to the account\n");
IMPORT_LOG1( "\tname: %s\n", (const char *)(*(pStrs[kFullNameStr])));
IMPORT_LOG1( "\temail: %s\n", (const char *)(*(pStrs[kReturnAddressStr])));
nsCOMPtr<nsIMsgIdentity> id;
rv = accMgr->CreateIdentity( getter_AddRefs( id));
if (id) {
nsAutoString fullName;
if (pStrs[kFullNameStr]->Length()) {
fullName.AssignWithConversion(*(pStrs[kFullNameStr]));
}
id->SetFullName( fullName.GetUnicode());
id->SetIdentityName( fullName.GetUnicode());
if (pStrs[kReturnAddressStr]->Length()) {
id->SetEmail( *(pStrs[kReturnAddressStr]));
}
else {
nsCAutoString emailAddress;
emailAddress = userName;
emailAddress += "@";
emailAddress += serverName;
id->SetEmail(emailAddress.get());
}
acc->AddIdentity( id);
IMPORT_LOG0( "Created identity and added to the account\n");
IMPORT_LOG1( "\tname: %s\n", (const char *)(*(pStrs[kFullNameStr])));
IMPORT_LOG1( "\temail: %s\n", (const char *)(*(pStrs[kReturnAddressStr])));
}
SetSmtpServer( accMgr, acc, *(pStrs[kSmtpServerStr]), nsnull);

2
mailnews/import/eudora/src/nsEudoraMac.h
Просмотреть файл

@ -74,7 +74,7 @@ private:
// Settings support
static PRBool BuildPOPAccount( nsIMsgAccountManager *accMgr, nsCString **pStrs, nsIMsgAccount **ppAccount, nsString& accName);
static PRBool BuildIMAPAccount( nsIMsgAccountManager *accMgr, nsCString **pStrs, nsIMsgAccount **ppAccount, nsString& accName);
static void SetIdentities( nsIMsgAccountManager *accMgr, nsIMsgAccount *acc, nsCString **pStrs);
static void SetIdentities( nsIMsgAccountManager *accMgr, nsIMsgAccount *acc, const char *userName, const char *serverName, nsCString **pStrs);
static void SetSmtpServer( nsIMsgAccountManager *pMgr, nsIMsgAccount *pAcc, const char *pServer, const char *pUser);
static PRBool GetSettingsFromResource( nsIFileSpec *pSettings, short resId, nsCString **pStrs, PRBool *pIMAP);