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

Bug 1724178 - Make LDAPDirectory.jsm the only implementation of nsIAbLDAPDirectory. r=darktrojan 

- Remove LDAPModuleLoader.jsm and mailnews.ldap.jsmodule
- Unregister C++ LDAP xpcoms

Differential Revision: https://phabricator.services.mozilla.com/D125037
This commit is contained in:
Ping Chen 2021-09-17 01:48:11 +00:00
Родитель a3c07e7050
Коммит bfa413fff8
19 изменённых файлов: 38 добавлений и 329 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

15
ldap/xpcom/src/nsLDAPProtocolModule.cpp
Просмотреть файл

@ -9,12 +9,9 @@
#include "nsLDAPInternal.h"
#include "nsLDAPURL.h"
#include "nsLDAPConnection.h"
#include "nsLDAPOperation.h"
#include "nsLDAPMessage.h"
#include "nsLDAPModification.h"
#include "nsLDAPServer.h"
#include "nsLDAPService.h"
#include "nsLDAPBERValue.h"
#include "nsLDAPBERElement.h"
#include "nsLDAPControl.h"
@ -25,13 +22,10 @@
// use the default constructor
//
NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPConnection)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPOperation)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPMessage)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsLDAPModification, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPServer)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPURL)
NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsLDAPService, Init)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPBERValue)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPBERElement)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPControl)
@ -39,12 +33,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPControl)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPSyncQuery)
#endif
NS_DEFINE_NAMED_CID(NS_LDAPCONNECTION_CID);
NS_DEFINE_NAMED_CID(NS_LDAPOPERATION_CID);
NS_DEFINE_NAMED_CID(NS_LDAPMESSAGE_CID);
NS_DEFINE_NAMED_CID(NS_LDAPMODIFICATION_CID);
NS_DEFINE_NAMED_CID(NS_LDAPSERVER_CID);
NS_DEFINE_NAMED_CID(NS_LDAPSERVICE_CID);
NS_DEFINE_NAMED_CID(NS_LDAPURL_CID);
NS_DEFINE_NAMED_CID(NS_LDAPBERVALUE_CID);
NS_DEFINE_NAMED_CID(NS_LDAPBERELEMENT_CID);
@ -57,12 +48,9 @@ NS_DEFINE_NAMED_CID(NS_LDAPCONTROL_CID);
//
const mozilla::Module::CIDEntry kLDAPProtocolCIDs[] = {
{&kNS_LDAPCONNECTION_CID, false, NULL, nsLDAPConnectionConstructor},
{&kNS_LDAPOPERATION_CID, false, NULL, nsLDAPOperationConstructor},
{&kNS_LDAPMESSAGE_CID, false, NULL, nsLDAPMessageConstructor},
{&kNS_LDAPMODIFICATION_CID, false, NULL, nsLDAPModificationConstructor},
{&kNS_LDAPSERVER_CID, false, NULL, nsLDAPServerConstructor},
{&kNS_LDAPSERVICE_CID, false, NULL, nsLDAPServiceConstructor},
{&kNS_LDAPURL_CID, false, NULL, nsLDAPURLConstructor},
{&kNS_LDAPBERVALUE_CID, false, NULL, nsLDAPBERValueConstructor},
{&kNS_LDAPBERELEMENT_CID, false, NULL, nsLDAPBERElementConstructor},
@ -73,12 +61,9 @@ const mozilla::Module::CIDEntry kLDAPProtocolCIDs[] = {
{NULL}};
const mozilla::Module::ContractIDEntry kLDAPProtocolContracts[] = {
{"@mozilla.org/network/ldap-connection;1", &kNS_LDAPCONNECTION_CID},
{"@mozilla.org/network/ldap-operation;1", &kNS_LDAPOPERATION_CID},
{"@mozilla.org/network/ldap-message;1", &kNS_LDAPMESSAGE_CID},
{"@mozilla.org/network/ldap-modification;1", &kNS_LDAPMODIFICATION_CID},
{"@mozilla.org/network/ldap-server;1", &kNS_LDAPSERVER_CID},
{"@mozilla.org/network/ldap-service;1", &kNS_LDAPSERVICE_CID},
{"@mozilla.org/network/ldap-url;1", &kNS_LDAPURL_CID},
{"@mozilla.org/network/ldap-ber-value;1", &kNS_LDAPBERVALUE_CID},
{"@mozilla.org/network/ldap-ber-element;1", &kNS_LDAPBERELEMENT_CID},

3
mail/app/profile/all-thunderbird.js
Просмотреть файл

@ -332,9 +332,6 @@ pref("mail.default_html_action", 3);
pref("mailnews.send.loglevel", "Warn");
pref("mailnews.ldap.jsmodule", true);
/////////////////////////////////////////////////////////////////
// End core mailnews.js pref overrides
/////////////////////////////////////////////////////////////////

2
mail/components/addrbook/moz.build
Просмотреть файл

@ -6,8 +6,6 @@
JAR_MANIFESTS += ["jar.mn"]
BROWSER_CHROME_MANIFESTS += [
"test/browser/browser-jsm.ini",
"test/browser/browser.ini",
"test/browser/new/browser-jsm.ini",
"test/browser/new/browser.ini",
]

16
mail/components/addrbook/test/browser/browser-jsm.ini
Просмотреть файл

@ -1,16 +0,0 @@
[DEFAULT]
head = head.js
prefs =
mailnews.ldap.jsmodule=true
mail.provider.suppress_dialog_on_startup=true
mail.spotlight.firstRunDone=true
mail.winsearch.firstRunDone=true
mailnews.start_page.override_url=about:blank
mailnews.start_page.url=about:blank
signon.rememberSignons=true
subsuite = thunderbird
tags = addrbook
dupe-manifest =
[browser_ldap_search.js]
support-files = ../../../../../mailnews/addrbook/test/unit/data/ldap_contacts.json

2
mail/components/addrbook/test/browser/browser.ini
Просмотреть файл

@ -3,7 +3,6 @@ head = head.js
prefs =
carddav.setup.loglevel=Debug
carddav.sync.loglevel=Debug
mailnews.ldap.jsmodule=false
mail.provider.suppress_dialog_on_startup=true
mail.spotlight.firstRunDone=true
mail.winsearch.firstRunDone=true
@ -12,7 +11,6 @@ prefs =
signon.rememberSignons=true
subsuite = thunderbird
tags = addrbook
dupe-manifest =
[browser_cardDAV_init.js]
[browser_cardDAV_properties.js]

16
mail/components/addrbook/test/browser/new/browser-jsm.ini
Просмотреть файл

@ -1,16 +0,0 @@
[DEFAULT]
head = head.js
prefs =
mailnews.ldap.jsmodule=true
mail.provider.suppress_dialog_on_startup=true
mail.spotlight.firstRunDone=true
mail.winsearch.firstRunDone=true
mailnews.start_page.override_url=about:blank
mailnews.start_page.url=about:blank
signon.rememberSignons=true
subsuite = thunderbird
tags = addrbook
dupe-manifest =
[browser_ldap_search.js]
support-files = ../../../../../../mailnews/addrbook/test/unit/data/ldap_contacts.json

2
mail/components/addrbook/test/browser/new/browser.ini
Просмотреть файл

@ -3,7 +3,6 @@ head = head.js
prefs =
carddav.setup.loglevel=Debug
carddav.sync.loglevel=Debug
mailnews.ldap.jsmodule=false
mail.provider.suppress_dialog_on_startup=true
mail.spotlight.firstRunDone=true
mail.winsearch.firstRunDone=true
@ -13,7 +12,6 @@ prefs =
subsuite = thunderbird
support-files = data/**
tags = addrbook
dupe-manifest =
[browser_cardDAV_init.js]
[browser_cardDAV_properties.js]

2
mailnews/addrbook/modules/LDAPDirectory.jsm
Просмотреть файл

@ -19,8 +19,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
});
/**
* Set `user_pref("mailnews.ldap.jsmodule", true);` to use this module.
*
* @implements {nsIAbLDAPDirectory}
* @implements {nsIAbDirectory}
*/

106
mailnews/addrbook/modules/LDAPModuleLoader.jsm
Просмотреть файл

@ -1,106 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const EXPORTED_SYMBOLS = ["LDAPModuleLoader"];
var { ComponentUtils } = ChromeUtils.import(
"resource://gre/modules/ComponentUtils.jsm"
);
var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
/**
* Determine whether to use nsLDAPService.cpp or LDAPService.jsm. When
* `mailnews.ldap.jsmodule` is `true`, use LDAPService.jsm.
*/
function LDAPModuleLoader() {
try {
this.loadModule();
} catch (e) {
Cu.reportError(e);
}
}
var ldapJSModules = [
// moduleName, interfaceId, contractId
[
"LDAPConnection",
"{f87b71b5-2a0f-4b37-8e4f-3c899f6b8432}",
"@mozilla.org/network/ldap-connection;1",
],
[
"LDAPOperation",
"{a6f94ca4-cd2d-4983-bcf2-fe936190955c}",
"@mozilla.org/network/ldap-operation;1",
],
[
"LDAPDirectory",
"{8683e821-f1b0-476d-ac15-07771c79bb11}",
"@mozilla.org/addressbook/directory;1?type=moz-abldapdirectory",
],
[
"LDAPDirectoryQuery",
"{5ad5d311-1a50-43db-a03c-63d45f443903}",
"@mozilla.org/addressbook/ldap-directory-query;1",
],
[
"LDAPReplicationService",
"{dbe204e8-ae09-11eb-b4c8-a7e4b3e6e82e}",
"@mozilla.org/addressbook/ldap-replication-service;1",
],
[
"LDAPService",
"{e8b59b32-f83f-4d5f-8eb5-e3c1e5de0d47}",
"@mozilla.org/network/ldap-service;1",
],
];
LDAPModuleLoader.prototype = {
QueryInterface: ChromeUtils.generateQI(["nsIObserver"]),
observe() {
// Nothing to do here, just need the entry so this is instantiated.
},
loadModule() {
if (Services.prefs.getBoolPref("mailnews.ldap.jsmodule", false)) {
let registrar = Components.manager.QueryInterface(
Ci.nsIComponentRegistrar
);
for (let [moduleName, interfaceId, contractId] of ldapJSModules) {
// Load a module.
let scope = ChromeUtils.import(`resource:///modules/${moduleName}.jsm`);
scope.NSGetFactory = ComponentUtils.generateNSGetFactory([
scope[moduleName],
]);
// Register a module.
let classId = Components.ID(interfaceId);
registrar.registerFactory(
classId,
"",
contractId,
lazyFactoryFor(scope, classId)
);
}
dump("[LDAPModuleLoader] Using LDAPDirectory.jsm\n");
} else {
dump("[LDAPModuleLoader] Using nsAbLDAPDirectory.cpp\n");
}
},
};
function lazyFactoryFor(backendScope, classID) {
return {
createInstance(aOuter, aIID) {
let realFactory = backendScope.NSGetFactory(classID);
return realFactory.createInstance(aOuter, aIID);
},
lockFactory(lock) {
let realFactory = backendScope.NSGetFactory(classID);
return realFactory.lockFactory(lock);
},
};
}

34
mailnews/addrbook/modules/components.conf
Просмотреть файл

@ -38,10 +38,34 @@ Classes = [
'constructor': 'VCardMimeConverter',
'categories': {'simple-mime-converters': 'text/x-vcard'},
}, {
'cid': '{b3709987-113c-4109-a559-82f3fc9a66d3}',
'contract_ids': ['@mozilla.org/addressbook/ldap-module-loader;1'],
'jsm': 'resource:///modules/LDAPModuleLoader.jsm',
'constructor': 'LDAPModuleLoader',
'categories': {'profile-after-change': 'LDAPModuleLoader'},
'cid': '{f87b71b5-2a0f-4b37-8e4f-3c899f6b8432}',
'contract_ids': ['@mozilla.org/network/ldap-connection;1'],
'jsm': 'resource:///modules/LDAPConnection.jsm',
'constructor': 'LDAPConnection',
}, {
'cid': '{a6f94ca4-cd2d-4983-bcf2-fe936190955c}',
'contract_ids': ['@mozilla.org/network/ldap-operation;1'],
'jsm': 'resource:///modules/LDAPOperation.jsm',
'constructor': 'LDAPOperation',
}, {
'cid': '{8683e821-f1b0-476d-ac15-07771c79bb11}',
'contract_ids': ['@mozilla.org/addressbook/directory;1?type=moz-abldapdirectory'],
'jsm': 'resource:///modules/LDAPDirectory.jsm',
'constructor': 'LDAPDirectory',
}, {
'cid': '{5ad5d311-1a50-43db-a03c-63d45f443903}',
'contract_ids': ['@mozilla.org/addressbook/ldap-directory-query;1'],
'jsm': 'resource:///modules/LDAPDirectoryQuery.jsm',
'constructor': 'LDAPDirectoryQuery',
}, {
'cid': '{dbe204e8-ae09-11eb-b4c8-a7e4b3e6e82e}',
'contract_ids': ['@mozilla.org/addressbook/ldap-replication-service;1'],
'jsm': 'resource:///modules/LDAPReplicationService.jsm',
'constructor': 'LDAPReplicationService',
}, {
'cid': '{e8b59b32-f83f-4d5f-8eb5-e3c1e5de0d47}',
'contract_ids': ['@mozilla.org/network/ldap-service;1'],
'jsm': 'resource:///modules/LDAPService.jsm',
'constructor': 'LDAPService',
},
]

1
mailnews/addrbook/modules/moz.build
Просмотреть файл

@ -13,7 +13,6 @@ EXTRA_JS_MODULES += [
"LDAPDirectory.jsm",
"LDAPDirectoryQuery.jsm",
"LDAPListenerBase.jsm",
"LDAPModuleLoader.jsm",
"LDAPReplicationService.jsm",
"QueryStringToExpression.jsm",
"SQLiteDirectory.jsm",

95
mailnews/addrbook/public/nsAbBaseCID.h
Просмотреть файл

@ -174,117 +174,22 @@
} \
}
// nsAbLDAPDirectory
//
#define NS_ABLDAPDIRECTORY_CONTRACTID \
NS_AB_DIRECTORY_TYPE_CONTRACTID_PREFIX "moz-abldapdirectory"
#define NS_ABLDAPDIRECTORY_CID \
{ \
0x783E2777, 0x66D7, 0x4826, { \
0x9E, 0x4B, 0x8A, 0xB5, 0x8C, 0x22, 0x8A, 0x52 \
} \
}
// nsAbLDAPDirectoryQuery
//
#define NS_ABLDAPDIRECTORYQUERY_CONTRACTID \
"@mozilla.org/addressbook/ldap-directory-query;1"
#define NS_ABLDAPDIRECTORYQUERY_CID \
{ \
0x783E2777, 0x66D7, 0x4826, { \
0x9E, 0x4B, 0x8A, 0xB5, 0x8C, 0x22, 0x8A, 0x53 \
} \
}
//
// LDAP directory factory
//
#define NS_ABLDAPDIRFACTORY_CONTRACTID \
NS_AB_DIRECTORY_FACTORY_CONTRACTID_PREFIX "moz-abldapdirectory"
#define NS_ABLDAPDIRFACTORY_CID \
{ \
0x8e3701af, 0x8828, 0x426c, { \
0x84, 0xac, 0x12, 0x48, 0x25, 0xc7, 0x78, 0xf8 \
} \
}
//
// LDAP autocomplete directory factory
//
#define NS_ABLDAPACDIRFACTORY_CONTRACTID \
NS_AB_DIRECTORY_FACTORY_CONTRACTID_PREFIX "ldap"
#define NS_ABLDAPSACDIRFACTORY_CONTRACTID \
NS_AB_DIRECTORY_FACTORY_CONTRACTID_PREFIX "ldaps"
// nsAbLDAPAutoCompFormatter
#define NS_ABLDAPAUTOCOMPFORMATTER_CID \
{ \
0x4e276d6d, 0x9981, 0x46b4, { \
0x90, 0x70, 0x92, 0xf3, 0x44, 0xac, 0x5f, 0x5a \
} \
}
#define NS_ABLDAPAUTOCOMPFORMATTER_CONTRACTID \
"@mozilla.org/ldap-autocomplete-formatter;1?type=addrbook"
// nsAbLDAPReplicationService
#define NS_ABLDAP_REPLICATIONSERVICE_CID \
{ \
0xece81280, 0x2639, 0x11d6, { \
0xb7, 0x91, 0x00, 0xb0, 0xd0, 0x6e, 0x5f, 0x27 \
} \
}
#define NS_ABLDAP_REPLICATIONSERVICE_CONTRACTID \
"@mozilla.org/addressbook/ldap-replication-service;1"
// nsAbLDAPReplicationQuery
#define NS_ABLDAP_REPLICATIONQUERY_CID \
{ \
0x5414fff0, 0x263b, 0x11d6, { \
0xb7, 0x91, 0x00, 0xb0, 0xd0, 0x6e, 0x5f, 0x27 \
} \
}
#define NS_ABLDAP_REPLICATIONQUERY_CONTRACTID \
"@mozilla.org/addressbook/ldap-replication-query;1"
// nsAbLDAPChangeLogQuery
#define NS_ABLDAP_CHANGELOGQUERY_CID \
{ \
0x63e11d51, 0x3c9b, 0x11d6, { \
0xb7, 0xb9, 0x0, 0xb0, 0xd0, 0x6e, 0x5f, 0x27 \
} \
}
#define NS_ABLDAP_CHANGELOGQUERY_CONTRACTID \
"@mozilla.org/addressbook/ldap-changelog-query;1"
// nsAbLDAPProcessReplicationData
#define NS_ABLDAP_PROCESSREPLICATIONDATA_CID \
{ \
0x5414fff1, 0x263b, 0x11d6, { \
0xb7, 0x91, 0x00, 0xb0, 0xd0, 0x6e, 0x5f, 0x27 \
} \
}
#define NS_ABLDAP_PROCESSREPLICATIONDATA_CONTRACTID \
"@mozilla.org/addressbook/ldap-process-replication-data;1"
// nsAbLDAPProcessChangeLogData
#define NS_ABLDAP_PROCESSCHANGELOGDATA_CID \
{ \
0x63e11d52, 0x3c9b, 0x11d6, { \
0xb7, 0xb9, 0x0, 0xb0, 0xd0, 0x6e, 0x5f, 0x27 \
} \
}
#define NS_ABLDAP_PROCESSCHANGELOGDATA_CONTRACTID \
"@mozilla.org/addressbook/ldap-process-changelog-data;1"
#ifdef XP_MACOSX
//
// nsAbOSXDirectory

