fix resources for the profile migration dialog. remove unused files.

profile/pref-migrator/resources/Makefile.in

@@ -22,21 +22,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-SAMPLES_DIR	= $(DIST)/bin/res/profile
-
-EXPORT_RESOURCE_SAMPLES = \
-		prefmProgress.xul \
-		progress_undetermined.xul \
-		prefmProgress.css \
-		pmunprog.dtd	\
-		pmunprog.js	\
-		pmunprog.xul	\
-		$(NULL)
+DIRS		= content locale
 
 include $(topsrcdir)/config/rules.mk
-
-GARBAGE		+= $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES))
-
-install::
-	$(INSTALL) $(addprefix $(srcdir)/, $(EXPORT_RESOURCE_SAMPLES)) $(SAMPLES_DIR)
-

profile/pref-migrator/resources/makefile.win

@@ -16,18 +16,7 @@
 # Reserved.
 
 DEPTH=..\..\..
-MODULE=profile
+
+DIRS=locale content
 
 include <$(DEPTH)\config\rules.mak>
-
-FILES=\
-        prefmProgress.xul					\
-        progress_undetermined.xul \
-        prefmProgress.css					\
-	pmunprog.dtd	\
-	pmunprog.js	\
-	pmunprog.xul	\
-        $(NULL)
-
-install::
-        -for %i in ($(FILES:/=\)) do $(MAKE_INSTALL) %i $(DIST)\bin\res\profile

profile/pref-migrator/src/makefile.win

@@ -24,12 +24,9 @@ MODULE=nsprefm
 DLL=.\$(OBJDIR)\$(MODULE).dll
 EXPORTS=nsPrefMigration.h	 \
 	nsPrefMigrationFactory.h \
-	nsPMProgessDlgFactory.h  \
-	nsPMProgressDialog.h     \
 	$(NULL)
 
 DEFINES=-D_IMPL_NS_DOM 
-#        -DXP_MAC
 
 LCFLAGS = \
         $(LCFLAGS) \
@@ -82,5 +79,4 @@ clobber::
         rm -f $(DIST)\bin\$(MODULE).dll
 		rm -f $(OBJDIR)\nsPrefMigration.obj
 		rm -f $(OBJDIR)\nsPrefMigrationFactory.obj
-		rm -f $(OBJDIR)\nsPMProgressDlg.obj
 

profile/pref-migrator/src/nsPrefMigration.cpp

@@ -133,7 +133,7 @@
 /* and the winner is:  Windows */
 #define PREF_FILE_NAME_IN_5x "prefs.js"
 
-#define PREF_MIGRATION_PROGRESS_URL "resource:/res/profile/pmunprog.xul"
+#define PREF_MIGRATION_PROGRESS_URL "chrome://profile/content/profileMigrationProgress.xul"
 
 typedef struct
 {