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

Bug78410 Unable to send to mailing lists. r=suresh+ducarroz, sr=sspitzer

This commit is contained in:
chuang%netscape.com 2001-05-04 04:14:34 +00:00
Родитель 31e25c63b3
Коммит 9ccd8b706a
15 изменённых файлов: 53 добавлений и 85 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
mailnews/absync/src/nsAbSync.cpp
Просмотреть файл

@ -1549,7 +1549,7 @@ nsAbSync::AnalyzeTheLocalAddressBook()
// this should not be hardcoded to abook.mab // this should not be hardcoded to abook.mab
// this works for any address book...not sure why // this works for any address book...not sure why
// absync on go againt abook.mab - candice // absync on go againt abook.mab - candice
rv = rdfService->GetResource("abmdbdirectory://abook.mab", getter_AddRefs(resource)); rv = rdfService->GetResource(kPersonalAddressbookUri, getter_AddRefs(resource));
if (NS_FAILED(rv)) if (NS_FAILED(rv))
goto EarlyExit; goto EarlyExit;
@ -1808,7 +1808,7 @@ nsAbSync::DeleteCardByServerID(PRInt32 aServerID)
// this should not be hardcoded to abook.mab // this should not be hardcoded to abook.mab
// this works for any address book...not sure why // this works for any address book...not sure why
// absync on go againt abook.mab - candice // absync on go againt abook.mab - candice
rv = rdfService->GetResource("abmdbdirectory://abook.mab", getter_AddRefs(resource)); rv = rdfService->GetResource(kPersonalAddressbookUri, getter_AddRefs(resource));
if (NS_FAILED(rv)) if (NS_FAILED(rv))
goto EarlyExit; goto EarlyExit;
@ -2569,7 +2569,7 @@ nsAbSync::AddNewUsers()
// this should not be hardcoded to abook.mab // this should not be hardcoded to abook.mab
// this works for any address book...not sure why // this works for any address book...not sure why
// absync on go againt abook.mab - candice // absync on go againt abook.mab - candice
rv = rdfService->GetResource("abmdbdirectory://abook.mab", getter_AddRefs(resource)); rv = rdfService->GetResource(kPersonalAddressbookUri, getter_AddRefs(resource));
if (NS_FAILED(rv)) if (NS_FAILED(rv))
goto EarlyExit; goto EarlyExit;

6
mailnews/addrbook/src/nsAbAutoCompleteSession.cpp
Просмотреть файл

@ -34,8 +34,6 @@
#include "nsIMsgIdentity.h" #include "nsIMsgIdentity.h"
#include "nsIPref.h" #include "nsIPref.h"
/* The definition is nsAddressBook.cpp */
extern const char *kDirectoryDataSourceRoot;
static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
static NS_DEFINE_CID(kHeaderParserCID, NS_MSGHEADERPARSER_CID); static NS_DEFINE_CID(kHeaderParserCID, NS_MSGHEADERPARSER_CID);
@ -398,7 +396,7 @@ nsresult nsAbAutoCompleteSession::SearchDirectory(nsString& fileName, nsAbAutoCo
nsCOMPtr<nsIAbDirectory> directory(do_QueryInterface(resource, &rv)); nsCOMPtr<nsIAbDirectory> directory(do_QueryInterface(resource, &rv));
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
if (!fileName.EqualsWithConversion("abdirectory://")) if (!fileName.EqualsWithConversion(kAllDirectoryRoot))
rv = SearchCards(directory, searchStr, results); rv = SearchCards(directory, searchStr, results);
if (!searchSubDirectory) if (!searchSubDirectory)
@ -529,7 +527,7 @@ NS_IMETHODIMP nsAbAutoCompleteSession::OnStartLookup(const PRUnichar *uSearchStr
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))
if (NS_FAILED(SearchPreviousResults(&searchStrings, previousSearchResult, results))) if (NS_FAILED(SearchPreviousResults(&searchStrings, previousSearchResult, results)))
{ {
nsAutoString root; root.AssignWithConversion("abdirectory://"); nsAutoString root; root.AssignWithConversion(kAllDirectoryRoot);
rv = SearchDirectory(root, &searchStrings, results, PR_TRUE); rv = SearchDirectory(root, &searchStrings, results, PR_TRUE);
} }

11
mailnews/addrbook/src/nsAbBSDirectory.cpp
Просмотреть файл

