diff --git a/mozilla/mailnews/addrbook/public/nsIAbCard.idl b/mozilla/mailnews/addrbook/public/nsIAbCard.idl index 5d68174e35a..1d0ec359345 100644 --- a/mozilla/mailnews/addrbook/public/nsIAbCard.idl +++ b/mozilla/mailnews/addrbook/public/nsIAbCard.idl @@ -33,69 +33,69 @@ interface nsIAddrDatabase; [scriptable, uuid(FA5C977F-04C8-11d3-A2EB-001083003D0C)] interface nsIAbCard : nsISupports { - attribute wstring FirstName; - attribute wstring LastName; - attribute wstring DisplayName; - attribute wstring NickName; - attribute wstring PrimaryEmail; - attribute wstring SecondEmail; - attribute wstring WorkPhone; - attribute wstring HomePhone; - attribute wstring FaxNumber; - attribute wstring PagerNumber; - attribute wstring CellularNumber; - attribute wstring HomeAddress; - attribute wstring HomeAddress2; - attribute wstring HomeCity; - attribute wstring HomeState; - attribute wstring HomeZipCode; - attribute wstring HomeCountry; - attribute wstring WorkAddress; - attribute wstring WorkAddress2; - attribute wstring WorkCity; - attribute wstring WorkState; - attribute wstring WorkZipCode; - attribute wstring WorkCountry; - attribute wstring JobTitle; - attribute wstring Department; - attribute wstring Company; - attribute wstring WebPage1; - attribute wstring WebPage2; - attribute wstring BirthYear; - attribute wstring BirthMonth; - attribute wstring BirthDay; - attribute wstring Custom1; - attribute wstring Custom2; - attribute wstring Custom3; - attribute wstring Custom4; - attribute wstring Notes; - attribute unsigned long LastModifiedDate; + attribute wstring firstName; + attribute wstring lastName; + attribute wstring displayName; + attribute wstring nickName; + attribute wstring primaryEmail; + attribute wstring secondEmail; + attribute wstring workPhone; + attribute wstring homePhone; + attribute wstring faxNumber; + attribute wstring pagerNumber; + attribute wstring cellularNumber; + attribute wstring homeAddress; + attribute wstring homeAddress2; + attribute wstring homeCity; + attribute wstring homeState; + attribute wstring homeZipCode; + attribute wstring homeCountry; + attribute wstring workAddress; + attribute wstring workAddress2; + attribute wstring workCity; + attribute wstring workState; + attribute wstring workZipCode; + attribute wstring workCountry; + attribute wstring jobTitle; + attribute wstring department; + attribute wstring company; + attribute wstring webPage1; + attribute wstring webPage2; + attribute wstring birthYear; + attribute wstring birthMonth; + attribute wstring birthDay; + attribute wstring custom1; + attribute wstring custom2; + attribute wstring custom3; + attribute wstring custom4; + attribute wstring notes; + attribute unsigned long lastModifiedDate; - attribute boolean SendPlainText; + attribute boolean sendPlainText; - attribute unsigned long DbTableID; - attribute unsigned long DbRowID; + attribute unsigned long dbTableID; + attribute unsigned long dbRowID; - void GetCardValue(in string attrname, out wstring value); - void SetCardValue(in string attrname, in wstring value); - void SetAbDatabase(in nsIAddrDatabase database); + wstring getCardValue(in string attrname); + void setCardValue(in string attrname, in wstring value); + void setAbDatabase(in nsIAddrDatabase database); - [noscript] void GetAnonymousStrAttrubutesList(out nsVoidArray attrlist); - [noscript] void GetAnonymousStrValuesList(out nsVoidArray valuelist); - [noscript] void GetAnonymousIntAttrubutesList(out nsVoidArray attrlist); - [noscript] void GetAnonymousIntValuesList(out nsVoidArray valuelist); - [noscript] void GetAnonymousBoolAttrubutesList(out nsVoidArray attrlist); - [noscript] void GetAnonymousBoolValuesList(out nsVoidArray valuelist); + [noscript] readonly attribute nsVoidArray anonymousStrAttrubutesList; + [noscript] readonly attribute nsVoidArray anonymousStrValuesList; + [noscript] readonly attribute nsVoidArray anonymousIntAttrubutesList; + [noscript] readonly attribute nsVoidArray anonymousIntValuesList; + [noscript] readonly attribute nsVoidArray anonymousBoolAttrubutesList; + [noscript] readonly attribute nsVoidArray anonymousBoolValuesList; - void SetAnonymousStringAttribute(in string attrname, in string value); - void SetAnonymousIntAttribute(in string attrname, in unsigned long value); - void SetAnonymousBoolAttribute(in string attrname, in boolean value); - void AddAnonymousAttributesToDB(); - void EditAnonymousAttributesInDB(); + void setAnonymousStringAttribute(in string attrname, in string value); + void setAnonymousIntAttribute(in string attrname, in unsigned long value); + void setAnonymousBoolAttribute(in string attrname, in boolean value); + void addAnonymousAttributesToDB(); + void editAnonymousAttributesInDB(); - void GetCardURI(out string uri); - void AddCardToDatabase(in string uri); - void EditCardToDatabase(in string uri); - void CopyCard(in nsIAbCard srcCard); - void GetCollationKey(in wstring str, out wstring key); + readonly attribute string cardURI; + void addCardToDatabase(in string uri); + void editCardToDatabase(in string uri); + void copyCard(in nsIAbCard srcCard); + wstring getCollationKey(in wstring str); }; diff --git a/mozilla/mailnews/addrbook/public/nsIAbDirectory.idl b/mozilla/mailnews/addrbook/public/nsIAbDirectory.idl index 12db0524406..7c3837d1773 100644 --- a/mozilla/mailnews/addrbook/public/nsIAbDirectory.idl +++ b/mozilla/mailnews/addrbook/public/nsIAbDirectory.idl @@ -35,21 +35,21 @@ [scriptable, uuid(1920E485-0709-11d3-A2EC-001083003D0C)] interface nsIAbDirectory : nsISupports { - attribute wstring DirName; - attribute unsigned long LastModifiedDate; + attribute wstring dirName; + attribute unsigned long lastModifiedDate; attribute DIR_Server server; - void GetDirFilePath(out string dbPath); - void GetChildNodes(out nsIEnumerator childList); - void GetChildCards(out nsIEnumerator childCards); - void AddChildCards(in string uriName, out nsIAbCard childCard); - void AddDirectory(in string uriName, out nsIAbDirectory childDir); - void DeleteDirectories(in nsISupportsArray dierctories); - void DeleteCards(in nsISupportsArray cards); - void HasCard(in nsIAbCard cards, out boolean hasCard); - void HasDirectory(in nsIAbDirectory dir, out boolean hasDir); - void GetMailingList(out nsIEnumerator mailingList); - void CreateNewDirectory(in wstring dirName, in string fileName); - void GetDirUri(out string uri); + readonly attribute string dirFilePath; + readonly attribute nsIEnumerator childNodes; + readonly attribute nsIEnumerator childCards; + nsIAbCard addChildCards(in string uriName); + nsIAbDirectory addDirectory(in string uriName); + void deleteDirectories(in nsISupportsArray dierctories); + void deleteCards(in nsISupportsArray cards); + boolean hasCard(in nsIAbCard cards); + boolean hasDirectory(in nsIAbDirectory dir); + readonly attribute nsIEnumerator mailingList; + void createNewDirectory(in wstring dirName, in string fileName); + string getDirUri(); }; diff --git a/mozilla/mailnews/addrbook/public/nsIAbListener.idl b/mozilla/mailnews/addrbook/public/nsIAbListener.idl index 6cf5ec9ce06..5bc61274922 100644 --- a/mozilla/mailnews/addrbook/public/nsIAbListener.idl +++ b/mozilla/mailnews/addrbook/public/nsIAbListener.idl @@ -26,8 +26,8 @@ [scriptable, uuid(1920E484-0709-11d3-A2EC-001083003D0C)] interface nsIAbListener : nsISupports { - void OnItemAdded(in nsISupports parentDir, in nsISupports item); - void OnItemRemoved(in nsISupports parentDir, in nsISupports item); - void OnItemPropertyChanged(in nsISupports item, in string property, in wstring oldValue, in wstring newValue); + void onItemAdded(in nsISupports parentDir, in nsISupports item); + void onItemRemoved(in nsISupports parentDir, in nsISupports item); + void onItemPropertyChanged(in nsISupports item, in string property, in wstring oldValue, in wstring newValue); }; diff --git a/mozilla/mailnews/addrbook/public/nsIAddrBookSession.idl b/mozilla/mailnews/addrbook/public/nsIAddrBookSession.idl index 7e6aa6b7b37..81c81aa66cc 100644 --- a/mozilla/mailnews/addrbook/public/nsIAddrBookSession.idl +++ b/mozilla/mailnews/addrbook/public/nsIAddrBookSession.idl @@ -39,15 +39,15 @@ [scriptable, uuid(C5339441-303F-11d3-9E13-00A0C92B5F0D)] interface nsIAddrBookSession : nsISupports { - void AddAddressBookListener(in nsIAbListener listener); - void RemoveAddressBookListener(in nsIAbListener listener); - void NotifyItemPropertyChanged(in nsISupports item, + void addAddressBookListener(in nsIAbListener listener); + void removeAddressBookListener(in nsIAbListener listener); + void notifyItemPropertyChanged(in nsISupports item, in string property, in wstring oldValue, in wstring newValue); - void NotifyDirectoryItemAdded(in nsIAbDirectory directory, in nsISupports item); - void NotifyDirectoryItemDeleted(in nsIAbDirectory directory, in nsISupports item); + void notifyDirectoryItemAdded(in nsIAbDirectory directory, in nsISupports item); + void notifyDirectoryItemDeleted(in nsIAbDirectory directory, in nsISupports item); - [noscript] void GetUserProfileDirectory(out nsFileSpec userDir); + [noscript] readonly attribute nsFileSpec userProfileDirectory; }; diff --git a/mozilla/mailnews/addrbook/public/nsIAddrDBAnnouncer.idl b/mozilla/mailnews/addrbook/public/nsIAddrDBAnnouncer.idl index 383052d7458..700ce9db68e 100644 --- a/mozilla/mailnews/addrbook/public/nsIAddrDBAnnouncer.idl +++ b/mozilla/mailnews/addrbook/public/nsIAddrDBAnnouncer.idl @@ -28,14 +28,14 @@ interface nsIAddrDBListener; [scriptable, uuid(A4186D8A-1DD0-11d3-A303-001083003D0C)] interface nsIAddrDBAnnouncer : nsISupports { - void AddListener(in nsIAddrDBListener listener); - void RemoveListener(in nsIAddrDBListener listener); + void addListener(in nsIAddrDBListener listener); + void removeListener(in nsIAddrDBListener listener); - void NotifyCardAttribChange(in unsigned long abCode, + void notifyCardAttribChange(in unsigned long abCode, in nsIAddrDBListener instigator); - void NotifyCardEntryChange (in unsigned long abCode, + void notifyCardEntryChange (in unsigned long abCode, in nsIAbCard card, in nsIAddrDBListener instigator); - void NotifyAnnouncerGoingAway(); + void notifyAnnouncerGoingAway(); }; diff --git a/mozilla/mailnews/addrbook/public/nsIAddrDBListener.idl b/mozilla/mailnews/addrbook/public/nsIAddrDBListener.idl index 1d1c2fe65e8..7691cc2d121 100644 --- a/mozilla/mailnews/addrbook/public/nsIAddrDBListener.idl +++ b/mozilla/mailnews/addrbook/public/nsIAddrDBListener.idl @@ -27,10 +27,11 @@ interface nsIAddrDBAnnouncer; [scriptable, uuid(A4186D89-1DD0-11d3-A303-001083003D0C)] interface nsIAddrDBListener : nsISupports { - void OnCardAttribChange(in unsigned long abCode, + void onCardAttribChange(in unsigned long abCode, in nsIAddrDBListener instigator); - void OnCardEntryChange (in unsigned long abCode, + void onCardEntryChange (in unsigned long abCode, in nsIAbCard card, in nsIAddrDBListener instigator); - void OnAnnouncerGoingAway(in nsIAddrDBAnnouncer instigator); + void onAnnouncerGoingAway(in nsIAddrDBAnnouncer instigator); + }; diff --git a/mozilla/mailnews/addrbook/public/nsIAddrDatabase.idl b/mozilla/mailnews/addrbook/public/nsIAddrDatabase.idl index 41857c9b81f..1c90b70771b 100644 --- a/mozilla/mailnews/addrbook/public/nsIAddrDatabase.idl +++ b/mozilla/mailnews/addrbook/public/nsIAddrDatabase.idl @@ -38,76 +38,75 @@ interface nsIAddrDatabase : nsIAddrDBAnnouncer { attribute nsFileSpec dbPath; + [noscript] void open(in nsFileSpec folderName, in boolean create, + out nsIAddrDatabase pCardDB, in boolean upgrading); + void close(in boolean forceCommit); + [noscript] void openMDB(in nsFileSpec dbName, in boolean create); + void closeMDB(in boolean commit); + void openAnonymousDB(out nsIAddrDatabase pCardDB); + void closeAnonymousDB(in boolean forceCommit); - [noscript] void Open(in nsFileSpec folderName, in boolean create, - out nsIAddrDatabase pCardDB, in boolean upgrading); - void Close(in boolean forceCommit); - [noscript] void OpenMDB(in nsFileSpec dbName, in boolean create); - void CloseMDB(in boolean commit); - void OpenAnonymousDB(out nsIAddrDatabase pCardDB); - void CloseAnonymousDB(in boolean forceCommit); + void commit(in unsigned long commitType); + void forceClosed(); - void Commit(in unsigned long commitType); - void ForceClosed(); + void createNewCardAndAddToDB(in nsIAbCard newCard, in boolean beNotify); + nsIEnumerator enumerateCards(in nsIAbDirectory directory); + nsIEnumerator enumerateMailingLists(in nsIAbDirectory directory); + void deleteCard(in nsIAbCard card, in boolean beNotify); + void editCard(in nsIAbCard card, in boolean beNotify); + boolean containsCard(in nsIAbCard card); - void CreateNewCardAndAddToDB(in nsIAbCard newCard, in boolean beNotify); - void EnumerateCards(in nsIAbDirectory directory, out nsIEnumerator result); - void EnumerateMailingLists(in nsIAbDirectory directory, out nsIEnumerator result); - void DeleteCard(in nsIAbCard card, in boolean beNotify); - void EditCard(in nsIAbCard card, in boolean beNotify); - void ContainsCard(in nsIAbCard card, out boolean hasCard); + nsIAbCard getCardForEmailAddress(in nsIAbDirectory directory, in string emailAddress); - void GetCardForEmailAddress(in nsIAbDirectory directory, in string emailAddress, out nsIAbCard card); + void setAnonymousStringAttribute(in string attrname, in string value); + string getAnonymousStringAttribute(in string attrname); + void setAnonymousIntAttribute(in string attrname, in unsigned long value); + unsigned long getAnonymousIntAttribute(in string attrname); + void setAnonymousBoolAttribute(in string attrname, in boolean value); + boolean getAnonymousBoolAttribute(in string attrname); + void addAnonymousAttributesToDB(); + void removeAnonymousAttributesFromDB(); + void editAnonymousAttributesInDB(); + void addAnonymousAttributesFromCard(in nsIAbCard card); + void removeAnonymousAttributesFromCard(in nsIAbCard card); + void editAnonymousAttributesFromCard(in nsIAbCard card); - void SetAnonymousStringAttribute(in string attrname, in string value); - void GetAnonymousStringAttribute(in string attrname, out string value); - void SetAnonymousIntAttribute(in string attrname, in unsigned long value); - void GetAnonymousIntAttribute(in string attrname, out unsigned long value); - void SetAnonymousBoolAttribute(in string attrname, in boolean value); - void GetAnonymousBoolAttribute(in string attrname, out boolean value); - void AddAnonymousAttributesToDB(); - void RemoveAnonymousAttributesFromDB(); - void EditAnonymousAttributesInDB(); - void AddAnonymousAttributesFromCard(in nsIAbCard card); - void RemoveAnonymousAttributesFromCard(in nsIAbCard card); - void EditAnonymousAttributesFromCard(in nsIAbCard card); - - [noscript] void GetNewRow(out nsIMdbRow newRow); - [noscript] void AddCardRowToDB(in nsIMdbRow newRow); - [noscript] void AddFirstName(in nsIMdbRow row, in string value); - [noscript] void AddLastName(in nsIMdbRow row, in string value); - [noscript] void AddDisplayName(in nsIMdbRow row, in string value); - [noscript] void AddNickName(in nsIMdbRow row, in string value); - [noscript] void AddPrimaryEmail(in nsIMdbRow row, in string value); - [noscript] void Add2ndEmail(in nsIMdbRow row, in string value); - [noscript] void AddWorkPhone(in nsIMdbRow row, in string value); - [noscript] void AddHomePhone(in nsIMdbRow row, in string value); - [noscript] void AddFaxNumber(in nsIMdbRow row, in string value); - [noscript] void AddPagerNumber(in nsIMdbRow row, in string value); - [noscript] void AddCellularNumber(in nsIMdbRow row, in string value); - [noscript] void AddHomeAddress(in nsIMdbRow row, in string value); - [noscript] void AddHomeAddress2(in nsIMdbRow row, in string value); - [noscript] void AddHomeCity(in nsIMdbRow row, in string value); - [noscript] void AddHomeState(in nsIMdbRow row, in string value); - [noscript] void AddHomeZipCode(in nsIMdbRow row, in string value); - [noscript] void AddHomeCountry(in nsIMdbRow row, in string value); - [noscript] void AddWorkAddress(in nsIMdbRow row, in string value); - [noscript] void AddWorkAddress2(in nsIMdbRow row, in string value); - [noscript] void AddWorkCity(in nsIMdbRow row, in string value); - [noscript] void AddWorkState(in nsIMdbRow row, in string value); - [noscript] void AddWorkZipCode(in nsIMdbRow row, in string value); - [noscript] void AddWorkCountry(in nsIMdbRow row, in string value); - [noscript] void AddJobTitle(in nsIMdbRow row, in string value); - [noscript] void AddDepartment(in nsIMdbRow row, in string value); - [noscript] void AddCompany(in nsIMdbRow row, in string value); - [noscript] void AddWebPage1(in nsIMdbRow row, in string value); - [noscript] void AddWebPage2(in nsIMdbRow row, in string value); - [noscript] void AddBirthYear(in nsIMdbRow row, in string value); - [noscript] void AddBirthMonth(in nsIMdbRow row, in string value); - [noscript] void AddBirthDay(in nsIMdbRow row, in string value); - [noscript] void AddCustom1(in nsIMdbRow row, in string value); - [noscript] void AddCustom2(in nsIMdbRow row, in string value); - [noscript] void AddCustom3(in nsIMdbRow row, in string value); - [noscript] void AddCustom4(in nsIMdbRow row, in string value); - [noscript] void AddNotes(in nsIMdbRow row, in string value); + [noscript] readonly attribute nsIMdbRow newRow; + [noscript] void addCardRowToDB(in nsIMdbRow newRow); + [noscript] void addFirstName(in nsIMdbRow row, in string value); + [noscript] void addLastName(in nsIMdbRow row, in string value); + [noscript] void addDisplayName(in nsIMdbRow row, in string value); + [noscript] void addNickName(in nsIMdbRow row, in string value); + [noscript] void addPrimaryEmail(in nsIMdbRow row, in string value); + [noscript] void add2ndEmail(in nsIMdbRow row, in string value); + [noscript] void addWorkPhone(in nsIMdbRow row, in string value); + [noscript] void addHomePhone(in nsIMdbRow row, in string value); + [noscript] void addFaxNumber(in nsIMdbRow row, in string value); + [noscript] void addPagerNumber(in nsIMdbRow row, in string value); + [noscript] void addCellularNumber(in nsIMdbRow row, in string value); + [noscript] void addHomeAddress(in nsIMdbRow row, in string value); + [noscript] void addHomeAddress2(in nsIMdbRow row, in string value); + [noscript] void addHomeCity(in nsIMdbRow row, in string value); + [noscript] void addHomeState(in nsIMdbRow row, in string value); + [noscript] void addHomeZipCode(in nsIMdbRow row, in string value); + [noscript] void addHomeCountry(in nsIMdbRow row, in string value); + [noscript] void addWorkAddress(in nsIMdbRow row, in string value); + [noscript] void addWorkAddress2(in nsIMdbRow row, in string value); + [noscript] void addWorkCity(in nsIMdbRow row, in string value); + [noscript] void addWorkState(in nsIMdbRow row, in string value); + [noscript] void addWorkZipCode(in nsIMdbRow row, in string value); + [noscript] void addWorkCountry(in nsIMdbRow row, in string value); + [noscript] void addJobTitle(in nsIMdbRow row, in string value); + [noscript] void addDepartment(in nsIMdbRow row, in string value); + [noscript] void addCompany(in nsIMdbRow row, in string value); + [noscript] void addWebPage1(in nsIMdbRow row, in string value); + [noscript] void addWebPage2(in nsIMdbRow row, in string value); + [noscript] void addBirthYear(in nsIMdbRow row, in string value); + [noscript] void addBirthMonth(in nsIMdbRow row, in string value); + [noscript] void addBirthDay(in nsIMdbRow row, in string value); + [noscript] void addCustom1(in nsIMdbRow row, in string value); + [noscript] void addCustom2(in nsIMdbRow row, in string value); + [noscript] void addCustom3(in nsIMdbRow row, in string value); + [noscript] void addCustom4(in nsIMdbRow row, in string value); + [noscript] void addNotes(in nsIMdbRow row, in string value); }; diff --git a/mozilla/mailnews/addrbook/public/nsIAddressBook.idl b/mozilla/mailnews/addrbook/public/nsIAddressBook.idl index 3dd96c65ac9..02a1845df49 100644 --- a/mozilla/mailnews/addrbook/public/nsIAddressBook.idl +++ b/mozilla/mailnews/addrbook/public/nsIAddressBook.idl @@ -36,12 +36,12 @@ interface nsIDOMWindow; [scriptable, uuid(D60B84F1-2A8C-11d3-9E07-00A0C92B5F0D)] interface nsIAddressBook : nsISupports { - void DeleteCards(in nsIDOMXULElement tree, in nsIDOMXULElement srcDir, in nsIDOMNodeList node); - void NewAddressBook(in nsIRDFCompositeDataSource db, in nsIDOMXULElement srcDir, in wstring name); - void DeleteAddressBooks(in nsIRDFCompositeDataSource db, in nsIDOMXULElement srcDir, in nsIDOMNodeList node); - void PrintCard(); - void PrintAddressbook(); - void SetWebShellWindow(in nsIDOMWindow win); - void ImportAddressBook(); + void deleteCards(in nsIDOMXULElement tree, in nsIDOMXULElement srcDir, in nsIDOMNodeList node); + void newAddressBook(in nsIRDFCompositeDataSource db, in nsIDOMXULElement srcDir, in wstring name); + void deleteAddressBooks(in nsIRDFCompositeDataSource db, in nsIDOMXULElement srcDir, in nsIDOMNodeList node); + void printCard(); + void printAddressbook(); + void setWebShellWindow(in nsIDOMWindow win); + void importAddressBook(); }; diff --git a/mozilla/mailnews/addrbook/public/nsIAutoCompleteListener.idl b/mozilla/mailnews/addrbook/public/nsIAutoCompleteListener.idl index f57f8a92b65..28320651340 100644 --- a/mozilla/mailnews/addrbook/public/nsIAutoCompleteListener.idl +++ b/mozilla/mailnews/addrbook/public/nsIAutoCompleteListener.idl @@ -25,6 +25,6 @@ [scriptable, uuid(CA2A6B08-3625-11d3-988E-001083010E9B)] interface nsIAutoCompleteListener : nsISupports { - void OnAutoCompleteResult(in nsISupports aParam, in wstring aOriginalString, in wstring aMatch); + void onAutoCompleteResult(in nsISupports aParam, in wstring aOriginalString, in wstring aMatch); }; diff --git a/mozilla/mailnews/addrbook/public/nsIAutoCompleteSession.idl b/mozilla/mailnews/addrbook/public/nsIAutoCompleteSession.idl index 8875a68762e..b86307241c8 100644 --- a/mozilla/mailnews/addrbook/public/nsIAutoCompleteSession.idl +++ b/mozilla/mailnews/addrbook/public/nsIAutoCompleteSession.idl @@ -27,6 +27,6 @@ interface nsIAutoCompleteListener; [scriptable, uuid(CA2A6B07-3625-11d3-988E-001083010E9B)] interface nsIAutoCompleteSession : nsISupports { - void AutoComplete(in nsISupports aParam, in wstring aSearchString, in nsIAutoCompleteListener aResultListener); + void autoComplete(in nsISupports aParam, in wstring aSearchString, in nsIAutoCompleteListener aResultListener); }; diff --git a/mozilla/mailnews/addrbook/resources/content/abCardOverlay.js b/mozilla/mailnews/addrbook/resources/content/abCardOverlay.js index b779c126814..9b34de316da 100644 --- a/mozilla/mailnews/addrbook/resources/content/abCardOverlay.js +++ b/mozilla/mailnews/addrbook/resources/content/abCardOverlay.js @@ -135,7 +135,7 @@ function EditCardOKButton() { SetCardValues(editCard.card, document); - editCard.card.EditCardToDatabase(editCard.abURI); + editCard.card.editCardToDatabase(editCard.abURI); // callback to allow caller to update if ( editCard.okCallback ) @@ -150,45 +150,45 @@ function GetCardValues(cardproperty, doc) { if ( cardproperty ) { - doc.getElementById('FirstName').value = cardproperty.FirstName; - doc.getElementById('LastName').value = cardproperty.LastName; - doc.getElementById('DisplayName').value = cardproperty.DisplayName; - doc.getElementById('NickName').value = cardproperty.NickName; + doc.getElementById('FirstName').value = cardproperty.firstName; + doc.getElementById('LastName').value = cardproperty.lastName; + doc.getElementById('DisplayName').value = cardproperty.displayName; + doc.getElementById('NickName').value = cardproperty.nickName; - doc.getElementById('PrimaryEmail').value = cardproperty.PrimaryEmail; - doc.getElementById('SecondEmail').value = cardproperty.SecondEmail; - //doc.getElementById('SendPlainText').value = cardproperty.SendPlainText; + doc.getElementById('PrimaryEmail').value = cardproperty.primaryEmail; + doc.getElementById('SecondEmail').value = cardproperty.secondEmail; + //doc.getElementById('SendPlainText').value = cardproperty.sendPlainText; - doc.getElementById('WorkPhone').value = cardproperty.WorkPhone; - doc.getElementById('HomePhone').value = cardproperty.HomePhone; - doc.getElementById('FaxNumber').value = cardproperty.FaxNumber; - doc.getElementById('PagerNumber').value = cardproperty.PagerNumber; - doc.getElementById('CellularNumber').value = cardproperty.CellularNumber; + doc.getElementById('WorkPhone').value = cardproperty.workPhone; + doc.getElementById('HomePhone').value = cardproperty.homePhone; + doc.getElementById('FaxNumber').value = cardproperty.faxNumber; + doc.getElementById('PagerNumber').value = cardproperty.pagerNumber; + doc.getElementById('CellularNumber').value = cardproperty.cellularNumber; - doc.getElementById('HomeAddress').value = cardproperty.HomeAddress; - doc.getElementById('HomeAddress2').value = cardproperty.HomeAddress2; - doc.getElementById('HomeCity').value = cardproperty.HomeCity; - doc.getElementById('HomeState').value = cardproperty.HomeState; - doc.getElementById('HomeZipCode').value = cardproperty.HomeZipCode; - doc.getElementById('HomeCountry').value = cardproperty.HomeCountry; + doc.getElementById('HomeAddress').value = cardproperty.homeAddress; + doc.getElementById('HomeAddress2').value = cardproperty.homeAddress2; + doc.getElementById('HomeCity').value = cardproperty.homeCity; + doc.getElementById('HomeState').value = cardproperty.homeState; + doc.getElementById('HomeZipCode').value = cardproperty.homeZipCode; + doc.getElementById('HomeCountry').value = cardproperty.homeCountry; - doc.getElementById('JobTitle').value = cardproperty.JobTitle; - doc.getElementById('Department').value = cardproperty.Department; - doc.getElementById('Company').value = cardproperty.Company; - doc.getElementById('WorkAddress').value = cardproperty.WorkAddress; - doc.getElementById('WorkAddress2').value = cardproperty.WorkAddress2; - doc.getElementById('WorkCity').value = cardproperty.WorkCity; - doc.getElementById('WorkState').value = cardproperty.WorkState; - doc.getElementById('WorkZipCode').value = cardproperty.WorkZipCode; - doc.getElementById('WorkCountry').value = cardproperty.WorkCountry; + doc.getElementById('JobTitle').value = cardproperty.jobTitle; + doc.getElementById('Department').value = cardproperty.department; + doc.getElementById('Company').value = cardproperty.company; + doc.getElementById('WorkAddress').value = cardproperty.workAddress; + doc.getElementById('WorkAddress2').value = cardproperty.workAddress2; + doc.getElementById('WorkCity').value = cardproperty.workCity; + doc.getElementById('WorkState').value = cardproperty.workState; + doc.getElementById('WorkZipCode').value = cardproperty.workZipCode; + doc.getElementById('WorkCountry').value = cardproperty.workCountry; - doc.getElementById('WebPage1').value = cardproperty.WebPage1; + doc.getElementById('WebPage1').value = cardproperty.webPage1; - doc.getElementById('Custom1').value = cardproperty.Custom1; - doc.getElementById('Custom2').value = cardproperty.Custom2; - doc.getElementById('Custom3').value = cardproperty.Custom3; - doc.getElementById('Custom4').value = cardproperty.Custom4; - doc.getElementById('Notes').value = cardproperty.Notes; + doc.getElementById('Custom1').value = cardproperty.custom1; + doc.getElementById('Custom2').value = cardproperty.custom2; + doc.getElementById('Custom3').value = cardproperty.custom3; + doc.getElementById('Custom4').value = cardproperty.custom4; + doc.getElementById('Notes').value = cardproperty.notes; } } @@ -198,45 +198,45 @@ function SetCardValues(cardproperty, doc) { if (cardproperty) { - cardproperty.FirstName = doc.getElementById('FirstName').value; - cardproperty.LastName = doc.getElementById('LastName').value; - cardproperty.DisplayName = doc.getElementById('DisplayName').value; - cardproperty.NickName = doc.getElementById('NickName').value; + cardproperty.firstName = doc.getElementById('FirstName').value; + cardproperty.lastName = doc.getElementById('LastName').value; + cardproperty.displayName = doc.getElementById('DisplayName').value; + cardproperty.nickName = doc.getElementById('NickName').value; - cardproperty.PrimaryEmail = doc.getElementById('PrimaryEmail').value; - cardproperty.SecondEmail = doc.getElementById('SecondEmail').value; + cardproperty.primaryEmail = doc.getElementById('PrimaryEmail').value; + cardproperty.secondEmail = doc.getElementById('SecondEmail').value; //cardproperty.SendPlainText = doc.getElementById('SendPlainText').value; - cardproperty.WorkPhone = doc.getElementById('WorkPhone').value; - cardproperty.HomePhone = doc.getElementById('HomePhone').value; - cardproperty.FaxNumber = doc.getElementById('FaxNumber').value; - cardproperty.PagerNumber = doc.getElementById('PagerNumber').value; - cardproperty.CellularNumber = doc.getElementById('CellularNumber').value; + cardproperty.workPhone = doc.getElementById('WorkPhone').value; + cardproperty.homePhone = doc.getElementById('HomePhone').value; + cardproperty.faxNumber = doc.getElementById('FaxNumber').value; + cardproperty.pagerNumber = doc.getElementById('PagerNumber').value; + cardproperty.cellularNumber = doc.getElementById('CellularNumber').value; - cardproperty.HomeAddress = doc.getElementById('HomeAddress').value; - cardproperty.HomeAddress2 = doc.getElementById('HomeAddress2').value; - cardproperty.HomeCity = doc.getElementById('HomeCity').value; - cardproperty.HomeState = doc.getElementById('HomeState').value; - cardproperty.HomeZipCode = doc.getElementById('HomeZipCode').value; - cardproperty.HomeCountry = doc.getElementById('HomeCountry').value; + cardproperty.homeAddress = doc.getElementById('HomeAddress').value; + cardproperty.homeAddress2 = doc.getElementById('HomeAddress2').value; + cardproperty.homeCity = doc.getElementById('HomeCity').value; + cardproperty.homeState = doc.getElementById('HomeState').value; + cardproperty.homeZipCode = doc.getElementById('HomeZipCode').value; + cardproperty.homeCountry = doc.getElementById('HomeCountry').value; - cardproperty.JobTitle = doc.getElementById('JobTitle').value; - cardproperty.Department = doc.getElementById('Department').value; - cardproperty.Company = doc.getElementById('Company').value; - cardproperty.WorkAddress = doc.getElementById('WorkAddress').value; - cardproperty.WorkAddress2 = doc.getElementById('WorkAddress2').value; - cardproperty.WorkCity = doc.getElementById('WorkCity').value; - cardproperty.WorkState = doc.getElementById('WorkState').value; - cardproperty.WorkZipCode = doc.getElementById('WorkZipCode').value; - cardproperty.WorkCountry = doc.getElementById('WorkCountry').value; + cardproperty.jobTitle = doc.getElementById('JobTitle').value; + cardproperty.department = doc.getElementById('Department').value; + cardproperty.company = doc.getElementById('Company').value; + cardproperty.workAddress = doc.getElementById('WorkAddress').value; + cardproperty.workAddress2 = doc.getElementById('WorkAddress2').value; + cardproperty.workCity = doc.getElementById('WorkCity').value; + cardproperty.workState = doc.getElementById('WorkState').value; + cardproperty.workZipCode = doc.getElementById('WorkZipCode').value; + cardproperty.workCountry = doc.getElementById('WorkCountry').value; - cardproperty.WebPage1 = doc.getElementById('WebPage1').value; + cardproperty.webPage1 = doc.getElementById('WebPage1').value; - cardproperty.Custom1 = doc.getElementById('Custom1').value; - cardproperty.Custom2 = doc.getElementById('Custom2').value; - cardproperty.Custom3 = doc.getElementById('Custom3').value; - cardproperty.Custom4 = doc.getElementById('Custom4').value; - cardproperty.Notes = doc.getElementById('Notes').value; + cardproperty.custom1 = doc.getElementById('Custom1').value; + cardproperty.custom2 = doc.getElementById('Custom2').value; + cardproperty.custom3 = doc.getElementById('Custom3').value; + cardproperty.custom4 = doc.getElementById('Custom4').value; + cardproperty.notes = doc.getElementById('Notes').value; } } diff --git a/mozilla/mailnews/addrbook/resources/content/abCommon.js b/mozilla/mailnews/addrbook/resources/content/abCommon.js index ea7310225f3..0a342a2af95 100644 --- a/mozilla/mailnews/addrbook/resources/content/abCommon.js +++ b/mozilla/mailnews/addrbook/resources/content/abCommon.js @@ -63,7 +63,7 @@ var ResultsPaneController = if ( resultsTree ) { var cardList = resultsTree.selectedItems; - top.addressbook.DeleteCards(resultsTree, resultsTree, cardList); + top.addressbook.deleteCards(resultsTree, resultsTree, cardList); } break; } @@ -136,7 +136,7 @@ var DirPaneController = case "cmd_delete": case "button_delete": if ( dirTree ) - top.addressbook.DeleteAddressBooks(dirTree.database, dirTree, dirTree.selectedItems); + top.addressbook.deleteAddressBooks(dirTree.database, dirTree, dirTree.selectedItems); break; } }, diff --git a/mozilla/mailnews/addrbook/resources/content/addressbook.js b/mozilla/mailnews/addrbook/resources/content/addressbook.js index 2a3fff5cc8a..507ede967e5 100644 --- a/mozilla/mailnews/addrbook/resources/content/addressbook.js +++ b/mozilla/mailnews/addrbook/resources/content/addressbook.js @@ -3,6 +3,7 @@ var gUpdateCardView = 0; function OnLoadAddressBook() { + top.addressbook = Components.classes["component://netscape/addressbook"].createInstance(); top.addressbook = top.addressbook.QueryInterface(Components.interfaces.nsIAddressBook); top.gUpdateCardView = UpdateCardView; @@ -80,7 +81,7 @@ function AbPrintCard() { dump("print card\n"); try { - addressbook.PrintCard(); + addressbook.printCard(); } catch (ex) { dump("failed to print card\n"); @@ -100,7 +101,7 @@ function AbPrintAddressBook() function AbImport() { - addressbook.ImportAddressBook(); + addressbook.importAddressBook(); } /* @@ -115,7 +116,7 @@ function AbDelete() //get the current folder var srcDirectory = document.getElementById('resultsTree'); dump("srcDirectory = " + srcDirectory + "\n"); - top.addressbook.DeleteCards(tree, srcDirectory, cardList); + top.addressbook.deleteCards(tree, srcDirectory, cardList); } } */ @@ -128,7 +129,7 @@ function AbDeleteDirectory() // if ( tree && tree.selectedItems && tree.selectedItems.length ) if ( tree ) - top.addressbook.DeleteAddressBooks(tree.database, tree, tree.selectedItems); + top.addressbook.deleteAddressBooks(tree.database, tree, tree.selectedItems); } */