diff options
| author | Brian Smith <brian@dbsoft.org> | 2022-04-26 10:13:11 -0500 |
|---|---|---|
| committer | Brian Smith <brian@dbsoft.org> | 2022-04-26 10:19:04 -0500 |
| commit | 3daf711085889bad1bd68651bc4e8790412ae105 (patch) | |
| tree | f5b0e4c1befb320cdf158e1839ac5e273373087f /mailnews/addrbook | |
| parent | 7fe702603066e7f122d5dd66a3a1892ac7e06215 (diff) | |
| download | uxp-3daf711085889bad1bd68651bc4e8790412ae105.tar.gz | |
Issue #1829 - Revert “Issue #1751 -- Remove XP_MACOSX conditionals from the rest of the tree.”
This also removes some PP abuse and takes file entries out of PP when no longer
needed without XP_MACOSX conditionals.
This reverts commit 6f707bde95dab6998ac204f9ee6c925ee230c740.
Diffstat (limited to 'mailnews/addrbook')
| -rw-r--r-- | mailnews/addrbook/public/nsAbBaseCID.h | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/mailnews/addrbook/public/nsAbBaseCID.h b/mailnews/addrbook/public/nsAbBaseCID.h index 611300d0ab..0dcc630c50 100644 --- a/mailnews/addrbook/public/nsAbBaseCID.h +++ b/mailnews/addrbook/public/nsAbBaseCID.h @@ -387,6 +387,47 @@ #define NS_ABVIEW_CONTRACTID \ "@mozilla.org/addressbook/abview;1" +#ifdef XP_MACOSX +// +// nsAbOSXDirectory +// +#define NS_ABOSXDIRECTORY_PREFIX "moz-abosxdirectory" +#define NS_ABOSXCARD_PREFIX "moz-abosxcard" + +#define NS_ABOSXDIRECTORY_CONTRACTID \ + NS_AB_DIRECTORY_TYPE_CONTRACTID_PREFIX NS_ABOSXDIRECTORY_PREFIX + +#define NS_ABOSXDIRECTORY_CID \ +{ /* {83781cc6-c682-11d6-bdeb-0005024967b8}*/ \ + 0x83781cc6, 0xc682, 0x11d6, \ + {0xbd, 0xeb, 0x00, 0x05, 0x02, 0x49, 0x67, 0xb8} \ +} + +// +// nsAbOSXCard +// +#define NS_ABOSXCARD_CONTRACTID \ + NS_AB_DIRECTORY_TYPE_CONTRACTID_PREFIX NS_ABOSXCARD_PREFIX + +#define NS_ABOSXCARD_CID \ +{ /* {89bbf582-c682-11d6-bc9d-0005024967b8}*/ \ + 0x89bbf582, 0xc682, 0x11d6, \ + {0xbc, 0x9d, 0x00, 0x05, 0x02, 0x49, 0x67, 0xb8} \ +} + +// +// OS X directory factory +// +#define NS_ABOSXDIRFACTORY_CONTRACTID \ + NS_AB_DIRECTORY_FACTORY_CONTRACTID_PREFIX NS_ABOSXDIRECTORY_PREFIX + +#define NS_ABOSXDIRFACTORY_CID \ +{ /* {90efe2fe-c682-11d6-9c83-0005024967b8}*/ \ + 0x90efe2fe, 0xc682, 0x11d6, \ + {0x9c, 0x83, 0x00, 0x05, 0x02, 0x49, 0x67, 0xb8} \ +} +#endif + #define NS_MSGVCARDSERVICE_CID \ { 0x3c4ac0da, 0x2cda, 0x4018, \ { 0x95, 0x51, 0xe1, 0x58, 0xb2, 0xe1, 0x22, 0xd3 }} |