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

Bug 337942 Remove some unused interface functions in address book. r/sr=bienvenu

This commit is contained in:
bugzilla%standard8.demon.co.uk 2006-05-19 18:43:14 +00:00
Родитель 1dd94f0a69
Коммит 4a8b5606f8
9 изменённых файлов: 3 добавлений и 92 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

9
mailnews/addrbook/public/nsIAbDirectory.idl
Просмотреть файл

@ -72,7 +72,7 @@ interface nsIAbDirectoryProperties : nsISupports {
attribute long position;
};
[scriptable, uuid(93d8e498-7c03-4ad0-9cd4-933d43e3724a)]
[scriptable, uuid(b81e0275-7b19-46e2-9f4a-086f1fc55080)]
interface nsIAbDirectory : nsISupports {
// Types of operation
@ -201,10 +201,6 @@ interface nsIAbDirectory : nsISupports {
// with the properties defined by list
void addMailList (in nsIAbDirectory list);
// Creates a new mailing list in the directory with
// the properties defined by list and return a db key
void addMailListWithKey (in nsIAbDirectory list, out PRUint32 key);
// Specific to a directory which is a mail list
attribute wstring listNickName;
attribute wstring description;
@ -234,9 +230,6 @@ interface nsIAbDirectory : nsISupports {
/* create a directory by passing the display name and address book uri */
void createDirectoryByURI(in wstring displayName, in string uri, in boolean migrating);
wstring getValueForCard(in nsIAbCard card, in string name);
void setValueForCard(in nsIAbCard card, in string name, in wstring value);
/**
* The id of the directory used in prefs e.g. "ldap_2.servers.pab"
* Setting this will cause directoryPrefs to be updated.

4
mailnews/addrbook/public/nsIAddrDatabase.idl
Просмотреть файл

@ -138,7 +138,7 @@ interface nsAddrDBCommitType
const long kCompressCommit = 3;
};
[scriptable, uuid(BEBB5B43-B81E-4cff-91ED-B8DAD6F7D9F5)]
[scriptable, uuid(10d20c23-4e1d-4f72-9d1b-06e09e88eb4f)]
interface nsIAddrDatabase : nsIAddrDBAnnouncer {
/**
@ -172,10 +172,8 @@ interface nsIAddrDatabase : nsIAddrDBAnnouncer {
void forceClosed();
void createNewCardAndAddToDB(in nsIAbCard newCard, in boolean aNotify);
void createNewCardAndAddToDBWithKey(in nsIAbCard newCard, in boolean aNotify, out unsigned long key);
void createNewListCardAndAddToDB(in nsIAbDirectory list, in unsigned long listRowID, in nsIAbCard newCard, in boolean aNotify);
void createMailListAndAddToDB(in nsIAbDirectory newList, in boolean aNotify);
void createMailListAndAddToDBWithKey(in nsIAbDirectory newList, in boolean aNotify, out PRUint32 key);
/**
* Enumerate the cards in the directory. The enumerator will return the

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

@ -287,9 +287,6 @@ NS_IMETHODIMP nsAbDirProperty::CreateDirectoryByURI(const PRUnichar *dirName, co
NS_IMETHODIMP nsAbDirProperty::AddMailList(nsIAbDirectory *list)
{ return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHODIMP nsAbDirProperty::AddMailListWithKey(nsIAbDirectory *list, PRUint32 *key)
{ return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHODIMP nsAbDirProperty::EditMailListToDatabase(const char *uri, nsIAbCard *listCard)
{ return NS_ERROR_NOT_IMPLEMENTED; }
@ -299,12 +296,6 @@ NS_IMETHODIMP nsAbDirProperty::AddCard(nsIAbCard *childCard, nsIAbCard **addedCa
NS_IMETHODIMP nsAbDirProperty::DropCard(nsIAbCard *childCard, PRBool needToCopyCard)
{ return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHODIMP nsAbDirProperty::GetValueForCard(nsIAbCard *card, const char *name, PRUnichar **value)
{ return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHODIMP nsAbDirProperty::SetValueForCard(nsIAbCard *card, const char *name, const PRUnichar *value)
{ return NS_ERROR_NOT_IMPLEMENTED; }
NS_IMETHODIMP nsAbDirProperty::GetSupportsMailingLists(PRBool *aSupportsMailingsLists)
{
NS_ENSURE_ARG_POINTER(aSupportsMailingsLists);

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

@ -178,34 +178,6 @@ NS_IMETHODIMP nsAbMDBDirProperty::ClearDatabase()
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP nsAbMDBDirProperty::GetValueForCard(nsIAbCard *card, const char *name, PRUnichar **value)
{
nsresult rv;
nsCOMPtr <nsIAbMDBCard> mdbcard = do_QueryInterface(card, &rv);
if (NS_FAILED(rv) || !mdbcard) {
// XXX this shouldn't happen
// but it is, after ab sync
// I think are nsAbCardProperties are getting into the nsAbView
// and later, on paint, we are asking for them.
return NS_OK;
}
rv = mdbcard->GetStringAttribute(name, value);
NS_ENSURE_SUCCESS(rv,rv);
return rv;
}
NS_IMETHODIMP nsAbMDBDirProperty::SetValueForCard(nsIAbCard *card, const char *name, const PRUnichar *value)
{
nsresult rv;
nsCOMPtr <nsIAbMDBCard> mdbcard = do_QueryInterface(card, &rv);
NS_ENSURE_SUCCESS(rv,rv);
rv = mdbcard->SetStringAttribute(name, value);
NS_ENSURE_SUCCESS(rv,rv);
return rv;
}
NS_IMETHODIMP nsAbMDBDirProperty::HasCardForEmailAddress(const char * aEmailAddress, PRBool * aCardExists)
{
return NS_ERROR_NOT_IMPLEMENTED;

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

@ -65,9 +65,6 @@ public:
NS_DECL_ISUPPORTS
NS_DECL_NSIABMDBDIRECTORY
NS_IMETHOD GetValueForCard(nsIAbCard *card, const char *name, PRUnichar **value);
NS_IMETHOD SetValueForCard(nsIAbCard *card, const char *name, const PRUnichar *value);
protected:
PRUint32 m_dbRowID;

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

@ -600,17 +600,7 @@ NS_IMETHODIMP nsAbMDBDirectory::CreateDirectoryByURI(const PRUnichar *dirName, c
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP nsAbMDBDirectory::AddMailListWithKey(nsIAbDirectory *list, PRUint32 *key)
{
return(InternalAddMailList(list, key));
}
NS_IMETHODIMP nsAbMDBDirectory::AddMailList(nsIAbDirectory *list)
{
return(InternalAddMailList(list, nsnull));
}
nsresult nsAbMDBDirectory::InternalAddMailList(nsIAbDirectory *list, PRUint32 *key)
{
if (mIsQueryURI)
return NS_ERROR_NOT_IMPLEMENTED;
@ -636,10 +626,7 @@ nsresult nsAbMDBDirectory::InternalAddMailList(nsIAbDirectory *list, PRUint32 *k
dblist = do_QueryInterface(list, &rv);
}
if (!key)
mDatabase->CreateMailListAndAddToDB(list, PR_TRUE);
else
mDatabase->CreateMailListAndAddToDBWithKey(list, PR_TRUE, key);
mDatabase->CreateMailListAndAddToDB(list, PR_TRUE);
mDatabase->Commit(nsAddrDBCommitType::kLargeCommit);
PRUint32 dbRowID;

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

@ -95,7 +95,6 @@ public:
NS_IMETHOD CreateNewDirectory(nsIAbDirectoryProperties *aProperties);
NS_IMETHOD CreateDirectoryByURI(const PRUnichar *dirName, const char *uri, PRBool migrating);
NS_IMETHOD AddMailList(nsIAbDirectory *list);
NS_IMETHOD AddMailListWithKey(nsIAbDirectory *list, PRUint32 *key);
NS_IMETHOD AddCard(nsIAbCard *card, nsIAbCard **addedCard);
NS_IMETHOD DropCard(nsIAbCard *card, PRBool needToCopyCard);
NS_IMETHOD EditMailListToDatabase(const char *uri, nsIAbCard *listCard);
@ -115,7 +114,6 @@ protected:
nsresult NotifyItemDeleted(nsISupports *item);
nsresult NotifyItemChanged(nsISupports *item);
nsresult RemoveCardFromAddressList(nsIAbCard* card);
nsresult InternalAddMailList(nsIAbDirectory *list, PRUint32 *key);
nsresult GetAbDatabase();
nsCOMPtr<nsIAddrDatabase> mDatabase;

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

@ -1535,18 +1535,6 @@ NS_IMETHODIMP nsAddrDatabase::CreateNewCardAndAddToDB(nsIAbCard *newCard, PRBool
return rv;
}
NS_IMETHODIMP nsAddrDatabase::CreateNewCardAndAddToDBWithKey(nsIAbCard *newCard, PRBool notify /* = FALSE */, PRUint32 *key)
{
nsresult err = NS_OK;
*key = 0;
err = CreateNewCardAndAddToDB(newCard, notify);
if (NS_SUCCEEDED(err))
*key = m_LastRecordKey;
return err;
}
NS_IMETHODIMP nsAddrDatabase::CreateNewListCardAndAddToDB(nsIAbDirectory *aList, PRUint32 listRowID, nsIAbCard *newCard, PRBool notify /* = FALSE */)
{
if (!newCard || !m_mdbPabTable || !m_mdbStore || !m_mdbEnv)
@ -3805,14 +3793,3 @@ nsresult nsAddrDatabase::DeleteRow(nsIMdbTable* dbTable, nsIMdbRow* dbRow)
return (err == NS_OK) ? NS_OK : NS_ERROR_FAILURE;
}
NS_IMETHODIMP nsAddrDatabase::CreateMailListAndAddToDBWithKey(nsIAbDirectory *newList, PRBool notify, PRUint32 *key)
{
NS_ENSURE_ARG_POINTER(key);
*key = 0;
nsresult rv = CreateMailListAndAddToDB(newList, notify);
if (NS_SUCCEEDED(rv))
*key = m_LastRecordKey;
return rv;
}

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

@ -84,10 +84,8 @@ public:
NS_IMETHOD ForceClosed();
NS_IMETHOD CreateNewCardAndAddToDB(nsIAbCard *newCard, PRBool notify);
NS_IMETHOD CreateNewCardAndAddToDBWithKey(nsIAbCard *newCard, PRBool notify, PRUint32 *key);
NS_IMETHOD CreateNewListCardAndAddToDB(nsIAbDirectory *list, PRUint32 listRowID, nsIAbCard *newCard, PRBool notify);
NS_IMETHOD CreateMailListAndAddToDB(nsIAbDirectory *newList, PRBool notify);
NS_IMETHOD CreateMailListAndAddToDBWithKey(nsIAbDirectory *newList, PRBool notify, PRUint32 *key);
NS_IMETHOD EnumerateCards(nsIAbDirectory *directory, nsISimpleEnumerator **result);
NS_IMETHOD GetMailingListsFromDB(nsIAbDirectory *parentDir);
NS_IMETHOD EnumerateListAddresses(nsIAbDirectory *directory, nsISimpleEnumerator **result);