@ -40,7 +40,6 @@
#include "prmem.h" #include "prmem.h"
#include "prprf.h" #include "prprf.h"
extern const char *kDirectoryDataSourceRoot;
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
@ -130,7 +129,7 @@ NS_IMETHODIMP nsAbBSDirectory::GetChildNodes(nsIEnumerator* *result)
migrator->UpgradePrefs(); migrator->UpgradePrefs();
}*/ }*/
if (!PL_strcmp(mURI, "abdirectory://") && GetDirList()) if (!PL_strcmp(mURI, kAllDirectoryRoot) && GetDirList())
{ {
PRInt32 count = GetDirList()->Count(); PRInt32 count = GetDirList()->Count();
/* check: only show personal address book for now */ /* check: only show personal address book for now */
@ -148,7 +147,7 @@ NS_IMETHODIMP nsAbBSDirectory::GetChildNodes(nsIEnumerator* *result)
continue; continue;
char* uriStr = nsnull; char* uriStr = nsnull;
uriStr = PR_smprintf("%s%s", kDirectoryDataSourceRoot, server->fileName); uriStr = PR_smprintf("%s%s", kMDBDirectoryRoot, server->fileName);
if (uriStr == nsnull) if (uriStr == nsnull)
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
@ -276,7 +275,7 @@ nsresult nsAbBSDirectory::CreateDirectoryPAB(const PRUnichar *displayName, const
DIR_AddNewAddressBook(displayName, fileName, migrating, dirType, &server); DIR_AddNewAddressBook(displayName, fileName, migrating, dirType, &server);
char *uri = PR_smprintf("%s%s",kDirectoryDataSourceRoot, server->fileName); char *uri = PR_smprintf("%s%s",kMDBDirectoryRoot, server->fileName);
nsCOMPtr<nsIAbDirectory> newDir; nsCOMPtr<nsIAbDirectory> newDir;
nsresult rv = AddDirectory(uri, getter_AddRefs(newDir)); nsresult rv = AddDirectory(uri, getter_AddRefs(newDir));
@ -303,9 +302,9 @@ NS_IMETHODIMP nsAbBSDirectory::CreateDirectoryByURI(const PRUnichar *displayName
DIR_Server * server = nsnull; DIR_Server * server = nsnull;
DirectoryType dirType = PABDirectory; DirectoryType dirType = PABDirectory;
const char* fileName = nsnull; const char* fileName = nsnull;
if (PL_strstr(uri, kDirectoryDataSourceRoot)) // for abmdbdirectory:// if (PL_strstr(uri, kMDBDirectoryRoot)) // for abmdbdirectory://
{ {
fileName = &(uri[PL_strlen(kDirectoryDataSourceRoot)]); fileName = &(uri[PL_strlen(kMDBDirectoryRoot)]);
dirType = PABDirectory; dirType = PABDirectory;
} }
DIR_AddNewAddressBook(displayName, fileName, migrating, dirType, &server); DIR_AddNewAddressBook(displayName, fileName, migrating, dirType, &server);

1
mailnews/addrbook/src/nsAbCardProperty.cpp
Просмотреть файл

@ -40,7 +40,6 @@ static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
/* The definition is nsAddrDatabase.cpp */ /* The definition is nsAddrDatabase.cpp */
extern const char *kMainPersonalAddressBook;
extern const char *kFirstNameColumn; extern const char *kFirstNameColumn;
extern const char *kLastNameColumn; extern const char *kLastNameColumn;
extern const char *kDisplayNameColumn; extern const char *kDisplayNameColumn;

10
mailnews/addrbook/src/nsAbDirectory.cpp
Просмотреть файл

@ -40,8 +40,6 @@
#include "prprf.h" #include "prprf.h"
#include "prmem.h" #include "prmem.h"
/* The definition is nsAddressBook.cpp */
extern const char *kDirectoryDataSourceRoot;
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
static NS_DEFINE_CID(kAbCardCID, NS_ABCARD_CID); static NS_DEFINE_CID(kAbCardCID, NS_ABCARD_CID);
@ -59,7 +57,7 @@ nsAbDirectory::nsAbDirectory(void)
nsAbDirectory::~nsAbDirectory(void) nsAbDirectory::~nsAbDirectory(void)
{ {
if (mURI && PL_strcmp(mURI, kDirectoryDataSourceRoot)) if (mURI && PL_strcmp(mURI, kMDBDirectoryRoot))
{ {
nsresult rv = NS_OK; nsresult rv = NS_OK;
@ -167,7 +165,7 @@ NS_IMETHODIMP nsAbDirectory::GetChildNodes(nsIEnumerator* *result)
{ {
if (!mInitialized) if (!mInitialized)
{ {
if (!PL_strcmp(mURI, kDirectoryDataSourceRoot) && GetDirList()) if (!PL_strcmp(mURI, kMDBDirectoryRoot) && GetDirList())
{ {
PRInt32 count = GetDirList()->Count(); PRInt32 count = GetDirList()->Count();
/* check: only show personal address book for now */ /* check: only show personal address book for now */
@ -283,7 +281,7 @@ NS_IMETHODIMP nsAbDirectory::GetChildCards(nsIEnumerator* *result)
{ {
if (mURI && mIsMailingList == -1) if (mURI && mIsMailingList == -1)
{ {
nsAutoString file; file.AssignWithConversion(&(mURI[PL_strlen(kDirectoryDataSourceRoot)])); nsAutoString file; file.AssignWithConversion(&(mURI[PL_strlen(kMDBDirectoryRoot)]));
PRInt32 pos = file.Find("/"); PRInt32 pos = file.Find("/");
if (pos != -1) if (pos != -1)
mIsMailingList = 1; mIsMailingList = 1;
@ -312,7 +310,7 @@ NS_IMETHODIMP nsAbDirectory::CreateNewDirectory(const PRUnichar *dirName, const
nsresult rv = DIR_AddNewAddressBook(dirName, fileName, PABDirectory, &server); nsresult rv = DIR_AddNewAddressBook(dirName, fileName, PABDirectory, &server);
nsCOMPtr<nsIAbDirectory> newDir; nsCOMPtr<nsIAbDirectory> newDir;
char *uri = PR_smprintf("%s%s", kDirectoryDataSourceRoot, server->fileName); char *uri = PR_smprintf("%s%s", kMDBDirectoryRoot, server->fileName);
if (uri) if (uri)
{ {
nsCOMPtr<nsIAddrDatabase> database; nsCOMPtr<nsIAddrDatabase> database;

9
mailnews/addrbook/src/nsAbMDBCardProperty.cpp
Просмотреть файл

@ -41,9 +41,6 @@ static NS_DEFINE_CID(kAddressBookDBCID, NS_ADDRDATABASE_CID);
static NS_DEFINE_CID(kAddrBookSessionCID, NS_ADDRBOOKSESSION_CID); static NS_DEFINE_CID(kAddrBookSessionCID, NS_ADDRBOOKSESSION_CID);
static NS_DEFINE_CID(kAddrBookCID, NS_ADDRESSBOOK_CID); static NS_DEFINE_CID(kAddrBookCID, NS_ADDRESSBOOK_CID);
/* The definition is nsAddressBook.cpp */
extern const char *kDirectoryDataSourceRoot;
extern const char *kCardDataSourceRoot;
nsAbMDBCardProperty::nsAbMDBCardProperty(void) nsAbMDBCardProperty::nsAbMDBCardProperty(void)
{ {
@ -284,9 +281,9 @@ NS_IMETHODIMP nsAbMDBCardProperty::GetCardURI(char **uri)
if (file && m_dbRowID) if (file && m_dbRowID)
{ {
if (m_bIsMailList) if (m_bIsMailList)
cardURI = PR_smprintf("%s%s/ListCard%ld", kCardDataSourceRoot, file, m_dbRowID); cardURI = PR_smprintf("%s%s/ListCard%ld", kMDBCardRoot, file, m_dbRowID);
else else
cardURI = PR_smprintf("%s%s/Card%ld", kCardDataSourceRoot, file, m_dbRowID); cardURI = PR_smprintf("%s%s/Card%ld", kMDBCardRoot, file, m_dbRowID);
} }
if (file) if (file)
nsCRT::free(file); nsCRT::free(file);
@ -517,7 +514,7 @@ nsresult nsAbMDBCardProperty::GetCardDatabase(const char *uri)
abSession->GetUserProfileDirectory(&dbPath); abSession->GetUserProfileDirectory(&dbPath);
const char* file = nsnull; const char* file = nsnull;
file = &(uri[PL_strlen(kDirectoryDataSourceRoot)]); file = &(uri[PL_strlen(kMDBDirectoryRoot)]);
(*dbPath) += file; (*dbPath) += file;
if (dbPath->Exists()) if (dbPath->Exists())

8
mailnews/addrbook/src/nsAbMDBDirectory.cpp
Просмотреть файл

@ -42,8 +42,6 @@
#include "prprf.h" #include "prprf.h"
#include "prmem.h" #include "prmem.h"
/* The definition is nsAddressBook.cpp */
extern const char *kDirectoryDataSourceRoot;
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
static NS_DEFINE_CID(kAbCardCID, NS_ABMDBCARD_CID); static NS_DEFINE_CID(kAbCardCID, NS_ABMDBCARD_CID);
@ -61,7 +59,7 @@ nsAbMDBDirectory::nsAbMDBDirectory(void)
nsAbMDBDirectory::~nsAbMDBDirectory(void) nsAbMDBDirectory::~nsAbMDBDirectory(void)
{ {
if (mURI && PL_strcmp(mURI, kDirectoryDataSourceRoot)) if (mURI && PL_strcmp(mURI, kMDBDirectoryRoot))
{ {
nsresult rv = NS_OK; nsresult rv = NS_OK;
@ -343,7 +341,7 @@ NS_IMETHODIMP nsAbMDBDirectory::GetChildCards(nsIEnumerator* *result)
{ {
if (mURI && mIsMailingList == -1) if (mURI && mIsMailingList == -1)
{ {
nsAutoString file; file.AssignWithConversion(&(mURI[PL_strlen(kDirectoryDataSourceRoot)])); nsAutoString file; file.AssignWithConversion(&(mURI[PL_strlen(kMDBDirectoryRoot)]));
PRInt32 pos = file.Find("/"); PRInt32 pos = file.Find("/");
if (pos != -1) if (pos != -1)
mIsMailingList = 1; mIsMailingList = 1;
@ -715,7 +713,7 @@ NS_IMETHODIMP nsAbMDBDirectory::DropCard(nsIAbCard* card, nsIAbCard **_retval)
if (mURI && mIsMailingList == -1) if (mURI && mIsMailingList == -1)
{ {
nsAutoString file; file.AssignWithConversion(&(mURI[PL_strlen(kDirectoryDataSourceRoot)])); nsAutoString file; file.AssignWithConversion(&(mURI[PL_strlen(kMDBDirectoryRoot)]));
PRInt32 pos = file.Find("/"); PRInt32 pos = file.Find("/");
if (pos != -1) if (pos != -1)
mIsMailingList = 1; mIsMailingList = 1;

8
mailnews/addrbook/src/nsAbMDBRDFResource.cpp
Просмотреть файл

@ -34,12 +34,6 @@ static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
static NS_DEFINE_CID(kAddressBookDBCID, NS_ADDRDATABASE_CID); static NS_DEFINE_CID(kAddressBookDBCID, NS_ADDRDATABASE_CID);
static NS_DEFINE_CID(kAddrBookSessionCID, NS_ADDRBOOKSESSION_CID); static NS_DEFINE_CID(kAddrBookSessionCID, NS_ADDRBOOKSESSION_CID);
/* The definition is nsAddressBook.cpp */
extern const char *kDirectoryDataSourceRoot;
/* The definition is nsAddrDatabase.cpp */
extern const char *kMainPersonalAddressBook;
nsAbMDBRDFResource::nsAbMDBRDFResource(void) nsAbMDBRDFResource::nsAbMDBRDFResource(void)
{ {
@ -95,7 +89,7 @@ nsresult nsAbMDBRDFResource::GetAbDatabase()
if(NS_SUCCEEDED(rv)) if(NS_SUCCEEDED(rv))
abSession->GetUserProfileDirectory(&dbPath); abSession->GetUserProfileDirectory(&dbPath);
nsAutoString file; file.AssignWithConversion(&(mURI[PL_strlen(kDirectoryDataSourceRoot)])); nsAutoString file; file.AssignWithConversion(&(mURI[PL_strlen(kMDBDirectoryRoot)]));
PRInt32 pos = file.Find("/"); PRInt32 pos = file.Find("/");
if (pos != -1) if (pos != -1)
file.Truncate(pos); file.Truncate(pos);

7
mailnews/addrbook/src/nsAbRDFResource.cpp
Просмотреть файл

@ -34,11 +34,6 @@ static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
static NS_DEFINE_CID(kAddressBookDBCID, NS_ADDRDATABASE_CID); static NS_DEFINE_CID(kAddressBookDBCID, NS_ADDRDATABASE_CID);
static NS_DEFINE_CID(kAddrBookSessionCID, NS_ADDRBOOKSESSION_CID); static NS_DEFINE_CID(kAddrBookSessionCID, NS_ADDRBOOKSESSION_CID);
/* The definition is nsAddressBook.cpp */
extern const char *kDirectoryDataSourceRoot;
/* The definition is nsAddrDatabase.cpp */
extern const char *kMainPersonalAddressBook;
nsAbRDFResource::nsAbRDFResource(void) nsAbRDFResource::nsAbRDFResource(void)
@ -95,7 +90,7 @@ nsresult nsAbRDFResource::GetAbDatabase()
if(NS_SUCCEEDED(rv)) if(NS_SUCCEEDED(rv))
abSession->GetUserProfileDirectory(&dbPath); abSession->GetUserProfileDirectory(&dbPath);
nsAutoString file; file.AssignWithConversion(&(mURI[PL_strlen(kDirectoryDataSourceRoot)])); nsAutoString file; file.AssignWithConversion(&(mURI[PL_strlen(kMDBDirectoryRoot)]));
PRInt32 pos = file.Find("/"); PRInt32 pos = file.Find("/");
if (pos != -1) if (pos != -1)
file.Truncate(pos); file.Truncate(pos);

24
mailnews/addrbook/src/nsAddrDatabase.cpp
Просмотреть файл

@ -62,12 +62,6 @@ static NS_DEFINE_CID(kCollationFactoryCID, NS_COLLATIONFACTORY_CID);
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
static NS_DEFINE_CID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); static NS_DEFINE_CID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID);
/* The definition is nsAddressBook.cpp */
extern const char *kCardDataSourceRoot;
extern const char *kDirectoryDataSourceRoot;
/* The definition is nsAddrDatabase.cpp */
extern const char *kMainPersonalAddressBook;
#define ID_PAB_TABLE 1 #define ID_PAB_TABLE 1
#define ID_ANONYMOUS_TABLE 2 #define ID_ANONYMOUS_TABLE 2
@ -763,7 +757,7 @@ NS_IMETHODIMP nsAddrDatabase::OpenAnonymousDB(nsIAddrDatabase **pCardDB)
nsFileSpec* dbPath; nsFileSpec* dbPath;
abSession->GetUserProfileDirectory(&dbPath); abSession->GetUserProfileDirectory(&dbPath);
(*dbPath) += kMainPersonalAddressBook; (*dbPath) += kPersonalAddressbook;
Open(dbPath, PR_TRUE, getter_AddRefs(database), PR_TRUE); Open(dbPath, PR_TRUE, getter_AddRefs(database), PR_TRUE);
@ -1756,7 +1750,7 @@ nsresult nsAddrDatabase::AddListCardColumnsToRow
file = m_dbName.GetLeafName(); file = m_dbName.GetLeafName();
if (file) if (file)
{ {
cardURI = PR_smprintf("%s%s/Card%ld", kCardDataSourceRoot, file, cardOid.mOid_Id); cardURI = PR_smprintf("%s%s/Card%ld", kMDBCardRoot, file, cardOid.mOid_Id);
NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &err); NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &err);
if (NS_SUCCEEDED(err) && cardURI) if (NS_SUCCEEDED(err) && cardURI)
{ {
@ -2527,7 +2521,7 @@ NS_IMETHODIMP nsAddrDatabase::EditMailList(nsIAbDirectory *mailList, PRBool noti
char* listCardURI = nsnull; char* listCardURI = nsnull;
char* file = nsnull; char* file = nsnull;
file = m_dbName.GetLeafName(); file = m_dbName.GetLeafName();
listCardURI = PR_smprintf("%s%s/ListCard%ld", kCardDataSourceRoot, file, rowOid.mOid_Id); listCardURI = PR_smprintf("%s%s/ListCard%ld", kMDBCardRoot, file, rowOid.mOid_Id);
NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &err); NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &err);
if(NS_FAILED(err)) if(NS_FAILED(err))
return err; return err;
@ -3736,9 +3730,9 @@ nsresult nsAddrDatabase::CreateCard(nsIMdbRow* cardRow, mdb_id listRowID, nsIAbC
file = m_dbName.GetLeafName(); file = m_dbName.GetLeafName();
if (listRowID > 0) if (listRowID > 0)
cardURI = PR_smprintf("%s%s/MailList%ld/Card%ld", kCardDataSourceRoot, file, listRowID, rowID); cardURI = PR_smprintf("%s%s/MailList%ld/Card%ld", kMDBCardRoot, file, listRowID, rowID);
else else
cardURI = PR_smprintf("%s%s/Card%ld", kCardDataSourceRoot, file, rowID); cardURI = PR_smprintf("%s%s/Card%ld", kMDBCardRoot, file, rowID);
nsCOMPtr<nsIAbCard> personCard; nsCOMPtr<nsIAbCard> personCard;
nsCOMPtr<nsIAbMDBDirectory> dbm_dbDirectory(do_QueryInterface(m_dbDirectory,&rv)); nsCOMPtr<nsIAbMDBDirectory> dbm_dbDirectory(do_QueryInterface(m_dbDirectory,&rv));
@ -3806,8 +3800,8 @@ nsresult nsAddrDatabase::CreateABListCard(nsIMdbRow* listRow, nsIAbCard **result
char* listURI = nsnull; char* listURI = nsnull;
char* file = nsnull; char* file = nsnull;
file = m_dbName.GetLeafName(); file = m_dbName.GetLeafName();
cardURI = PR_smprintf("%s%s/ListCard%ld", kCardDataSourceRoot, file, rowID); cardURI = PR_smprintf("%s%s/ListCard%ld", kMDBCardRoot, file, rowID);
listURI = PR_smprintf("%s%s/MailList%ld", kDirectoryDataSourceRoot, file, rowID); listURI = PR_smprintf("%s%s/MailList%ld", kMDBDirectoryRoot, file, rowID);
nsCOMPtr<nsIAbCard> personCard; nsCOMPtr<nsIAbCard> personCard;
nsCOMPtr<nsIAbMDBDirectory> dbm_dbDirectory(do_QueryInterface(m_dbDirectory, &rv)); nsCOMPtr<nsIAbMDBDirectory> dbm_dbDirectory(do_QueryInterface(m_dbDirectory, &rv));
@ -3868,7 +3862,7 @@ nsresult nsAddrDatabase::CreateABList(nsIMdbRow* listRow, nsIAbDirectory **resul
char* file = nsnull; char* file = nsnull;
file = m_dbName.GetLeafName(); file = m_dbName.GetLeafName();
listURI = PR_smprintf("%s%s/MailList%ld", kDirectoryDataSourceRoot, file, rowID); listURI = PR_smprintf("%s%s/MailList%ld", kMDBDirectoryRoot, file, rowID);
nsCOMPtr<nsIAbDirectory> mailList; nsCOMPtr<nsIAbDirectory> mailList;
nsCOMPtr<nsIAbMDBDirectory> dbm_dbDirectory(do_QueryInterface(m_dbDirectory, &rv)); nsCOMPtr<nsIAbMDBDirectory> dbm_dbDirectory(do_QueryInterface(m_dbDirectory, &rv));
@ -4048,7 +4042,7 @@ NS_IMETHODIMP nsAddrDatabase::AddListDirNode(nsIMdbRow * listRow)
nsCOMPtr<nsIRDFResource> parentResource; nsCOMPtr<nsIRDFResource> parentResource;
char* file = m_dbName.GetLeafName(); char* file = m_dbName.GetLeafName();
char *parentUri = PR_smprintf("%s%s", kDirectoryDataSourceRoot, file); char *parentUri = PR_smprintf("%s%s", kMDBDirectoryRoot, file);
rv = rdfService->GetResource( parentUri, getter_AddRefs(parentResource)); rv = rdfService->GetResource( parentUri, getter_AddRefs(parentResource));
nsCOMPtr<nsIAbDirectory> parentDir; nsCOMPtr<nsIAbDirectory> parentDir;
rv = proxyMgr->GetProxyForObject( NS_UI_THREAD_EVENTQ, NS_GET_IID( nsIAbDirectory), rv = proxyMgr->GetProxyForObject( NS_UI_THREAD_EVENTQ, NS_GET_IID( nsIAbDirectory),

13
mailnews/addrbook/src/nsAddressBook.cpp
Просмотреть файл

@ -63,11 +63,6 @@ static NS_DEFINE_CID(kAddrBookSessionCID, NS_ADDRBOOKSESSION_CID);
static NS_DEFINE_CID(kAbCardPropertyCID, NS_ABCARDPROPERTY_CID); static NS_DEFINE_CID(kAbCardPropertyCID, NS_ABCARDPROPERTY_CID);
static NS_DEFINE_CID(kAB4xUpgraderServiceCID, NS_AB4xUPGRADER_CID); static NS_DEFINE_CID(kAB4xUpgraderServiceCID, NS_AB4xUPGRADER_CID);
const char *kDirectoryDataSourceRoot = kDirectoryRoot;
const char *kCardDataSourceRoot = kCardRoot;
//use this for creating new address book or directory
static const char *kBSDDirectoryRoot = "abdirectory://";
static nsresult ConvertDOMListToResourceArray(nsIDOMNodeList *nodeList, nsISupportsArray **resourceArray) static nsresult ConvertDOMListToResourceArray(nsIDOMNodeList *nodeList, nsISupportsArray **resourceArray)
{ {
@ -172,7 +167,7 @@ NS_IMETHODIMP nsAddressBook::NewAddressBook
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIRDFResource> parentResource; nsCOMPtr<nsIRDFResource> parentResource;
char *parentUri = PR_smprintf("%s", kBSDDirectoryRoot); char *parentUri = PR_smprintf("%s", kAllDirectoryRoot);
rv = rdfService->GetResource(parentUri, getter_AddRefs(parentResource)); rv = rdfService->GetResource(parentUri, getter_AddRefs(parentResource));
if (parentUri) if (parentUri)
PR_smprintf_free(parentUri); PR_smprintf_free(parentUri);
@ -305,7 +300,7 @@ NS_IMETHODIMP nsAddressBook::GetAbDatabaseFromURI(const char *uri, nsIAddrDataba
if(NS_SUCCEEDED(rv)) if(NS_SUCCEEDED(rv))
abSession->GetUserProfileDirectory(&dbPath); abSession->GetUserProfileDirectory(&dbPath);
nsAutoString file; file.AssignWithConversion(&(uri[PL_strlen(kDirectoryDataSourceRoot)])); nsAutoString file; file.AssignWithConversion(&(uri[PL_strlen(kMDBDirectoryRoot)]));
PRInt32 pos = file.Find("/"); PRInt32 pos = file.Find("/");
if (pos != -1) if (pos != -1)
file.Truncate(pos); file.Truncate(pos);
@ -507,7 +502,7 @@ nsresult AddressBookParser::ParseFile()
i++; i++;
} }
if (leafName) if (leafName)
mDbUri = PR_smprintf("%s%s.mab", kDirectoryDataSourceRoot, leafName); mDbUri = PR_smprintf("%s%s.mab", kMDBDirectoryRoot, leafName);
} }
// to do: we should use only one "return rv;" at the very end, instead of this // to do: we should use only one "return rv;" at the very end, instead of this
@ -535,7 +530,7 @@ nsresult AddressBookParser::ParseFile()
NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &rv); NS_WITH_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, &rv);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIRDFResource> parentResource; nsCOMPtr<nsIRDFResource> parentResource;
char *parentUri = PR_smprintf("%s", kBSDDirectoryRoot); char *parentUri = PR_smprintf("%s", kAllDirectoryRoot);
rv = rdfService->GetResource(parentUri, getter_AddRefs(parentResource)); rv = rdfService->GetResource(parentUri, getter_AddRefs(parentResource));
nsCOMPtr<nsIAbDirectory> parentDir = do_QueryInterface(parentResource); nsCOMPtr<nsIAbDirectory> parentDir = do_QueryInterface(parentResource);
if (!parentDir) if (!parentDir)

9
mailnews/addrbook/src/nsDirPrefs.cpp
Просмотреть файл

@ -53,7 +53,6 @@ static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CI
file operation routines */ file operation routines */
#define ABFileName_kPreviousSuffix ".na2" /* final v2 address book format */ #define ABFileName_kPreviousSuffix ".na2" /* final v2 address book format */
const char *kMainPersonalAddressBook = kPersonalAddressbook; /* v3 main personal address book file */
const char *kMainLdapAddressBook = "ldap.mab"; /* v3 main ldap address book file */ const char *kMainLdapAddressBook = "ldap.mab"; /* v3 main ldap address book file */
#define ABFileName_kCurrentSuffix ".mab" /* v3 address book extension */ #define ABFileName_kCurrentSuffix ".mab" /* v3 address book extension */
@ -380,7 +379,7 @@ static nsresult dir_ConvertToMabFileName()
DIR_SavePrefsForOneServer(newServer); DIR_SavePrefsForOneServer(newServer);
PR_FREEIF (server->fileName); PR_FREEIF (server->fileName);
server->fileName = PL_strdup(kMainPersonalAddressBook); server->fileName = PL_strdup(kPersonalAddressbook);
DIR_SavePrefsForOneServer(server); DIR_SavePrefsForOneServer(server);
} }
} }
@ -469,7 +468,7 @@ nsresult DIR_AddNewAddressBook(const PRUnichar *dirName, const char *fileName, P
if (fileName) if (fileName)
server->fileName = PL_strdup(fileName); server->fileName = PL_strdup(fileName);
else else
DIR_SetFileName(&server->fileName, kMainPersonalAddressBook); DIR_SetFileName(&server->fileName, kPersonalAddressbook);
dir_ServerList->AppendElement(server); dir_ServerList->AppendElement(server);
if (!migrating) { if (!migrating) {
@ -2875,7 +2874,7 @@ void DIR_SetServerFileName(DIR_Server *server, const char* leafName)
/* set default personal address book file name*/ /* set default personal address book file name*/
if (server->position == 1) if (server->position == 1)
server->fileName = PL_strdup(kMainPersonalAddressBook); server->fileName = PL_strdup(kPersonalAddressbook);
else else
{ {
/* now use the pref name as the file name since we know the pref name /* now use the pref name as the file name since we know the pref name
@ -2901,7 +2900,7 @@ void DIR_SetServerFileName(DIR_Server *server, const char* leafName)
if (server->dirType == LDAPDirectory) if (server->dirType == LDAPDirectory)
DIR_SetFileName(&(server->fileName), kMainLdapAddressBook); /* generates file name with an ldap prefix */ DIR_SetFileName(&(server->fileName), kMainLdapAddressBook); /* generates file name with an ldap prefix */
else else
DIR_SetFileName(&(server->fileName), kMainPersonalAddressBook); DIR_SetFileName(&(server->fileName), kPersonalAddressbook);
} }
} }
} }

17
mailnews/addrbook/src/nsDirPrefs.h
Просмотреть файл

@ -37,12 +37,17 @@ PRInt32 INTL_ConvertFromUnicode(const PRUnichar* uniBuffer,
#define PREF_LDAP_VERSION_NAME "ldap_2.version" #define PREF_LDAP_VERSION_NAME "ldap_2.version"
#define PREF_LDAP_SERVER_TREE_NAME "ldap_2.servers" #define PREF_LDAP_SERVER_TREE_NAME "ldap_2.servers"
#define kCardRoot "abmdbcard://" /* RDF roor for all types of address books */
#define kDirectoryRoot "abmdbdirectory://" /* use this to get all directories, create new directory*/
#define kPersonalAddressbook "abook.mab" #define kAllDirectoryRoot "abdirectory://"
#define kPersonalAddressbookUri "abmdbdirectory://abook.mab"
#define kCollectedAddressbook "history.mab" #define kMDBCardRoot "abmdbcard://"
#define kCollectedAddressbookUri "abmdbdirectory://history.mab" #define kMDBDirectoryRoot "abmdbdirectory://"
#define kPersonalAddressbook "abook.mab"
#define kPersonalAddressbookUri "abmdbdirectory://abook.mab"
#define kCollectedAddressbook "history.mab"
#define kCollectedAddressbookUri "abmdbdirectory://history.mab"
/* DIR_Server.dirType */ /* DIR_Server.dirType */
typedef enum typedef enum

4
mailnews/compose/src/nsMsgCompose.cpp
Просмотреть файл

@ -2594,7 +2594,7 @@ static nsresult OpenAddressBook(const char * dbUri, nsIAddrDatabase** aDatabase,
nsresult nsMsgCompose::GetABDirectories(const char * dirUri, nsISupportsArray* directoriesArray, PRBool searchSubDirectory) nsresult nsMsgCompose::GetABDirectories(const char * dirUri, nsISupportsArray* directoriesArray, PRBool searchSubDirectory)
{ {
static PRBool collectedAddressbookFound; static PRBool collectedAddressbookFound;
if (nsCRT::strcmp(dirUri, kDirectoryRoot) == 0) if (nsCRT::strcmp(dirUri, kMDBDirectoryRoot) == 0)
collectedAddressbookFound = PR_FALSE; collectedAddressbookFound = PR_FALSE;
nsresult rv = NS_OK; nsresult rv = NS_OK;
@ -2833,7 +2833,7 @@ NS_IMETHODIMP nsMsgCompose::CheckAndPopulateRecipients(PRBool populateMailList,
if (NS_SUCCEEDED(rv) && addrbookDirArray) if (NS_SUCCEEDED(rv) && addrbookDirArray)
{ {
nsString dirPath; nsString dirPath;
GetABDirectories(kDirectoryRoot, addrbookDirArray, PR_TRUE); GetABDirectories(kAllDirectoryRoot, addrbookDirArray, PR_TRUE);
PRUint32 nbrRecipients; PRUint32 nbrRecipients;
PRUint32 nbrAddressbook; PRUint32 nbrAddressbook;

5
mailnews/import/src/nsImportAddressBooks.cpp
Просмотреть файл

@ -62,9 +62,6 @@ static NS_DEFINE_CID(kSupportsWStringCID, NS_SUPPORTS_WSTRING_CID);
static NS_DEFINE_CID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); static NS_DEFINE_CID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID);
static const char *kDirectoryDataSourceRoot = "abdirectory://";
// static const char *kCardDataSourceRoot = "abcard://";
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
PR_STATIC_CALLBACK( void) ImportAddressThread( void *stuff); PR_STATIC_CALLBACK( void) ImportAddressThread( void *stuff);
@ -809,7 +806,7 @@ nsIAddrDatabase *GetAddressBook( const PRUnichar *name, PRBool makeNew)
NS_WITH_PROXIED_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, NS_UI_THREAD_EVENTQ, &rv); NS_WITH_PROXIED_SERVICE(nsIRDFService, rdfService, kRDFServiceCID, NS_UI_THREAD_EVENTQ, &rv);
if (NS_SUCCEEDED(rv)) { if (NS_SUCCEEDED(rv)) {
nsCOMPtr<nsIRDFResource> parentResource; nsCOMPtr<nsIRDFResource> parentResource;
char *parentUri = PR_smprintf( "%s", kDirectoryDataSourceRoot); char *parentUri = PR_smprintf( "%s", kAllDirectoryRoot);
rv = rdfService->GetResource( parentUri, getter_AddRefs(parentResource)); rv = rdfService->GetResource( parentUri, getter_AddRefs(parentResource));
nsCOMPtr<nsIAbDirectory> parentDir; nsCOMPtr<nsIAbDirectory> parentDir;
rv = proxyMgr->GetProxyForObject( NS_UI_THREAD_EVENTQ, NS_GET_IID( nsIAbDirectory), rv = proxyMgr->GetProxyForObject( NS_UI_THREAD_EVENTQ, NS_GET_IID( nsIAbDirectory),