From df6a4e9f2aecbef25d284f60cd71dbcd4a3623d7 Mon Sep 17 00:00:00 2001 From: "bryner%netscape.com" Date: Wed, 2 Jul 2003 00:13:40 +0000 Subject: [PATCH] Fix crash when a new page loads while the previous page's context menu is active, and Customize is in the toolbar (bug 168051). r=pinkerton. git-svn-id: svn://10.0.0.236/trunk@144366 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/camino/src/browser/BrowserWindowController.h | 1 - mozilla/camino/src/browser/BrowserWindowController.mm | 7 ------- 2 files changed, 8 deletions(-) diff --git a/mozilla/camino/src/browser/BrowserWindowController.h b/mozilla/camino/src/browser/BrowserWindowController.h index 1e4d987d8ee..9a14af77235 100644 --- a/mozilla/camino/src/browser/BrowserWindowController.h +++ b/mozilla/camino/src/browser/BrowserWindowController.h @@ -199,7 +199,6 @@ typedef enum - (void)loadURL:(NSString*)aURLSpec referrer:(NSString*)aReferrer activate:(BOOL)activate; - (void)updateLocationFields:(NSString *)locationString; - (void)updateSiteIcons:(NSImage *)siteIconImage; -- (void)updateToolbarItems; - (void)loadingStarted; - (void)loadingDone; - (void)focusURLBar; diff --git a/mozilla/camino/src/browser/BrowserWindowController.mm b/mozilla/camino/src/browser/BrowserWindowController.mm index 7b88e35143b..71536de529f 100644 --- a/mozilla/camino/src/browser/BrowserWindowController.mm +++ b/mozilla/camino/src/browser/BrowserWindowController.mm @@ -982,21 +982,14 @@ static NSArray* sToolbarDefaults = nil; - (void)loadingStarted { - [self updateToolbarItems]; [self startThrobber]; } - (void)loadingDone { - [self updateToolbarItems]; [self stopThrobber]; [mHistoryDataSource refresh]; } - -- (void)updateToolbarItems -{ - [[[self window] toolbar] validateVisibleItems]; -} - (void)performAppropriateLocationAction {