Index: mozilla/browser/components/build/nsModule.cpp
===================================================================
RCS file: /cvsroot/mozilla/browser/components/build/nsModule.cpp,v
retrieving revision 1.26
diff -u -8 -r1.26 nsModule.cpp
--- mozilla/browser/components/build/nsModule.cpp	30 Nov 2004 08:22:44 -0000	1.26
+++ mozilla/browser/components/build/nsModule.cpp	10 Jan 2005 23:48:09 -0000
@@ -52,19 +52,17 @@
 #if !defined(XP_BEOS)
 #include "nsDogbertProfileMigrator.h"
 #endif
 #if !defined(XP_OS2)
 #include "nsOperaProfileMigrator.h"
 #endif
 #include "nsPhoenixProfileMigrator.h"
 #include "nsSeamonkeyProfileMigrator.h"
-#if defined(XP_WIN) && !defined(__MINGW32__)
-#include "nsIEProfileMigrator.h"
-#elif defined(XP_MACOSX)
+#if defined(XP_MACOSX)
 #include "nsSafariProfileMigrator.h"
 #include "nsOmniWebProfileMigrator.h"
 #include "nsMacIEProfileMigrator.h"
 #include "nsCaminoProfileMigrator.h"
 #include "nsICabProfileMigrator.h"
 #endif
 #include "rdf.h"
 
@@ -83,19 +81,17 @@
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDogbertProfileMigrator)
 #endif
 #if !defined(XP_OS2)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsOperaProfileMigrator)
 #endif
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsPhoenixProfileMigrator)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileMigrator)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSeamonkeyProfileMigrator)
-#if defined(XP_WIN) && !defined(__MINGW32__)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEProfileMigrator)
-#elif defined(XP_MACOSX)
+#if defined(XP_MACOSX)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSafariProfileMigrator)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsOmniWebProfileMigrator)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacIEProfileMigrator)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsCaminoProfileMigrator)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsICabProfileMigrator)
 #endif
 /////////////////////////////////////////////////////////////////////////////
 
@@ -130,23 +126,17 @@
     NS_RDF_INFER_DATASOURCE_CONTRACTID_PREFIX "forward-proxy",
     nsForwardProxyDataSourceConstructor },
 
   { "Profile Migrator",
     NS_FIREFOX_PROFILEMIGRATOR_CID,
     NS_PROFILEMIGRATOR_CONTRACTID,
     nsProfileMigratorConstructor },
 
-#if defined(XP_WIN) && !defined(__MINGW32__)
-  { "Internet Explorer (Windows) Profile Migrator",
-    NS_WINIEPROFILEMIGRATOR_CID,
-    NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "ie",
-    nsIEProfileMigratorConstructor },
-
-#elif defined(XP_MACOSX)
+#if defined(XP_MACOSX)
   { "Safari Profile Migrator",
     NS_SAFARIPROFILEMIGRATOR_CID,
     NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "safari",
     nsSafariProfileMigratorConstructor },
 
   { "Internet Explorer (Macintosh) Profile Migrator",
     NS_MACIEPROFILEMIGRATOR_CID,
     NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "macie",
Index: mozilla/browser/components/migration/content/migration.xul
===================================================================
RCS file: /cvsroot/mozilla/browser/components/migration/content/migration.xul,v
retrieving revision 1.13
diff -u -8 -r1.13 migration.xul
--- mozilla/browser/components/migration/content/migration.xul	29 Sep 2004 19:08:20 -0000	1.13
+++ mozilla/browser/components/migration/content/migration.xul	10 Jan 2005 23:48:10 -0000
@@ -82,19 +82,16 @@
 <!-- XXXben - uncomment these as we write migrators for them
       <radio id="konqueror" label="&importFromKonqueror.label;" accesskey="&importFromKonqueror.accesskey;"/>
       <radio id="epiphany"  label="&importFromEpiphany.label;"  accesskey="&importFromEpiphany.accesskey;"/>
       <radio id="galeon"    label="&importFromGaleon.label;"    accesskey="&importFromGaleon.accesskey;"/>
   -->      
 #endif
 #endif
 #ifdef XP_WIN
-#ifndef NO_IE_MIGRATOR
-      <radio id="ie"        label="&importFromIE.label;"        accesskey="&importFromIE.accesskey;"/>
-#endif
       <radio id="seamonkey" label="&importFromSeamonkey.label;" accesskey="&importFromSeamonkey.accesskey;"/>
       <radio id="dogbert"   label="&importFromNetscape4.label;" accesskey="&importFromNetscape4.accesskey;"/>
       <radio id="opera"     label="&importFromOpera.label;"     accesskey="&importFromOpera.accesskey;"/>
 #endif
 #ifndef XP_UNIX
 #ifndef XP_WIN
       <radio id="seamonkey" label="&importFromSeamonkey.label;" accesskey="&importFromSeamonkey.accesskey;"/>
       <radio id="dogbert"   label="&importFromNetscape4.label;" accesskey="&importFromNetscape4.accesskey;"/>
Index: mozilla/browser/components/migration/src/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/browser/components/migration/src/Makefile.in,v
retrieving revision 1.16
diff -u -8 -r1.16 Makefile.in
--- mozilla/browser/components/migration/src/Makefile.in	17 Jun 2004 21:23:49 -0000	1.16
+++ mozilla/browser/components/migration/src/Makefile.in	10 Jan 2005 23:48:10 -0000
@@ -77,22 +77,16 @@
 ifneq ($(OS_ARCH),BeOS)
 CPPSRCS += nsDogbertProfileMigrator.cpp
 endif
 
 ifneq ($(OS_ARCH),OS2)
 CPPSRCS += nsOperaProfileMigrator.cpp
 endif
 
-ifeq ($(OS_ARCH)_$(GNU_CXX),WINNT_)
-DEFINES += -DPSTOREC_DLL=\"$(subst \,\\,$(WINDIR))\\system32\\pstorec.dll\"
-
-CPPSRCS += nsIEProfileMigrator.cpp \
-           $(NULL)
-endif
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 CPPSRCS += nsSafariProfileMigrator.cpp \
            nsMacIEProfileMigrator.cpp \
            nsOmniWebProfileMigrator.cpp \
            nsCaminoProfileMigrator.cpp \
            nsICabProfileMigrator.cpp \
            $(NULL)