(215094) more mac migration stuff

browser/base/content/browser.js

@@ -1505,7 +1505,12 @@ function updateToolbarStates(toolbarMenuElt)
 function BrowserImport()
 {
   // goats
-  window.openDialog("chrome://browser/content/migration/migration.xul", "migration", "modal,centerscreen,chrome,resizable=no");
+#ifdef XP_MACOSX
+  var features = "centerscreen,chrome,resizable=no";
+#else
+  var features = "modal,centerscreen,chrome,resizable=no";
+#endif
+  window.openDialog("chrome://browser/content/migration/migration.xul", "migration", features);
 }
 
 function BrowserFullScreen()

browser/components/build/Makefile.in

@@ -38,7 +38,11 @@ CPPSRCS = nsModule.cpp \
           $(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
+<<<<<<< Makefile.in
+DEFINES += -DPSTOREC_DLL=\"$(WINDIR)\\system32\\pstorec.dll\"
+=======
 DEFINES += -DPSTOREC_DLL=\"$(subst \,\\,$(WINDIR))\\system32\\pstorec.dll\"
+>>>>>>> 1.19
 
 OS_LIBS	+= $(call EXPAND_LIBNAME,ole32 shell32)
 endif
@@ -76,4 +80,11 @@ EXTRA_DSO_LDOPTS += \
 	$(MOZ_COMPONENT_LIBS) \
 	$(NULL)
 
+# Need to link to CoreFoundation for Mac Migrators (PList reading code)
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+EXTRA_DSO_LDOPTS += \
+  $(TK_LIBS) \
+  $(NULL)
+endif
+
 include $(topsrcdir)/config/rules.mk

browser/components/build/nsBrowserCompsCID.h

@@ -19,7 +19,6 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Joe Hewitt <hewitt@netscape.com> (Original Author)
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -53,6 +52,13 @@
 
 #define NS_OMNIWEBPROFILEMIGRATOR_CID \
 { 0xb80ae6d8, 0x766c, 0x43da, { 0x9c, 0x7a, 0xd, 0x82, 0x44, 0x52, 0x61, 0x6a } }
+
+#define NS_CAMINOPROFILEMIGRATOR_CID \
+{ 0x01d88ea9, 0x0feb, 0x495e, { 0x8c, 0x9b, 0x41, 0x65, 0x99, 0x55, 0x52, 0x65 } }
+
+#define NS_ICABPROFILEMIGRATOR_CID \
+{ 0xf394a036, 0xc5e1, 0x46d8, { 0x99, 0x39, 0x6b, 0x35, 0xe1, 0x13, 0x0a, 0x27 } }
+
 #endif
 
 #define NS_OPERAPROFILEMIGRATOR_CID \
@@ -66,3 +72,4 @@
 
 #define NS_PHOENIXPROFILEMIGRATOR_CID \
 { 0x78481e4a, 0x50e4, 0x4489, { 0xb6, 0x8a, 0xef, 0x82, 0x67, 0xe, 0xd6, 0x3f } }
+

browser/components/build/nsModule.cpp

@@ -54,6 +54,8 @@
 #include "nsSafariProfileMigrator.h"
 #include "nsOmniWebProfileMigrator.h"
 #include "nsMacIEProfileMigrator.h"
+#include "nsCaminoProfileMigrator.h"
+#include "nsICabProfileMigrator.h"
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
@@ -74,6 +76,8 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEProfileMigrator)
 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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -95,8 +99,8 @@ static const nsModuleComponentInfo components[] =
     NS_BOOKMARKS_DATASOURCE_CONTRACTID,
     nsBookmarksServiceConstructor },
 
-  { "Profile Migrator",
-    NS_PROFILEMIGRATOR_CID,
+  { "Profile Migrator", 
+    NS_PROFILEMIGRATOR_CID, 
     NS_PROFILEMIGRATOR_CONTRACTID,
     nsProfileMigratorConstructor },
 
@@ -121,6 +125,17 @@ static const nsModuleComponentInfo components[] =
     NS_OMNIWEBPROFILEMIGRATOR_CID,
     NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "omniweb",
     nsOmniWebProfileMigratorConstructor },
+
+  { "Camino Profile Migrator",
+    NS_CAMINOPROFILEMIGRATOR_CID,
+    NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "camino",
+    nsCaminoProfileMigratorConstructor },
+
+  { "iCab Profile Migrator",
+    NS_ICABPROFILEMIGRATOR_CID,
+    NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "icab",
+    nsICabProfileMigratorConstructor },
+
 #endif
 
   { "Opera Profile Migrator",
@@ -142,6 +157,7 @@ static const nsModuleComponentInfo components[] =
     NS_DOGBERTPROFILEMIGRATOR_CID,
     NS_BROWSERPROFILEMIGRATOR_CONTRACTID_PREFIX "dogbert",
     nsDogbertProfileMigratorConstructor }
+
 };
 
 NS_IMPL_NSGETMODULE(nsBrowserCompsModule, components)

browser/components/migration/content/migration.xul

@@ -60,11 +60,13 @@
     <radiogroup id="importSourceGroup">
 #ifdef XP_UNIX
 #ifdef XP_MACOSX
+<!-- XXXben - uncomment these as we write migrators for them
       <radio id="safari"    label="&importFromSafari.label;"    accesskey="&importFromSafari.accesskey;"/>
       <radio id="macie"     label="&importFromIE.label;"        accesskey="&importFromIE.accesskey;"/>
       <radio id="camino"    label="&importFromCamino.label;"    accesskey="&importFromCamino.accesskey;"/>
-      <radio id="omniweb"   label="&importFromOmniWeb.label;"   accesskey="&importFromOmniweb.accesskey;"/>
+      <radio id="omniweb"   label="&importFromOmniWeb.label;"   accesskey="&importFromOmniWeb.accesskey;"/>
       <radio id="icab"      label="&importFromICab.label;"      accesskey="&importFromICab.accesskey;"/>
+-->
       <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;"/>
@@ -72,7 +74,7 @@
       <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;"/>
-<!--      
+<!-- 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;"/>

browser/components/migration/locale/migration.dtd

@@ -12,9 +12,9 @@
 <!ENTITY importFromOpera.label          "Opera">
 <!ENTITY importFromOpera.accesskey      "O">
 <!ENTITY importFromCamino.label         "Camino">
-<!ENTITY importFromCamino.label         "Camino">
-<!ENTITY importFromSafari.label         "Safari">
+<!ENTITY importFromCamino.accesskey     "Camino">
 <!ENTITY importFromSafari.label         "Safari">
+<!ENTITY importFromSafari.accesskey     "Safari">
 <!ENTITY importFromOmniWeb.label        "OmniWeb">
 <!ENTITY importFromOmniWeb.accesskey    "W">
 <!ENTITY importFromICab.label           "iCab">