Don't warn if the old history file doesn't exist (bug 324655). r=brettw.

Original committer: bryner%brianryner.com
Original revision: 1.4
Original date: 2006/01/25 17:36:11

toolkit/components/places/src/nsMorkHistoryImporter.cpp

@@ -197,6 +197,13 @@ nsMorkHistoryImporter::ImportHistory(nsIFile *aFile,
 {
   NS_ENSURE_TRUE(aFile && aHistory, NS_ERROR_NULL_POINTER);
 
+  // Check that the file exists before we try to open it
+  PRBool exists;
+  aFile->Exists(&exists);
+  if (!exists) {
+    return NS_OK;
+  }
+  
   // Read in the mork file
   nsMorkReader reader;
   nsresult rv = reader.Init();