From 0ea298aa91ab2ca62a9f1b6fb5abc5e90cdb2202 Mon Sep 17 00:00:00 2001 From: "ben%netscape.com" Date: Mon, 23 Jun 2003 00:56:38 +0000 Subject: [PATCH] Fixing Firebird build bustage after timeless' fishy checkin to bug 58613. git-svn-id: svn://10.0.0.236/trunk@144045 18797224-902f-48f8-a5cc-f745e15eee43 --- .../history/public/nsIBrowserHistory.idl | 2 +- .../components/history/src/nsGlobalHistory.cpp | 14 ++------------ .../components/history/src/nsGlobalHistory.h | 1 - 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/mozilla/toolkit/components/history/public/nsIBrowserHistory.idl b/mozilla/toolkit/components/history/public/nsIBrowserHistory.idl index 6c6e2df6b5f..10d486d7b11 100644 --- a/mozilla/toolkit/components/history/public/nsIBrowserHistory.idl +++ b/mozilla/toolkit/components/history/public/nsIBrowserHistory.idl @@ -81,7 +81,7 @@ interface nsIBrowserHistory : nsISupports * lastPageVisited * the most recently visited page */ - readonly attribute string lastPageVisited; + attribute string lastPageVisited; /** diff --git a/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp b/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp index 2bce0e26f42..8173215b7e3 100644 --- a/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp +++ b/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp @@ -107,7 +107,6 @@ nsIPrefBranch* nsGlobalHistory::gPrefBranch = nsnull; #define PREF_BRANCH_BASE "browser." #define PREF_BROWSER_HISTORY_EXPIRE_DAYS "history_expire_days" -#define PREF_BROWSER_STARTUP_PAGE "startup.page" #define PREF_AUTOCOMPLETE_ONLY_TYPED "urlbar.matchOnlyTyped" #define PREF_AUTOCOMPLETE_ENABLED "urlbar.autocomplete.enabled" @@ -615,15 +614,6 @@ nsGlobalHistory::AddPage(const char *aURL) nsresult rv = AddPageToDatabase(aURL, GetNow()); NS_ENSURE_SUCCESS(rv, rv); - if (gPrefBranch) { - PRInt32 choice = 0; - gPrefBranch->GetIntPref(PREF_BROWSER_STARTUP_PAGE, &choice); - if (choice == 2) { - rv = SaveLastPageVisited(aURL); - NS_ENSURE_SUCCESS(rv, rv); - } - } - return NS_OK; } @@ -1190,8 +1180,8 @@ nsGlobalHistory::IsVisited(const char *aURL, PRBool *_retval) return NS_OK; } -nsresult -nsGlobalHistory::SaveLastPageVisited(const char *aURL) +NS_IMETHODIMP +nsGlobalHistory::SetLastPageVisited(const char *aURL) { NS_ENSURE_TRUE(aURL, NS_ERROR_FAILURE); NS_ENSURE_STATE(mMetaRow); diff --git a/mozilla/toolkit/components/history/src/nsGlobalHistory.h b/mozilla/toolkit/components/history/src/nsGlobalHistory.h index 4e1ba1ee608..e8cc547e359 100644 --- a/mozilla/toolkit/components/history/src/nsGlobalHistory.h +++ b/mozilla/toolkit/components/history/src/nsGlobalHistory.h @@ -332,7 +332,6 @@ protected: // misc unrelated stuff // nsCOMPtr mBundle; - nsresult SaveLastPageVisited(const char *); // pseudo-constants. although the global history really is a // singleton, we'll use this metaphor to be consistent.