Bug 1773772 part 12 - Disable the Outlook address book and import components. rs=me DONTBUILD
This was supposed to be in part 4, but I forgot to move the changes from the temporary revision they were in.
--- a/mailnews/addrbook/src/components.conf
+++ b/mailnews/addrbook/src/components.conf
@@ -105,25 +105,25 @@ if buildconfig.substs["OS_ARCH"] == "Dar
{
"cid": "{89bbf582-c682-11d6-bc9d-0005024967b8}",
"contract_ids": ["@mozilla.org/addressbook/directory;1?type=moz-abosxcard"],
"type": "nsAbOSXCard",
"headers": ["/comm/mailnews/addrbook/src/nsAbOSXCard.h"],
},
]
-if buildconfig.substs["OS_ARCH"] == "WINNT" and buildconfig.substs["MOZ_MAPI_SUPPORT"]:
- Classes += [
- {
- "cid": "{9cc57822-0599-4c47-a399-1c6fa185a05c}",
- "contract_ids": [
- "@mozilla.org/addressbook/directory;1?type=moz-aboutlookdirectory"
- ],
- "type": "nsAbOutlookDirectory",
- "headers": ["/comm/mailnews/addrbook/src/nsAbOutlookDirectory.h"],
- },
- {
- "cid": "{558ccc0f-2681-4dac-a066-debd8d26faf6}",
- "contract_ids": ["@mozilla.org/addressbook/outlookinterface;1"],
- "type": "nsAbOutlookInterface",
- "headers": ["/comm/mailnews/addrbook/src/nsAbOutlookInterface.h"],
- },
- ]
+# if buildconfig.substs["OS_ARCH"] == "WINNT" and buildconfig.substs["MOZ_MAPI_SUPPORT"]:
+# Classes += [
+# {
+# "cid": "{9cc57822-0599-4c47-a399-1c6fa185a05c}",
+# "contract_ids": [
+# "@mozilla.org/addressbook/directory;1?type=moz-aboutlookdirectory"
+# ],
+# "type": "nsAbOutlookDirectory",
+# "headers": ["/comm/mailnews/addrbook/src/nsAbOutlookDirectory.h"],
+# },
+# {
+# "cid": "{558ccc0f-2681-4dac-a066-debd8d26faf6}",
+# "contract_ids": ["@mozilla.org/addressbook/outlookinterface;1"],
+# "type": "nsAbOutlookInterface",
+# "headers": ["/comm/mailnews/addrbook/src/nsAbOutlookInterface.h"],
+# },
+# ]
--- a/mailnews/import/src/components.conf
+++ b/mailnews/import/src/components.conf
@@ -85,18 +85,18 @@ if buildconfig.substs["OS_ARCH"] == "WIN
"cid": "{7952a6cf-2442-4c04-9f02-150b15a0a841}",
"contract_ids": ["@mozilla.org/import/import-becky;1"],
"type": "nsBeckyImport",
"headers": ["/comm/mailnews/import/src/nsBeckyImport.h"],
"categories": {"mailnewsimport": "becky"},
},
]
- if buildconfig.substs["MOZ_MAPI_SUPPORT"]:
- Classes += [
- {
- "cid": "{1db469a0-8b00-11d3-a206-00a0cc26da63}",
- "contract_ids": ["@mozilla.org/import/import-outlook;1"],
- "type": "nsOutlookImport",
- "headers": ["/comm/mailnews/import/src/nsOutlookImport.h"],
- "categories": {"mailnewsimport": "outlook"},
- },
- ]
+ # if buildconfig.substs["MOZ_MAPI_SUPPORT"]:
+ # Classes += [
+ # {
+ # "cid": "{1db469a0-8b00-11d3-a206-00a0cc26da63}",
+ # "contract_ids": ["@mozilla.org/import/import-outlook;1"],
+ # "type": "nsOutlookImport",
+ # "headers": ["/comm/mailnews/import/src/nsOutlookImport.h"],
+ # "categories": {"mailnewsimport": "outlook"},
+ # },
+ # ]