Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Back out two changes of my fix for bug 86000 (convert LDAP XPCOM SDK to use AUTF8String) because they probably regressed some things. r=dmose.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@129511 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterv%netscape.com 2002-09-13 07:26:36 +00:00
parent 4d0bfed156
commit 02e8d05a7b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/mailnews/addrbook/src/nsLDAPPrefsService.js
View File

@ -30,6 +30,7 @@ const NS_LDAPPREFSSERVICE_IID = Components.interfaces.nsILDAPPrefsService;
/* interfaces used in this file */
const nsISupports = Components.interfaces.nsISupports;
const nsISupportsString = Components.interfaces.nsISupportsString;
const nsIPrefBranch = Components.interfaces.nsIPrefBranch;
const nsILDAPURL = Components.interfaces.nsILDAPURL;
@ -206,7 +207,8 @@ function () {
}
ldapUrl.host = host;
try{
ldapUrl.dn = gPrefInt.getCharPref(pref_string + ".searchBase");
ldapUrl.dn = gPrefInt.getComplexValue(pref_string + ".searchBase",
nsISupportsString).data;
}
catch (ex) {
}

5
mozilla/mailnews/compose/resources/content/MsgComposeCommands.js
View File

@ -1038,8 +1038,9 @@ function setupLdapAutocompleteSession()
// override default search filter template?
//
try {
LDAPSession.filterTemplate = sPrefs.getCharPref(
autocompleteDirectory + ".autoComplete.filterTemplate");
LDAPSession.filterTemplate = sPrefs.getComplexValue(
autocompleteDirectory + ".autoComplete.filterTemplate",
Components.interfaces.nsISupportsString).data;
} catch (ex) {
// if this pref isn't there, no big deal. just let