From e4e850351db005a69af1e3f461d7a05c9dddf510 Mon Sep 17 00:00:00 2001 From: "bienvenu%nventure.com" Date: Mon, 27 Oct 2003 17:07:47 +0000 Subject: [PATCH] follow on patch for making ldap prefs migration happen at profile migration time 223560, fix building with disable_ldap, r/sr/a=sspitzer --- mailnews/base/src/nsMessengerMigrator.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mailnews/base/src/nsMessengerMigrator.cpp b/mailnews/base/src/nsMessengerMigrator.cpp index 68ef0a85114..d8bcf836807 100644 --- a/mailnews/base/src/nsMessengerMigrator.cpp +++ b/mailnews/base/src/nsMessengerMigrator.cpp @@ -83,7 +83,10 @@ #include "nsIAbUpgrader.h" #include "nsIAddressBook.h" #include "nsAbBaseCID.h" + +#if defined(MOZ_LDAP_XPCOM) #include "nsILDAPPrefsService.h" +#endif #include "nsIMsgFilterService.h" #include "nsIMsgFilterList.h" @@ -736,8 +739,9 @@ nsMessengerMigrator::UpgradePrefs() if (NS_FAILED(rv)) return rv; // this will upgrade the ldap prefs +#if defined(MOZ_LDAP_XPCOM) nsCOMPtr ldapPrefsService = do_GetService("@mozilla.org/ldapprefs-service;1", &rv); - +#endif // we're done migrating, let's save the prefs rv = m_prefs->SavePrefFile(nsnull); if (NS_FAILED(rv)) return rv;