From a0a99c4e30564e52a6d1fc0dd344ef2921376ada Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <21@vingtetun.org>
Date: Wed, 3 Nov 2010 14:45:19 +0100
Subject: [PATCH] Bug 607922 - Once the awesome panel is opened, the Search
 button should open the open search menu [r=mfinkle]

---
 mobile/chrome/content/browser-ui.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/mobile/chrome/content/browser-ui.js b/mobile/chrome/content/browser-ui.js
index 78049114a127..1468adc3c110 100644
--- a/mobile/chrome/content/browser-ui.js
+++ b/mobile/chrome/content/browser-ui.js
@@ -837,7 +837,10 @@ var BrowserUI = {
             this.doCommand("cmd_menu");
             break;
           case "Search":
-            AllPagesList.doCommand();
+            if (!this.activePanel)
+              AllPagesList.doCommand();
+            else
+              this.doCommand("cmd_opensearch");
             break;
           default:
             break;
@@ -878,12 +881,15 @@ var BrowserUI = {
           button.setAttribute("disabled", "true");
 
         break;
-      case "NavigationPanelHidden":
+      case "NavigationPanelHidden": {
         this._edit.collapsed = true;
         this._title.collapsed = false;
 
-        document.getElementById("urlbar-icons").removeAttribute("disabled");
+        let button = document.getElementById("urlbar-icons");
+        button.removeAttribute("open");
+        button.removeAttribute("disabled");
         break;
+      }
     }
   },