Bug 131849 addressbook build system requires exporting internal files - start removing nsDirPrefs.h from public includes. r/sr=bienvenu

git-svn-id: svn://10.0.0.236/trunk@187540 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/mailnews/addrbook/public/nsIAbDirectory.idl

@@ -42,7 +42,14 @@
 #include "nsISupportsArray.idl"
 
 %{C++
-#include "nsDirPrefs.h"
+/* RDF root for all types of address books */
+/* use this to get all directories, create new directory*/
+#define kAllDirectoryRoot          "moz-abdirectory://" 
+
+#define kPersonalAddressbook       "abook.mab"
+#define kPersonalAddressbookUri    "moz-abmdbdirectory://abook.mab"
+#define kCollectedAddressbook      "history.mab"
+#define kCollectedAddressbookUri   "moz-abmdbdirectory://history.mab"
 %}
 
 // used for when creating new directories

mozilla/mailnews/addrbook/public/nsIAbLDAPDirectory.idl

@@ -40,6 +40,11 @@
 
 interface nsIMutableArray;
 
+%{C++
+#define kLDAPDirectoryRoot         "moz-abldapdirectory://"
+#define kLDAPDirectoryRootLen      22
+%}
+
 /**
  * XXX This should really inherit from nsIAbDirectory, and some day it will.
  * But for now, doing that complicates implementation.

mozilla/mailnews/addrbook/public/nsIAbMDBDirectory.idl

@@ -41,6 +41,11 @@
 #include "nsIAbCard.idl"
 #include "nsIAbDirectory.idl"
 
+%{C++
+#define kMDBDirectoryRoot          "moz-abmdbdirectory://"
+#define kMDBDirectoryRootLen       21
+%}
+
 [scriptable, uuid(C6BCF232-1DD1-11B2-A108-B41BFECED134)]
 interface nsIAbMDBDirectory : nsISupports {
 

mozilla/mailnews/addrbook/src/nsAbMDBCardProperty.cpp

@@ -49,6 +49,7 @@
 #include "nsAddrDatabase.h"
 #include "nsIAddrBookSession.h"
 #include "nsIAddressBook.h"
+#include "nsIAbMDBDirectory.h"
 #include "nsILocalFile.h"
 
 nsAbMDBCardProperty::nsAbMDBCardProperty(void)

mozilla/mailnews/addrbook/src/nsAddressBook.cpp

@@ -46,6 +46,7 @@
 #include "nsIAddrBookSession.h"
 #include "nsIAbLDIFService.h"
 #include "nsAddrDatabase.h"
+#include "nsIAbMDBDirectory.h"
 #include "nsIOutputStream.h"
 #include "nsNetUtil.h"
 #include "msgCore.h"

mozilla/mailnews/addrbook/src/nsDirPrefs.cpp

@@ -57,6 +57,10 @@
 #include "nsCRT.h"
 #include "nsILocalFile.h"
 #include "nsWeakReference.h"
+#include "nsIAbMDBDirectory.h"
+#if defined(MOZ_LDAP_XPCOM)
+#include "nsIAbLDAPDirectory.h"
+#endif
 
 #include "prlog.h"
 #include "plstr.h"
@@ -1675,7 +1679,13 @@ void DIR_GetPrefsForOneServer (DIR_Server *server, PRBool reinitialize, PRBool o
     DIR_ConvertServerFileName(server);
 
   // the string "s" is the default uri ( <scheme> + "://" + <filename> )
-  nsCString s((server->dirType == PABDirectory || server->dirType == MAPIDirectory) ? kMDBDirectoryRoot : kLDAPDirectoryRoot);
+  nsCString s((server->dirType == PABDirectory || server->dirType == MAPIDirectory) ?
+#if defined(MOZ_LDAP_XPCOM)
+    kMDBDirectoryRoot : kLDAPDirectoryRoot);
+#else
+    // Fallback to the all directory root in the non-ldap enabled case.
+    kMDBDirectoryRoot : kAllDirectoryRoot);
+#endif
   s.Append (server->fileName);
   server->uri = DIR_GetStringPref (prefstring, "uri", s.get ());
 

mozilla/mailnews/addrbook/src/nsDirPrefs.h

@@ -47,22 +47,6 @@ class nsVoidArray;
 #define PREF_LDAP_VERSION_NAME     "ldap_2.version"
 #define PREF_LDAP_SERVER_TREE_NAME "ldap_2.servers"
 
-/* RDF roor for all types of address books */
-/* use this to get all directories, create new directory*/
-#define kAllDirectoryRoot          "moz-abdirectory://" 
-
-#define kMDBDirectoryRoot          "moz-abmdbdirectory://"
-#define kMDBDirectoryRootLen       21
-
-#define kLDAPDirectoryRoot         "moz-abldapdirectory://"
-#define kLDAPDirectoryRootLen      22
-
-#define kPersonalAddressbook       "abook.mab"
-#define kPersonalAddressbookUri    "moz-abmdbdirectory://abook.mab"
-#define kCollectedAddressbook      "history.mab"
-#define kCollectedAddressbookUri   "moz-abmdbdirectory://history.mab"
-
-
 #define kABFileName_PreviousSuffix ".na2" /* final v2 address book format */
 #define kABFileName_PreviousSuffixLen 4
 #define kABFileName_CurrentSuffix ".mab"  /* v3 address book extension */

mozilla/mailnews/compose/src/nsMsgCompose.cpp

@@ -86,6 +86,7 @@
 #include "nsIAddrDatabase.h"
 #include "nsIAddrBookSession.h"
 #include "nsIAddressBook.h"
+#include "nsIAbMDBDirectory.h"
 #include "nsCExternalHandlerService.h"
 #include "nsIMIMEService.h"
 #include "nsIDocShellTreeItem.h"
@@ -113,7 +114,6 @@
 #include "nsUnicharUtils.h"
 #include "nsNetUtil.h"
 #include "nsMsgSimulateError.h"
-#include "nsIAddrDatabase.h"
 #include "nsILocalFile.h"
 #include "nsIContentViewer.h"
 #include "nsIMarkupDocumentViewer.h"