1
mailnews/addrbook/test/moz.build
Просмотреть файл

@ -13,7 +13,6 @@ BROWSER_CHROME_MANIFESTS += [
]
XPCSHELL_TESTS_MANIFESTS += [
"unit/xpcshell-jsm.ini",
"unit/xpcshell.ini",
"unit/xpcshell_cardDAV.ini",
]

5
mailnews/addrbook/test/unit/head.js
Просмотреть файл

@ -48,8 +48,3 @@ acObserver.prototype = {
});
},
};
// Somehow profile-after-change is not triggered in xpcshell tests, here we
// manually run the getService, so that correct ldap modules are loaded
// according to the pref values.
Cc["@mozilla.org/addressbook/ldap-module-loader;1"].getService();

10
mailnews/addrbook/test/unit/xpcshell-jsm.ini
Просмотреть файл

@ -1,10 +0,0 @@
[DEFAULT]
head = head.js
support-files = data/*
tags = addrbook
dupe-manifest =
prefs =
mailnews.ldap.jsmodule=true
[include:xpcshell_ldap.ini]
[test_LDAPMessage.js]

15
mailnews/addrbook/test/unit/xpcshell.ini
Просмотреть файл

@ -2,9 +2,6 @@
head = head.js
support-files = data/*
tags = addrbook
dupe-manifest =
prefs =
mailnews.ldap.jsmodule=false
[test_basic_nsIAbCard.js]
[test_basic_nsIAbDirectory.js]
@ -21,6 +18,13 @@ tags = vcard
[test_export.js]
tags = vcard
[test_jsaddrbook.js]
[test_LDAPMessage.js]
[test_ldap1.js]
[test_ldap2.js]
[test_ldapOffline.js]
[test_ldapquery.js]
[test_ldapReplication.js]
skip-if = debug # Fails for unknown reasons.
[test_mailList1.js]
[test_nsAbAutoCompleteMyDomain.js]
[test_nsAbAutoCompleteSearch1.js]
@ -38,11 +42,10 @@ tags = vcard
[test_nsIAbCard.js]
tags = vcard
[test_nsIAbDirectory_getMailListFromName.js]
[test_nsLDAPSyncQuery.js]
[test_nsLDAPURL.js]
[test_search.js]
[test_vCard.js]
tags = vcard
[test_vCard21.js]
tags = vcard
[include:xpcshell_ldap.ini]
[test_nsLDAPURL.js]

7
mailnews/addrbook/test/unit/xpcshell_ldap.ini
Просмотреть файл

@ -1,7 +0,0 @@
[test_ldap1.js]
[test_ldap2.js]
[test_ldapOffline.js]
[test_ldapquery.js]
[test_ldapReplication.js]
skip-if = debug # Fails for unknown reasons.
[test_nsLDAPSyncQuery.js]

33
mailnews/build/nsMailModule.cpp
Просмотреть файл

@ -107,12 +107,6 @@
#include "nsAbDirectoryQueryProxy.h"
#include "nsAbLDIFService.h"
#include "nsAbLDAPDirectory.h"
#include "nsAbLDAPDirectoryQuery.h"
#include "nsAbLDAPReplicationService.h"
#include "nsAbLDAPReplicationQuery.h"
#include "nsAbLDAPReplicationData.h"
#if defined(MOZ_MAPI_SUPPORT)
# include "nsAbOutlookInterface.h"
# include "nsAbOutlookDirectory.h"
@ -378,12 +372,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbDirectoryQueryArguments)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbBooleanConditionString)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbBooleanExpression)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPDirectory)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPDirectoryQuery)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPReplicationService)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPReplicationQuery)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPProcessReplicationData)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbDirectoryQueryProxy)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDIFService)
@ -403,11 +391,6 @@ NS_DEFINE_NAMED_CID(NS_ABOUTLOOKDIRECTORY_CID);
NS_DEFINE_NAMED_CID(NS_ABOUTLOOKINTERFACE_CID);
#endif
NS_DEFINE_NAMED_CID(NS_ABLDAPDIRECTORY_CID);
NS_DEFINE_NAMED_CID(NS_ABLDAPDIRECTORYQUERY_CID);
NS_DEFINE_NAMED_CID(NS_ABLDAP_REPLICATIONSERVICE_CID);
NS_DEFINE_NAMED_CID(NS_ABLDAP_REPLICATIONQUERY_CID);
NS_DEFINE_NAMED_CID(NS_ABLDAP_PROCESSREPLICATIONDATA_CID);
NS_DEFINE_NAMED_CID(NS_ABDIRECTORYQUERYPROXY_CID);
#ifdef XP_MACOSX
NS_DEFINE_NAMED_CID(NS_ABOSXDIRECTORY_CID);
@ -743,15 +726,6 @@ const mozilla::Module::CIDEntry kMailNewsCIDs[] = {
nsAbBooleanConditionStringConstructor},
{&kNS_BOOLEANEXPRESSION_CID, false, NULL, nsAbBooleanExpressionConstructor},
{&kNS_ABLDAPDIRECTORY_CID, false, NULL, nsAbLDAPDirectoryConstructor},
{&kNS_ABLDAPDIRECTORYQUERY_CID, false, NULL,
nsAbLDAPDirectoryQueryConstructor},
{&kNS_ABLDAP_REPLICATIONSERVICE_CID, false, NULL,
nsAbLDAPReplicationServiceConstructor},
{&kNS_ABLDAP_REPLICATIONQUERY_CID, false, NULL,
nsAbLDAPReplicationQueryConstructor},
{&kNS_ABLDAP_PROCESSREPLICATIONDATA_CID, false, NULL,
nsAbLDAPProcessReplicationDataConstructor},
{&kNS_ABDIRECTORYQUERYPROXY_CID, false, NULL,
nsAbDirectoryQueryProxyConstructor},
#ifdef XP_MACOSX
@ -940,13 +914,6 @@ const mozilla::Module::ContractIDEntry kMailNewsContracts[] = {
{NS_BOOLEANCONDITIONSTRING_CONTRACTID, &kNS_BOOLEANCONDITIONSTRING_CID},
{NS_BOOLEANEXPRESSION_CONTRACTID, &kNS_BOOLEANEXPRESSION_CID},
{NS_ABLDAPDIRECTORY_CONTRACTID, &kNS_ABLDAPDIRECTORY_CID},
{NS_ABLDAPDIRECTORYQUERY_CONTRACTID, &kNS_ABLDAPDIRECTORYQUERY_CID},
{NS_ABLDAP_REPLICATIONSERVICE_CONTRACTID,
&kNS_ABLDAP_REPLICATIONSERVICE_CID},
{NS_ABLDAP_REPLICATIONQUERY_CONTRACTID, &kNS_ABLDAP_REPLICATIONQUERY_CID},
{NS_ABLDAP_PROCESSREPLICATIONDATA_CONTRACTID,
&kNS_ABLDAP_PROCESSREPLICATIONDATA_CID},
{NS_ABDIRECTORYQUERYPROXY_CONTRACTID, &kNS_ABDIRECTORYQUERYPROXY_CID},
#ifdef XP_MACOSX
{NS_ABOSXDIRECTORY_CONTRACTID, &kNS_ABOSXDIRECTORY_CID},

2
mailnews/mailnews.js
Просмотреть файл

@ -431,8 +431,6 @@ pref("ldap_2.user_id", 0);
// Update kCurrentListVersion in include/dirprefs.h if you change this
pref("ldap_2.version", 3);
// If true, LDAPDirectory.jsm is used. Otherwise, nsAbLDAPDirectory.cpp is used.
pref("mailnews.ldap.jsmodule", false);
pref("mailnews.ldap.loglevel", "Warn");
pref("mailnews.confirm.moveFoldersToTrash", true);