profilemigrator-immortal
author Benjamin Smedberg <benjamin@smedbergs.us>
Sat, 26 Jul 2008 22:49:39 -0400
changeset 167 a4da40849f5436e629c5732f4368c6c48189637f
parent 108 33529a5c309fd85dad4adb0f672eaeb6493195ad
permissions -rw-r--r--
State as of now

This patch is a temporary crutch because garburator is dying on nsBrowserMigrator.ii

diff --git a/browser/components/migration/src/nsProfileMigrator.cpp b/browser/components/migration/src/nsProfileMigrator.cpp
--- a/browser/components/migration/src/nsProfileMigrator.cpp
+++ b/browser/components/migration/src/nsProfileMigrator.cpp
@@ -89,7 +89,7 @@ nsProfileMigrator::Migrate(nsIProfileSta
   nsresult rv;
 
   nsCAutoString key;
-  nsCOMPtr<nsIBrowserProfileMigrator> bpm;
+  nsIBrowserProfileMigrator* bpm = nsnull;
 
   rv = GetDefaultBrowserMigratorKey(key, bpm);
   if (NS_FAILED(rv)) return rv;
@@ -168,7 +168,7 @@ NS_IMPL_ISUPPORTS1(nsProfileMigrator, ns
 
 nsresult
 nsProfileMigrator::GetDefaultBrowserMigratorKey(nsACString& aKey,
-                                                nsCOMPtr<nsIBrowserProfileMigrator>& bpm)
+                                                nsIBrowserProfileMigrator*& bpm)
 {
 #if XP_WIN
 
diff --git a/browser/components/migration/src/nsProfileMigrator.h b/browser/components/migration/src/nsProfileMigrator.h
--- a/browser/components/migration/src/nsProfileMigrator.h
+++ b/browser/components/migration/src/nsProfileMigrator.h
@@ -57,7 +57,7 @@ protected:
   ~nsProfileMigrator() { }
 
   nsresult GetDefaultBrowserMigratorKey(nsACString& key,
-                                        nsCOMPtr<nsIBrowserProfileMigrator>& bpm);
+                                        nsIBrowserProfileMigrator* &bpm);
 
   /**
    * Import profiles from ~/.firefox/ or ~/.phoenix/