diff --git a/mailnews/addrbook/public/nsIAbDirectory.idl b/mailnews/addrbook/public/nsIAbDirectory.idl index c2ab8cca269..71f9367249a 100644 --- a/mailnews/addrbook/public/nsIAbDirectory.idl +++ b/mailnews/addrbook/public/nsIAbDirectory.idl @@ -50,6 +50,10 @@ #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 */ %} // used for when creating new directories diff --git a/mailnews/addrbook/src/nsDirPrefs.h b/mailnews/addrbook/src/nsDirPrefs.h index 0fb3d291cf1..f1bcd2281fb 100644 --- a/mailnews/addrbook/src/nsDirPrefs.h +++ b/mailnews/addrbook/src/nsDirPrefs.h @@ -47,9 +47,6 @@ class nsVoidArray; #define PREF_LDAP_VERSION_NAME "ldap_2.version" #define PREF_LDAP_SERVER_TREE_NAME "ldap_2.servers" -#define kABFileName_PreviousSuffix ".na2" /* final v2 address book format */ -#define kABFileName_PreviousSuffixLen 4 -#define kABFileName_CurrentSuffix ".mab" /* v3 address book extension */ #define kMainLdapAddressBook "ldap.mab" /* v3 main ldap address book file */ /* DIR_Server.dirType */ diff --git a/mailnews/extensions/palmsync/src/nsAbPalmSync.h b/mailnews/extensions/palmsync/src/nsAbPalmSync.h index 9fba6760b81..c099e04ccaa 100644 --- a/mailnews/extensions/palmsync/src/nsAbPalmSync.h +++ b/mailnews/extensions/palmsync/src/nsAbPalmSync.h @@ -46,10 +46,6 @@ #include "nsILocalFile.h" #include "nsIAbDirectory.h" -#define kABFileName_PreviousSuffixLen 4 -#define kABFileName_PreviousSuffix ".na2" /* final v2 address book format */ - - class nsAbPalmHotSync { public: