From c95feacd0302adb756e06176b01012c4e439fdb1 Mon Sep 17 00:00:00 2001 From: "pinkerton%netscape.com" Date: Thu, 15 May 2003 18:38:59 +0000 Subject: [PATCH] fix a variety of crashes caused by me being stupid (window close, quit, clicking on folder button). (bug 205667) --- .../English.lproj/BrowserWindow.nib/info.nib | 8 ++++++-- .../BrowserWindow.nib/objects.nib | Bin 25276 -> 25159 bytes camino/src/browser/BrowserWindowController.mm | 11 ++++++++--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib index d95e74dd428..add74062bc0 100644 --- a/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib +++ b/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib @@ -31,7 +31,7 @@ 801 418 469 201 79 0 0 1024 746 826 - 96 451 213 78 0 0 1280 832 + 84 461 213 78 0 0 1152 848 IBFramework Version 291.0 @@ -47,7 +47,11 @@ 8 IBLockedObjects + IBOpenObjects + + 826 + IBSystem Version - 6I32 + 6L29 diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/objects.nib index f1b2c0801a1fb2961f6576576f043e1e0eff2ea4..f27fae47dfd150727751b0ff9e9e5c3399b11bca 100644 GIT binary patch literal 25159 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 diff --git a/camino/src/browser/BrowserWindowController.mm b/camino/src/browser/BrowserWindowController.mm index 9eea0240887..bb7a545d1d0 100644 --- a/camino/src/browser/BrowserWindowController.mm +++ b/camino/src/browser/BrowserWindowController.mm @@ -196,6 +196,7 @@ static NSArray* sToolbarDefaults = nil; - (void)dealloc { [fImage release]; + [super dealloc]; } - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView @@ -368,6 +369,8 @@ static NSArray* sToolbarDefaults = nil; // ensure that the browser is visible when we close. [self ensureBrowserVisible:self]; + [[NSNotificationCenter defaultCenter] removeObserver:self]; + // autorelease just in case we're here because of a window closing // initiated from gecko, in which case this BWC would still be on the // stack and may need to stay alive until it unwinds. We've already @@ -462,10 +465,13 @@ static NSArray* sToolbarDefaults = nil; // However, unlike the progress meter, this doesn't need to be in a subview from // the status bar because it is in a fixed position on the LHS. [mPopupBlocked retain]; + NSFont* savedFont = [[mPopupBlocked cell] font]; NSMenu* savedMenu = [mPopupBlocked menu]; // must cache this before replacing cell IconPopUpCell* iconCell = [[[IconPopUpCell alloc] initWithImage:[NSImage imageNamed:@"popup-blocked"]] autorelease]; [mPopupBlocked setCell:iconCell]; - //[iconCell setPreferredEdge:NSMinYEdge]; + [iconCell setFont:savedFont]; + [mPopupBlocked setToolTip:NSLocalizedString(@"A web popup was blocked", "Web Popup Toolitp")]; +// [iconCell setPreferredEdge:NSMaxYEdge]; [iconCell setMenu:savedMenu]; [iconCell setBordered:NO]; mPopupBlockSuperview = [mPopupBlocked superview]; @@ -474,7 +480,7 @@ static NSArray* sToolbarDefaults = nil; // register for notifications so we can populate the popup blocker menu // right before it's displayed. [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(buildPopupBlockerMenu:) - name:NSPopUpButtonCellWillPopUpNotification object:nil]; + name:NSPopUpButtonCellWillPopUpNotification object:iconCell]; } // Set up the toolbar's search text field @@ -2321,7 +2327,6 @@ static NSArray* sToolbarDefaults = nil; NSPopUpButton* popup = [notifier object]; // clear out existing menu. loop until we hit our special tag - NSMenu* menu = [popup menu]; int numItemsToDelete = [popup indexOfItemWithTag:kSeparatorTag]; for ( int i = 0; i < numItemsToDelete; ++i ) [popup removeItemAtIndex:0];