From a28e6df9f5e304f18857a2bc3aa014872c1b0cfc Mon Sep 17 00:00:00 2001
From: "mozilla.mano%sent.com"
 <mozilla.mano%sent.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 16 Sep 2005 20:40:33 +0000
Subject: [PATCH] Bug 308819 - Clicking either on the live bookmark button/menu
 or on the padlock button focuses the location bar if clickSelectsAll is
 enabled. r=mconnor.

git-svn-id: svn://10.0.0.236/trunk@180435 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/base/content/browser.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mozilla/browser/base/content/browser.js b/mozilla/browser/base/content/browser.js
index 146180bd12d..55583860b46 100644
--- a/mozilla/browser/base/content/browser.js
+++ b/mozilla/browser/base/content/browser.js
@@ -2056,7 +2056,8 @@ function URLBarFocusHandler(aEvent, aElt)
 
 function URLBarMouseDownHandler(aEvent, aElt)
 {
-  if (aElt.hasAttribute("focused")) {
+  if (aElt.hasAttribute("focused") ||
+      aEvent.target.id == "lock-icon" || aEvent.target.id == "feed-button") {
     gIgnoreClick = true;
   } else {
     gIgnoreFocus = true;