From 63f618c8af72c45697ef74bca1e5ee8429a4a363 Mon Sep 17 00:00:00 2001 From: "benjamin%smedbergs.us" Date: Tue, 18 Jul 2006 16:24:16 +0000 Subject: [PATCH] rename bookmarks/history and form history databases (bug 324545) r=brettw. Fixing the bookmarks unit test too. Original committer: bryner%brianryner.com Original revision: 1.66 Original date: 2006/02/14 21:02:41 git-svn-id: svn://10.0.0.236/trunk@202639 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/toolkit/components/places/src/nsNavHistory.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/mozilla/toolkit/components/places/src/nsNavHistory.cpp b/mozilla/toolkit/components/places/src/nsNavHistory.cpp index 2e8d6bd2cf1..3889c8e53d8 100644 --- a/mozilla/toolkit/components/places/src/nsNavHistory.cpp +++ b/mozilla/toolkit/components/places/src/nsNavHistory.cpp @@ -350,9 +350,16 @@ nsNavHistory::InitDB() PRBool tableExists; // init DB + nsCOMPtr dbFile; + rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, + getter_AddRefs(dbFile)); + NS_ENSURE_SUCCESS(rv, rv); + rv = dbFile->Append(NS_LITERAL_STRING("bookmarks_history.sqlite")); + NS_ENSURE_SUCCESS(rv, rv); + mDBService = do_GetService(MOZ_STORAGE_SERVICE_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); - rv = mDBService->OpenSpecialDatabase("profile", getter_AddRefs(mDBConn)); + rv = mDBService->OpenDatabase(dbFile, getter_AddRefs(mDBConn)); NS_ENSURE_SUCCESS(rv, rv);