From 55160b9c14c0970021b475a2a59b44dba3552a6e Mon Sep 17 00:00:00 2001
From: "ben%bengoodger.com" <ben%bengoodger.com>
Date: Wed, 3 Mar 2004 08:47:21 +0000
Subject: [PATCH] turn off safari migrator until I'm at a mac and can figure
 this out

---
 browser/components/build/nsModule.cpp        | 7 ++++++-
 browser/components/migration/src/Makefile.in | 3 +--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
index fce71efb3609..400e2161ad50 100644
--- a/browser/components/build/nsModule.cpp
+++ b/browser/components/build/nsModule.cpp
@@ -51,7 +51,9 @@
 #ifdef XP_WIN
 #include "nsIEProfileMigrator.h"
 #elif defined(XP_MACOSX)
+#if 0
 #include "nsSafariProfileMigrator.h"
+#endif
 #include "nsOmniWebProfileMigrator.h"
 #include "nsMacIEProfileMigrator.h"
 #endif
@@ -71,7 +73,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsSeamonkeyProfileMigrator)
 #ifdef XP_WIN
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEProfileMigrator)
 #elif defined(XP_MACOSX)
+#if 0
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSafariProfileMigrator)
+#endif
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsOmniWebProfileMigrator)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacIEProfileMigrator)
 #endif
@@ -107,11 +111,12 @@ static const nsModuleComponentInfo components[] =
     nsIEProfileMigratorConstructor },
 
 #elif defined(XP_MACOSX)
+#if 0
   { "Safari Profile Migrator",
     NS_SAFARIPROFILEMIGRATOR_CID,
     NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "safari",
     nsSafariProfileMigratorConstructor },
-
+#endif
   { "Internet Explorer (Macintosh) Profile Migrator",
     NS_MACIEPROFILEMIGRATOR_CID,
     NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "macie",
diff --git a/browser/components/migration/src/Makefile.in b/browser/components/migration/src/Makefile.in
index b44bb8884757..e33841ee64e2 100644
--- a/browser/components/migration/src/Makefile.in
+++ b/browser/components/migration/src/Makefile.in
@@ -82,8 +82,7 @@ CPPSRCS += nsIEProfileMigrator.cpp \
 endif
             
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-CPPSRCS += nsSafariProfileMigrator.cpp \
-           nsMacIEProfileMigrator.cpp \
+CPPSRCS += nsMacIEProfileMigrator.cpp \
            nsOmniWebProfileMigrator.cpp \
            nsCaminoProfileMigrator.cpp \
            nsICabProfileMigrator.cpp \