From fa72057b3bcfcd67c81fb26c250f4a950afde70b Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Tue, 22 Sep 2009 18:05:20 -0400
Subject: [PATCH] Bug 518014: preference about:fennec button doesn't show
 webpage, r=gavin

---
 mobile/chrome/content/browser-ui.js | 6 ++----
 mobile/chrome/content/browser.xul   | 4 ++--
 mobile/chrome/content/downloads.js  | 4 +---
 mobile/chrome/content/extensions.js | 4 +---
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/mobile/chrome/content/browser-ui.js b/mobile/chrome/content/browser-ui.js
index 1364fbcc8d9..2b7fdb36194 100644
--- a/mobile/chrome/content/browser-ui.js
+++ b/mobile/chrome/content/browser-ui.js
@@ -537,10 +537,6 @@ var BrowserUI = {
     this.goToURI(list.selectedItem.value);
   },
 
-  showHistory : function() {
-    // XXX Fix me with a real UI
-  },
-
   showBookmarks : function () {
     BookmarkList.show();
   },
@@ -549,6 +545,8 @@ var BrowserUI = {
     aURI = aURI || "about:blank";
     let tab = Browser.addTab(aURI, true);
 
+    this.hidePanel();
+    
     if (aURI == "about:blank") {
       this.showToolbar(true);
       this.showAutoComplete();
diff --git a/mobile/chrome/content/browser.xul b/mobile/chrome/content/browser.xul
index 294d7a44389..f0b69a6a0e7 100644
--- a/mobile/chrome/content/browser.xul
+++ b/mobile/chrome/content/browser.xul
@@ -358,9 +358,9 @@
 #ifdef MOZ_OFFICIAL_BRANDING
 # these two point to the same page, this just matters for what shows up in the
 # URL bar
-                        oncommand="Browser.addTab('about:firefox', true);"/>
+                        oncommand="BrowserUI.newTab('about:firefox', true);"/>
 #else
-                        oncommand="Browser.addTab('about:fennec', true);"/>
+                        oncommand="BrowserUI.newTab('about:fennec', true);"/>
 #endif
               </setting>
               <setting id="prefs-uilanguage" title="&language.title;" type="control">
diff --git a/mobile/chrome/content/downloads.js b/mobile/chrome/content/downloads.js
index fdd2310ed34..3303fc7df9e 100644
--- a/mobile/chrome/content/downloads.js
+++ b/mobile/chrome/content/downloads.js
@@ -380,10 +380,8 @@ var DownloadsView = {
 
   showPage: function dv_showPage(aItem) {
     let uri = this._getReferrerOrSource(aItem);
-    if (uri) {
+    if (uri)
       BrowserUI.newTab(uri);
-      BrowserUI.hidePanel();
-    }
   },
 
   observe: function (aSubject, aTopic, aData) {
diff --git a/mobile/chrome/content/extensions.js b/mobile/chrome/content/extensions.js
index fd9cce73fa0..ab16a47823e 100644
--- a/mobile/chrome/content/extensions.js
+++ b/mobile/chrome/content/extensions.js
@@ -502,10 +502,8 @@ var ExtensionsView = {
 
   showPage: function ev_showPage(aItem) {
     let uri = aItem.getAttribute("homepageURL");
-    if (uri) {
+    if (uri)
       BrowserUI.newTab(uri);
-      BrowserUI.hidePanel();
-    }
   },
 
   resetSearch: function ev_resetSearch() {