From 625cd584dc0fd14db3abdfef8af34df4a19ce7fa Mon Sep 17 00:00:00 2001 From: "timeless%mozdev.org" Date: Tue, 7 Dec 2004 21:39:08 +0000 Subject: [PATCH] Bug 123340 tabbed browser calls onLinkIconAvailable not defined on nsIProgressMeter r=bz sr=neil git-svn-id: svn://10.0.0.236/trunk@166416 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/toolkit/content/widgets/tabbrowser.xml | 4 ++-- mozilla/xpfe/global/resources/content/bindings/tabbrowser.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/toolkit/content/widgets/tabbrowser.xml b/mozilla/toolkit/content/widgets/tabbrowser.xml index 138ab46871f..f4290b072c7 100644 --- a/mozilla/toolkit/content/widgets/tabbrowser.xml +++ b/mozilla/toolkit/content/widgets/tabbrowser.xml @@ -572,7 +572,7 @@ if (listener.mIcon) { if (this.isFavIconKnownMissing(listener.mIcon)) listener.mIcon = null; - else + else if ('onLinkIconAvailable' in p) p.onLinkIconAvailable(newBrowser, listener.mIcon); } } @@ -743,7 +743,7 @@ var targetBrowser = tabBrowser.getBrowserAtIndex(browserIndex); for (i = 0; i < tabBrowser.mProgressListeners.length; i++) { var p = tabBrowser.mProgressListeners[i]; - if (p) + if (p && 'onLinkIconAvailable' in p) p.onLinkIconAvailable(targetBrowser, href); } } diff --git a/mozilla/xpfe/global/resources/content/bindings/tabbrowser.xml b/mozilla/xpfe/global/resources/content/bindings/tabbrowser.xml index 56e9762843f..3fdff4e2dc5 100644 --- a/mozilla/xpfe/global/resources/content/bindings/tabbrowser.xml +++ b/mozilla/xpfe/global/resources/content/bindings/tabbrowser.xml @@ -527,7 +527,7 @@ if (securityUI) p.onSecurityChange(webProgress, null, securityUI.state); var listener = this.mTabListeners[this.mPanelContainer.selectedIndex]; - if (listener.mIcon) + if (listener.mIcon && 'onLinkIconAvailable' in p) p.onLinkIconAvailable(listener.mIcon); } } @@ -696,7 +696,7 @@ if (notifyListeners && this.mProgressListeners) { for (i = 0; i < this.mProgressListeners.length; i++) { var p = this.mProgressListeners[i]; - if (p) + if (p && 'onLinkIconAvailable' in p) p.onLinkIconAvailable(href); } }