Bug 126826: back/forward buttons stop working because of invalid value for sessionhistory.max_entries in prefs.js. r=jrgm, sr=bryner, a=asa
git-svn-id: svn://10.0.0.236/trunk@138062 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
fb69ebe21f
commit
9d7f5ee384
@ -35,7 +35,7 @@
|
||||
#include "nsIDocShellTreeNode.h"
|
||||
#include "nsIDocShellLoadInfo.h"
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsIPref.h"
|
||||
#include "nsIPrefService.h"
|
||||
|
||||
#define PREF_SHISTORY_SIZE "browser.sessionhistory.max_entries"
|
||||
static PRInt32 gHistoryMaxSize = 50;
|
||||
@ -84,12 +84,15 @@ NS_INTERFACE_MAP_END
|
||||
NS_IMETHODIMP
|
||||
nsSHistory::Init()
|
||||
{
|
||||
nsresult res;
|
||||
nsCOMPtr<nsIPref> prefs = do_GetService(NS_PREF_CONTRACTID, &res);
|
||||
if (NS_SUCCEEDED(res) && prefs) {
|
||||
prefs->GetIntPref(PREF_SHISTORY_SIZE, &gHistoryMaxSize);
|
||||
nsCOMPtr<nsIPrefService> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
|
||||
if (prefs) {
|
||||
nsCOMPtr<nsIPrefBranch> defaultBranch;
|
||||
prefs->GetDefaultBranch(nsnull, getter_AddRefs(defaultBranch));
|
||||
if (defaultBranch) {
|
||||
defaultBranch->GetIntPref(PREF_SHISTORY_SIZE, &gHistoryMaxSize);
|
||||
}
|
||||
}
|
||||
return res;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user