From 32b3ac7287df5dfcc7275f266a71f39ba0302af2 Mon Sep 17 00:00:00 2001 From: "ducarroz%netscape.com" Date: Wed, 12 Apr 2000 06:12:41 +0000 Subject: [PATCH] Rename Addressbook classes nsIAutoCompleteSession & nsIAutoCompleteListener to avoid any conflict with the new autocomplete widget during it's landing. R=mscott. --- mailnews/addrbook/macbuild/msgAddrbookIDL.mcp | Bin 76022 -> 76022 bytes mailnews/addrbook/public/Makefile.in | 4 ++-- mailnews/addrbook/public/makefile.win | 4 ++-- .../addrbook/src/nsAbAutoCompleteSession.cpp | 6 +++--- .../addrbook/src/nsAbAutoCompleteSession.h | 10 +++++----- .../resources/content/addressAutoComplete.js | 3 +-- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/mailnews/addrbook/macbuild/msgAddrbookIDL.mcp b/mailnews/addrbook/macbuild/msgAddrbookIDL.mcp index bfe9dd6f4cc222e5a4a4745d3643cee992c78fe2..eb5c9e019d82b91ed4b35459bf66591b4751a05f 100644 GIT binary patch delta 556 zcmex%k>%S(mJMcHf^4%H7#Na(7zo&Q0*T3u6Kpqc2v=vEyqcRw&=x4d2gC|YKmv%} zC!gS6&6)`0ByBF>X<(e}BgnCd?>(cX1tSB4B@kN!u?-M|G$sRa1JKxO3=AAVCXnwM z5#k)~>BEK0cAy~h^x&0 zviy{MU~oam2B7r}hZ0lEO13ZLXY^*=ToN3+ft{@=ih)7EfAhld-;C2QvoeZ-ME?K3 za1AJ;&O9+7XLGtgD-+Oz+)SG-=kqXapU=0Qc*H+ delta 440 zcmex%k>%S(mJMcHo6YS@87Hsi<`J}JU|`?_Vg)830mQD8PjIi^T+LI>sU>w(EmtMKe4)z|5n=NI{nJ_fE zY;Kfa$;4^~G(CFqdj(}yb08}Q#G0(7RI&M!Qk)JuOSt?0|0h&8hx_|7O->Z>wlQ<_ z^l=5c$s9^sKxs=TZ5^LlQIMaPnpa|IpkS-u;^Y(W>**J7Xb|rjvDwhxlW}uNaO?(l zmXLG*|4*6$6#30K{W2?~7)XSHAuxXP#i+^5o74SSnSd_mX4-5ypNDDte166*ZdM1V zLlrnco`t$qVY-?$WA*lr(u_Bl8JBE7CC|8znJF-PdY3YzJ0rvNOUjITOaf=NGpR6s GVF3V)KW{Yv diff --git a/mailnews/addrbook/public/Makefile.in b/mailnews/addrbook/public/Makefile.in index 3fb38b5e9290..ffc1fd4212d9 100644 --- a/mailnews/addrbook/public/Makefile.in +++ b/mailnews/addrbook/public/Makefile.in @@ -38,8 +38,8 @@ XPIDLSRCS = \ nsIAddressBook.idl \ nsIAbBase.idl \ nsIAddrBookSession.idl \ - nsIAutoCompleteListener.idl \ - nsIAutoCompleteSession.idl \ + nsIAbAutoCompleteListener.idl \ + nsIAbAutoCompleteSession.idl \ nsIAbAddressCollecter.idl \ nsIAbUpgrader.idl \ nsIAddbookUrl.idl \ diff --git a/mailnews/addrbook/public/makefile.win b/mailnews/addrbook/public/makefile.win index 983c2d844c65..f789a97d75e7 100644 --- a/mailnews/addrbook/public/makefile.win +++ b/mailnews/addrbook/public/makefile.win @@ -32,8 +32,8 @@ XPIDLSRCS = \ .\nsIAddrDatabase.idl \ .\nsIAddressBook.idl \ .\nsIAddrBookSession.idl \ - .\nsIAutoCompleteSession.idl \ - .\nsIAutoCompleteListener.idl \ + .\nsIAbAutoCompleteSession.idl \ + .\nsIAbAutoCompleteListener.idl \ .\nsIAbAddressCollecter.idl \ .\nsIAbUpgrader.idl \ .\nsIAddbookUrl.idl \ diff --git a/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp b/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp index 7eac3b7d799e..477d41c35752 100644 --- a/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp +++ b/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp @@ -44,7 +44,7 @@ nsresult NS_NewAbAutoCompleteSession(const nsIID &aIID, void ** aInstancePtrResu { nsAbAutoCompleteSession * abSession = new nsAbAutoCompleteSession(); if (abSession) - return abSession->QueryInterface(NS_GET_IID(nsIAutoCompleteSession), aInstancePtrResult); + return abSession->QueryInterface(NS_GET_IID(nsIAbAutoCompleteSession), aInstancePtrResult); else return NS_ERROR_OUT_OF_MEMORY; /* we couldn't allocate the object */ } @@ -52,7 +52,7 @@ nsresult NS_NewAbAutoCompleteSession(const nsIID &aIID, void ** aInstancePtrResu return NS_ERROR_NULL_POINTER; /* aInstancePtrResult was NULL....*/ } -NS_IMPL_ISUPPORTS(nsAbAutoCompleteSession, NS_GET_IID(nsIAutoCompleteSession)) +NS_IMPL_ISUPPORTS(nsAbAutoCompleteSession, NS_GET_IID(nsIAbAutoCompleteSession)) nsAbAutoCompleteSession::nsAbAutoCompleteSession() { @@ -172,7 +172,7 @@ NS_IMETHODIMP nsAbAutoCompleteSession::AutoComplete(nsIMsgIdentity *aIdentity, nsISupports *aParam, const PRUnichar *aSearchString, - nsIAutoCompleteListener *aResultListener) + nsIAbAutoCompleteListener *aResultListener) { // mscott - right now I'm not even going to bother to make this synchronous... // I'll beef it up with some test data later but we want to see if this idea works for right now... diff --git a/mailnews/addrbook/src/nsAbAutoCompleteSession.h b/mailnews/addrbook/src/nsAbAutoCompleteSession.h index 41a9ad088c37..a559ef7ffc8b 100644 --- a/mailnews/addrbook/src/nsAbAutoCompleteSession.h +++ b/mailnews/addrbook/src/nsAbAutoCompleteSession.h @@ -23,8 +23,8 @@ #ifndef nsAbAutoCompleteSession_h___ #define nsAbAutoCompleteSession_h___ -#include "nsIAutoCompleteSession.h" -#include "nsIAutoCompleteListener.h" +#include "nsIAbAutoCompleteSession.h" +#include "nsIAbAutoCompleteListener.h" #include "nsIMsgHeaderParser.h" #include "nsCOMPtr.h" #include "msgCore.h" @@ -39,11 +39,11 @@ typedef struct #define MAX_ENTRIES 100 -class nsAbAutoCompleteSession : public nsIAutoCompleteSession +class nsAbAutoCompleteSession : public nsIAbAutoCompleteSession { public: NS_DECL_ISUPPORTS - NS_DECL_NSIAUTOCOMPLETESESSION + NS_DECL_NSIABAUTOCOMPLETESESSION nsAbAutoCompleteSession(); virtual ~nsAbAutoCompleteSession(); @@ -52,7 +52,7 @@ protected: nsresult PopulateTableWithAB(nsIEnumerator * aABCards); // enumerates through the cards and adds them to the table PRUnichar* BuildSearchResult(PRUint32 nIndex, nsIMsgHeaderParser* parser); - nsCOMPtr m_resultListener; + nsCOMPtr m_resultListener; PRBool m_tableInitialized; nsAbStubEntry m_searchNameCompletionEntryTable[MAX_ENTRIES]; PRInt32 m_numEntries; diff --git a/mailnews/compose/resources/content/addressAutoComplete.js b/mailnews/compose/resources/content/addressAutoComplete.js index bfc52eab48c4..939217173198 100644 --- a/mailnews/compose/resources/content/addressAutoComplete.js +++ b/mailnews/compose/resources/content/addressAutoComplete.js @@ -38,7 +38,6 @@ var AddressAutoCompleteListener = { dump("value = " + aItem.value + "\n"); dump("aOriginalString = " + aOriginalString + "\n"); dump("aMatch = " + aMatch + "\n"); - aItem.value = aMatch; aItem.lastValue = aMatch; } @@ -75,7 +74,7 @@ function AutoCompleteAddress(inputElement) ac = ac.getService(); } if (ac) { - ac = ac.QueryInterface(Components.interfaces.nsIAutoCompleteSession); + ac = ac.QueryInterface(Components.interfaces.nsIAbAutoCompleteSession); } if (!identityElement)