From 87076519af52a1c2b3cc084e70d1f0521b207a74 Mon Sep 17 00:00:00 2001 From: Mark Banner Date: Thu, 21 Oct 2010 11:58:17 +0100 Subject: [PATCH] Part of Bug 598613 - remove the Mork regisitration hack from SeaMonkey's configuration now that the core issue is fixed. r=Callekr --- suite/components/nsSuiteComponents.h | 4 +--- suite/confvars.sh | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/suite/components/nsSuiteComponents.h b/suite/components/nsSuiteComponents.h index 791ce70e09..3f49b2f002 100644 --- a/suite/components/nsSuiteComponents.h +++ b/suite/components/nsSuiteComponents.h @@ -39,6 +39,4 @@ // mail/components/build/nsMailComponents.h // needs updating to. -// XXX This currently specifies nsMorkModule due to an error in the core build -// config. Bug 598613 will fix this. -#define APP_COMPONENT_MODULES MODULE(xpAutoComplete) MODULE(nsMailModule) MODULE(nsMsgSMIMEModule) MODULE(nsImportServiceModule) MODULE(nsLDAPProtocolModule) MODULE(nsMorkModule) +#define APP_COMPONENT_MODULES MODULE(xpAutoComplete) MODULE(nsMailModule) MODULE(nsMsgSMIMEModule) MODULE(nsImportServiceModule) MODULE(nsLDAPProtocolModule) diff --git a/suite/confvars.sh b/suite/confvars.sh index e678d1a45a..d667c0f946 100755 --- a/suite/confvars.sh +++ b/suite/confvars.sh @@ -55,8 +55,6 @@ MOZ_UPDATER=1 MOZ_HELP_VIEWER=1 MOZ_MORK=1 MOZ_STATIC_BUILD_UNSUPPORTED=1 -# XXX This currently specifies mork due to an error in the core build -# config. Bug 598613 will fix this. -MOZ_APP_COMPONENT_LIBS="mail msgsmime import xpautocomplete mork $LDAP_COMPONENT" +MOZ_APP_COMPONENT_LIBS="mail msgsmime import xpautocomplete $LDAP_COMPONENT" MOZ_APP_EXTRA_LIBS="$LDAP_LIBS" MOZ_APP_COMPONENT_INCLUDE=nsSuiteComponents.h