From fb94c1dbf85d0a6a4d57db55e8fda18c1c2ca40d Mon Sep 17 00:00:00 2001 From: "bryner%netscape.com" Date: Mon, 1 Jul 2002 04:36:47 +0000 Subject: [PATCH] Hook up "Do not load home page when opening new tab" pref (bug 154288). r=pinkerton. --- camino/BrowserWindowController.mm | 12 ++++++++---- camino/PreferencePanes/Navigation/Navigation.mm | 4 ++-- camino/src/browser/BrowserWindowController.mm | 12 ++++++++---- chimera/BrowserWindowController.mm | 12 ++++++++---- chimera/PreferencePanes/Navigation/Navigation.mm | 4 ++-- chimera/src/browser/BrowserWindowController.mm | 12 ++++++++---- 6 files changed, 36 insertions(+), 20 deletions(-) diff --git a/camino/BrowserWindowController.mm b/camino/BrowserWindowController.mm index 69a6e2dcc5e..a10f62632fc 100644 --- a/camino/BrowserWindowController.mm +++ b/camino/BrowserWindowController.mm @@ -839,14 +839,18 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item"; -(void)newTab { + PRInt32 newTabPage = 0; + nsCOMPtr pref(do_GetService("@mozilla.org/preferences-service;1")); + pref->GetIntPref("browser.tabs.startPage", &newTabPage); + NSTabViewItem* newTab = [[[NSTabViewItem alloc] initWithIdentifier: nil] autorelease]; CHBrowserWrapper* newView = [[[CHBrowserWrapper alloc] initWithTab: newTab andWindow: [mTabBrowser window]] autorelease]; - - [newTab setLabel: @"Untitled"]; + + [newTab setLabel: (newTabPage ? @"Loading..." : @"Untitled")]; [newTab setView: newView]; [mTabBrowser addTabViewItem: newTab]; - - [[newView getBrowserView] loadURI: @"about:blank" flags:NSLoadFlagsNone]; + + [[newView getBrowserView] loadURI: (newTabPage ? [[CHPreferenceManager sharedInstance] homePage: NO] : @"about:blank") flags:NSLoadFlagsNone]; [mTabBrowser selectLastTabViewItem: self]; diff --git a/camino/PreferencePanes/Navigation/Navigation.mm b/camino/PreferencePanes/Navigation/Navigation.mm index 65ea60378f6..09872d0e7a5 100644 --- a/camino/PreferencePanes/Navigation/Navigation.mm +++ b/camino/PreferencePanes/Navigation/Navigation.mm @@ -64,7 +64,7 @@ const int kDefaultExpireDays = 9; if (NS_SUCCEEDED(rv) && intPref == 0) [checkboxNewWindowBlank setState:YES]; - rv = mPrefService->GetIntPref("chimera.new_tab_page", &intPref); + rv = mPrefService->GetIntPref("browser.tabs.startPage", &intPref); if (NS_SUCCEEDED(rv) && intPref == 0) [checkboxNewTabBlank setState:YES]; @@ -141,7 +141,7 @@ const int kDefaultExpireDays = 9; char *prefName = NULL; if (sender == checkboxNewTabBlank) - prefName = "chimera.new_tab_page"; + prefName = "browser.tabs.page"; else if (sender == checkboxNewWindowBlank) prefName = "browser.startup.page"; else diff --git a/camino/src/browser/BrowserWindowController.mm b/camino/src/browser/BrowserWindowController.mm index 69a6e2dcc5e..a10f62632fc 100644 --- a/camino/src/browser/BrowserWindowController.mm +++ b/camino/src/browser/BrowserWindowController.mm @@ -839,14 +839,18 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item"; -(void)newTab { + PRInt32 newTabPage = 0; + nsCOMPtr pref(do_GetService("@mozilla.org/preferences-service;1")); + pref->GetIntPref("browser.tabs.startPage", &newTabPage); + NSTabViewItem* newTab = [[[NSTabViewItem alloc] initWithIdentifier: nil] autorelease]; CHBrowserWrapper* newView = [[[CHBrowserWrapper alloc] initWithTab: newTab andWindow: [mTabBrowser window]] autorelease]; - - [newTab setLabel: @"Untitled"]; + + [newTab setLabel: (newTabPage ? @"Loading..." : @"Untitled")]; [newTab setView: newView]; [mTabBrowser addTabViewItem: newTab]; - - [[newView getBrowserView] loadURI: @"about:blank" flags:NSLoadFlagsNone]; + + [[newView getBrowserView] loadURI: (newTabPage ? [[CHPreferenceManager sharedInstance] homePage: NO] : @"about:blank") flags:NSLoadFlagsNone]; [mTabBrowser selectLastTabViewItem: self]; diff --git a/chimera/BrowserWindowController.mm b/chimera/BrowserWindowController.mm index 69a6e2dcc5e..a10f62632fc 100644 --- a/chimera/BrowserWindowController.mm +++ b/chimera/BrowserWindowController.mm @@ -839,14 +839,18 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item"; -(void)newTab { + PRInt32 newTabPage = 0; + nsCOMPtr pref(do_GetService("@mozilla.org/preferences-service;1")); + pref->GetIntPref("browser.tabs.startPage", &newTabPage); + NSTabViewItem* newTab = [[[NSTabViewItem alloc] initWithIdentifier: nil] autorelease]; CHBrowserWrapper* newView = [[[CHBrowserWrapper alloc] initWithTab: newTab andWindow: [mTabBrowser window]] autorelease]; - - [newTab setLabel: @"Untitled"]; + + [newTab setLabel: (newTabPage ? @"Loading..." : @"Untitled")]; [newTab setView: newView]; [mTabBrowser addTabViewItem: newTab]; - - [[newView getBrowserView] loadURI: @"about:blank" flags:NSLoadFlagsNone]; + + [[newView getBrowserView] loadURI: (newTabPage ? [[CHPreferenceManager sharedInstance] homePage: NO] : @"about:blank") flags:NSLoadFlagsNone]; [mTabBrowser selectLastTabViewItem: self]; diff --git a/chimera/PreferencePanes/Navigation/Navigation.mm b/chimera/PreferencePanes/Navigation/Navigation.mm index 65ea60378f6..09872d0e7a5 100644 --- a/chimera/PreferencePanes/Navigation/Navigation.mm +++ b/chimera/PreferencePanes/Navigation/Navigation.mm @@ -64,7 +64,7 @@ const int kDefaultExpireDays = 9; if (NS_SUCCEEDED(rv) && intPref == 0) [checkboxNewWindowBlank setState:YES]; - rv = mPrefService->GetIntPref("chimera.new_tab_page", &intPref); + rv = mPrefService->GetIntPref("browser.tabs.startPage", &intPref); if (NS_SUCCEEDED(rv) && intPref == 0) [checkboxNewTabBlank setState:YES]; @@ -141,7 +141,7 @@ const int kDefaultExpireDays = 9; char *prefName = NULL; if (sender == checkboxNewTabBlank) - prefName = "chimera.new_tab_page"; + prefName = "browser.tabs.page"; else if (sender == checkboxNewWindowBlank) prefName = "browser.startup.page"; else diff --git a/chimera/src/browser/BrowserWindowController.mm b/chimera/src/browser/BrowserWindowController.mm index 69a6e2dcc5e..a10f62632fc 100644 --- a/chimera/src/browser/BrowserWindowController.mm +++ b/chimera/src/browser/BrowserWindowController.mm @@ -839,14 +839,18 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item"; -(void)newTab { + PRInt32 newTabPage = 0; + nsCOMPtr pref(do_GetService("@mozilla.org/preferences-service;1")); + pref->GetIntPref("browser.tabs.startPage", &newTabPage); + NSTabViewItem* newTab = [[[NSTabViewItem alloc] initWithIdentifier: nil] autorelease]; CHBrowserWrapper* newView = [[[CHBrowserWrapper alloc] initWithTab: newTab andWindow: [mTabBrowser window]] autorelease]; - - [newTab setLabel: @"Untitled"]; + + [newTab setLabel: (newTabPage ? @"Loading..." : @"Untitled")]; [newTab setView: newView]; [mTabBrowser addTabViewItem: newTab]; - - [[newView getBrowserView] loadURI: @"about:blank" flags:NSLoadFlagsNone]; + + [[newView getBrowserView] loadURI: (newTabPage ? [[CHPreferenceManager sharedInstance] homePage: NO] : @"about:blank") flags:NSLoadFlagsNone]; [mTabBrowser selectLastTabViewItem: self];