From 9bacdcbb359da62df9f8c40d3833725598c76fe4 Mon Sep 17 00:00:00 2001
From: "ben%bengoodger.com" <ben%bengoodger.com>
Date: Tue, 9 Mar 2004 05:32:16 +0000
Subject: [PATCH] build bustage!

---
 browser/components/migration/src/nsIEProfileMigrator.cpp    | 6 +++---
 browser/components/migration/src/nsOperaProfileMigrator.cpp | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/browser/components/migration/src/nsIEProfileMigrator.cpp b/browser/components/migration/src/nsIEProfileMigrator.cpp
index 1daa054b695a..a170fd1d239b 100644
--- a/browser/components/migration/src/nsIEProfileMigrator.cpp
+++ b/browser/components/migration/src/nsIEProfileMigrator.cpp
@@ -1151,7 +1151,7 @@ nsIEProfileMigrator::CopySmartKeywords(nsIRDFResource* aParentFolder)
           rv = bundle->FormatStringFromName(NS_LITERAL_STRING("importedSearchUrlDesc").get(),
                                             descStrings, 2, getter_Copies(keywordDesc));
           bms->CreateBookmarkInContainer(keywordName.get(), 
-                                         (char*)url, 
+                                         NS_ConvertUTF8toUCS2(url).get(), 
                                          keyword.get(), 
                                          keywordDesc.get(), 
                                          NS_LITERAL_STRING("").get(), 
@@ -1273,7 +1273,7 @@ nsIEProfileMigrator::ParseFavoritesFolder(nsIFile* aDirectory,
 
       nsCOMPtr<nsIRDFResource> bookmark;
       aBookmarksService->CreateBookmarkInContainer(bookmarkName.get(), 
-                                                   spec.get(), 
+                                                   NS_ConvertUTF8toUCS2(spec).get(), 
                                                    nsnull,
                                                    nsnull, 
                                                    nsnull, 
@@ -1338,7 +1338,7 @@ nsIEProfileMigrator::ParseFavoritesFolder(nsIFile* aDirectory,
 
       nsCOMPtr<nsIRDFResource> bookmark;
       rv = aBookmarksService->CreateBookmarkInContainer(name.get(), 
-                                                        resolvedURL.get(), 
+                                                        NS_ConvertUTF8toUCS2(resolvedURL).get(), 
                                                         nsnull, 
                                                         nsnull, 
                                                         nsnull, 
diff --git a/browser/components/migration/src/nsOperaProfileMigrator.cpp b/browser/components/migration/src/nsOperaProfileMigrator.cpp
index 17a1926e3ea7..50899bf8f5e0 100644
--- a/browser/components/migration/src/nsOperaProfileMigrator.cpp
+++ b/browser/components/migration/src/nsOperaProfileMigrator.cpp
@@ -1119,7 +1119,7 @@ nsOperaProfileMigrator::CopySmartKeywords(nsIBookmarksService* aBMS,
                                   descStrings, 2, getter_Copies(keywordDesc));
 
     rv = aBMS->CreateBookmarkInContainer(nameStr.get(), 
-                                         url.get(), 
+                                         NS_ConvertUTF8toUCS2(url).get(), 
                                          NS_ConvertUTF8toUCS2(keyword).get(), 
                                          keywordDesc.get(), 
                                          nsnull, 
@@ -1269,7 +1269,7 @@ nsOperaProfileMigrator::ParseBookmarksFolder(nsILineInputStream* aStream,
       if (entryType == EntryType_BOOKMARK) {
         if (!name.IsEmpty() && !url.IsEmpty()) {
           rv = aBMS->CreateBookmarkInContainer(name.get(), 
-                                               url.get(), 
+                                               NS_ConvertUTF8toUCS2(url).get(), 
                                                keyword.get(), 
                                                description.get(), 
                                                nsnull,