Bug 530503 - File -> New -> Other accounts proposes .mac, stop the bleeding by ifdeffing it off for Thunderbird, r=Standard8
authorPhil Ringnalda <philringnalda@gmail.com>
Mon, 05 Apr 2010 19:49:11 -0700
changeset 5427 bc6701d5d20c2750e32ec674c46b218ee6ae4a4f
parent 5426 50629ea58c068f1eb3342cf14301e4027647ac79
child 5428 071ad171572ec1bfbf459ca811fa8418648b3a36
push idunknown
push userunknown
push dateunknown
reviewersStandard8
bugs530503
Bug 530503 - File -> New -> Other accounts proposes .mac, stop the bleeding by ifdeffing it off for Thunderbird, r=Standard8
mail/installer/removed-files.in
mailnews/base/ispdata/Makefile.in
--- a/mail/installer/removed-files.in
+++ b/mail/installer/removed-files.in
@@ -161,16 +161,19 @@ greprefs/xpinstall.js
 greprefs/
 #endif
 #ifdef MOZ_WIDGET_GTK2
 icons/mozicon128.png
 icons/mozicon16.xpm
 icons/mozicon50.xpm
 #endif
 init.d/README
+#ifdef XP_MACOSX
+isp/dotmac.rdf
+#endif
 isp/gmail.rdf
 isp/af/gmail.rdf
 isp/be/gmail.rdf
 isp/bg/gmail.rdf
 isp/ca/gmail.rdf
 isp/cs/gmail.rdf
 isp/da/gmail.rdf
 isp/de/googlemail.rdf
--- a/mailnews/base/ispdata/Makefile.in
+++ b/mailnews/base/ispdata/Makefile.in
@@ -52,19 +52,21 @@ ifdef MOZ_THUNDERBIRD
 ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 EXPORT_RESOURCE_FILES += movemail.rdf
 endif
 else
 EXPORT_RESOURCE_FILES += movemail.rdf
 endif
 endif
 
+ifndef MOZ_THUNDERBIRD
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 EXPORT_RESOURCE_FILES += dotmac.rdf
 endif
+endif
 
 include $(topsrcdir)/config/rules.mk
 
 GARBAGE		+= $(addprefix $(EXPORT_DIR)/, $(EXPORT_RESOURCE_FILES)) 
 
 ifneq ($(EXPORT_RESOURCE_FILES),$(NULL))
 libs:: $(EXPORT_RESOURCE_FILES)
 	$(INSTALL) $^ $(EXPORT_DIR)