Added to the interface for multi-threaded requirements for progressbar.

profile/pref-migrator/public/Makefile.in

@@ -27,7 +27,6 @@ MODULE		= prefmigr
 EXPORTS		= nsPrefMigrationCIDs.h
 
 XPIDLSRCS	= \
-		nsIPrefMigrationProgress.idl \
 		nsIPrefMigration.idl \
 		$(NULL)
 

profile/pref-migrator/public/makefile.win

@@ -22,8 +22,7 @@ MODULE=prefmigr
 DEFINES=-D_IMPL_NS_DOM 
 EXPORTS=nsPrefMigrationCIDs.h
 
-XPIDLSRCS = 	.\nsIPrefMigrationProgress.idl        \
-		.\nsIPrefMigration.idl			\
+XPIDLSRCS =  .\nsIPrefMigration.idl			\
 		$(NULL)
 
 include <$(DEPTH)\config\rules.mak>

profile/pref-migrator/public/nsIPrefMigration.idl

@@ -18,8 +18,24 @@
 
 #include "nsISupports.idl"
 
+interface nsIWebShellWindow;
+
+%{C++
+
+#define NS_PROFILEMIGRATION_PROGID "component://netscape/profile/migration"
+
+%}
+
 [scriptable, uuid(85c86e4c-6a6c-11d3-9a55-004005263078)]
 interface nsIPrefMigration: nsISupports
 {
-  void processPrefs(in string oldProfilePathStr, in string newProfilePathStr);
+  void AddProfilePaths(in string oldProfilePathStr, in string newProfilePathStr);
+  void ProcessPrefs();
+  void ProcessPrefsFromJS();
+
+  /**
+   * this should be in a seperate interface
+   **/
+
+  void WindowCloseCallback();  
 };

profile/pref-migrator/public/nsPrefMigrationCIDs.h

@@ -26,4 +26,9 @@
 #define NS_PrefMigrationFactory_CID {0xad1b40a0, 0x6a6c, 0x11d3, \
     {0x8d, 0x83, 0x00, 0x40, 0x05, 0x26, 0x30, 0x78}}
 
+#define NS_PMProgressDialog_CID {0x9e180fc9, 0x6d11, 0x11d3, \
+    {0xb9, 0xf5, 0x0, 0x10, 0x83, 0x2, 0x2c, 0xf8}}
+
 #endif /* nsPrefMigrationCIDs_h___ */
+// {9E180FC9-6D11-11d3-B9F5-001083022CF8}
+// {9E180FC9-6D11-11d3-B9F5-001083022CF8}