From bef79e133b3571c86bd5a03f211a656b3c140686 Mon Sep 17 00:00:00 2001
From: "vladimir%pobox.com"
 <vladimir%pobox.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 11 Aug 2004 22:10:09 +0000
Subject: [PATCH] b=255132, bookmarks.bak doesn't get updated past first write

git-svn-id: svn://10.0.0.236/trunk@160686 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../components/bookmarks/src/nsBookmarksService.cpp   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp b/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp
index 75efdaf40dd..2d3d9a77e33 100644
--- a/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp
+++ b/mozilla/browser/components/bookmarks/src/nsBookmarksService.cpp
@@ -4293,6 +4293,17 @@ nsBookmarksService::SaveToBackup()
     nsCOMPtr<nsIFile> backupFile, parentFolder;
     bookmarksFile->GetParent(getter_AddRefs(parentFolder));
     if (parentFolder) {
+        rv = parentFolder->Clone(getter_AddRefs(backupFile));
+        if (NS_FAILED(rv))
+            return;
+
+        rv = backupFile->Append(NS_LITERAL_STRING("bookmarks.bak"));
+        if (NS_FAILED(rv))
+            return;
+
+        rv = backupFile->Remove(PR_FALSE);
+        /* ignore error */
+
         rv = bookmarksFile->CopyTo(parentFolder, NS_LITERAL_STRING("bookmarks.bak"));
         if (NS_SUCCEEDED(rv))
             mNeedBackupUpdate = PR_FALSE;