From be2984f89d646cc9615498fbeafede8d1cfafac3 Mon Sep 17 00:00:00 2001
From: "bugzilla%standard8.demon.co.uk" <bugzilla%standard8.demon.co.uk>
Date: Wed, 3 Jan 2007 18:57:20 +0000
Subject: [PATCH] Bug 361203 Suiterunner: More Information button doesn't work
 on Smart Browsing pane. r=KaiRo,sr=Neil

---
 suite/browser/browser-prefs.js                |  1 +
 suite/common/pref/pref-smart_browsing.js      | 20 +++++++++----------
 suite/common/pref/pref-smart_browsing.xul     |  3 ---
 .../en-US/chrome/branding/brand.properties    |  1 +
 xpfe/bootstrap/browser-prefs.js               |  1 +
 .../resources/locale/en-US/region.properties  |  1 -
 6 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/suite/browser/browser-prefs.js b/suite/browser/browser-prefs.js
index a4271f64bca4..e57c94c87791 100644
--- a/suite/browser/browser-prefs.js
+++ b/suite/browser/browser-prefs.js
@@ -151,6 +151,7 @@ pref("browser.translation.serviceDomain", "chrome://navigator-region/locale/regi
 pref("browser.related.autoload", 1);  // 0 = Always, 1 = After first use, 2 = Never
 pref("browser.related.provider", "http://www-rl.netscape.com/wtgn?");
 pref("browser.related.disabledForDomains", "");
+pref("keyword.moreInfoURL", "chrome://branding/locale/brand.properties");
 
 // Bookmarks prefs
 pref("browser.bookmarks.confirm_sorting", true);
diff --git a/suite/common/pref/pref-smart_browsing.js b/suite/common/pref/pref-smart_browsing.js
index 4820f9bb7177..17a75ab5cdd2 100644
--- a/suite/common/pref/pref-smart_browsing.js
+++ b/suite/common/pref/pref-smart_browsing.js
@@ -40,17 +40,17 @@
 function moreInfo()
 {
   var browserURL = null;
-  var regionBundle = document.getElementById("bundle_region");
-  var smartBrowsingURL = regionBundle.getString("smartBrowsingURL");
-  if (smartBrowsingURL) {
-    try {
-      browserURL = parent.hPrefWindow.getPref("string", "browser.chromeURL");
-    } catch(e) {
-    }
-    if (browserURL == null)
-      browserURL = "chrome://navigator/content/navigator.xul";
-    window.openDialog( browserURL, "_blank", "chrome,all,dialog=no", smartBrowsingURL );
+  try {
+    browserURL = parent.hPrefWindow.getPref("string", "browser.chromeURL");
+  } catch(e) {
   }
+  if (browserURL == null)
+    browserURL = "chrome://navigator/content/navigator.xul";
+
+  var formatter = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"]
+                            .getService(Components.interfaces.nsIURLFormatter);
+  window.openDialog(browserURL, "_blank", "chrome,all,dialog=no",
+                    formatter.formatURLPref("keyword.moreInfoURL"));
 }
    
 function showACAdvanced()
diff --git a/suite/common/pref/pref-smart_browsing.xul b/suite/common/pref/pref-smart_browsing.xul
index e9dcf157fb0f..ad6a228e5538 100644
--- a/suite/common/pref/pref-smart_browsing.xul
+++ b/suite/common/pref/pref-smart_browsing.xul
@@ -52,9 +52,6 @@
       onload="parent.initPanel('chrome://communicator/content/pref/pref-smart_browsing.xul');"
       headertitle="&pref.smartBrowsing.title;">
 
-  <stringbundle id="bundle_region"
-                src="chrome://global-region/locale/region.properties"/>
-
   <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-smart_browsing.js"/>
 
   <script type="application/x-javascript">
diff --git a/suite/locales/en-US/chrome/branding/brand.properties b/suite/locales/en-US/chrome/branding/brand.properties
index 14cda5554b43..aa7874b0070e 100644
--- a/suite/locales/en-US/chrome/branding/brand.properties
+++ b/suite/locales/en-US/chrome/branding/brand.properties
@@ -7,3 +7,4 @@ extensions.getMoreExtensionsURL=https://%LOCALE%.add-ons.mozilla.org/%LOCALE%/%A
 extensions.getMoreThemesURL=https://%LOCALE%.add-ons.mozilla.org/%LOCALE%/%APP%/%VERSION%/themes/
 spellchecker.dictionaries.download.url=https://%LOCALE%.add-ons.mozilla.org/%LOCALE%/%APP%/%VERSION%/dictionaries/
 app.releaseNotesURL=http://www.mozilla.org/projects/seamonkey/releases/seamonkey%VERSION%/
+keyword.moreInfoURL=http://www.mozilla.org/docs/end-user/internet-keywords.html
diff --git a/xpfe/bootstrap/browser-prefs.js b/xpfe/bootstrap/browser-prefs.js
index a6fff40cae18..975ec1138da7 100644
--- a/xpfe/bootstrap/browser-prefs.js
+++ b/xpfe/bootstrap/browser-prefs.js
@@ -150,6 +150,7 @@ pref("browser.translation.serviceDomain", "chrome://navigator-region/locale/regi
 pref("browser.related.autoload", 1);  // 0 = Always, 1 = After first use, 2 = Never
 pref("browser.related.provider", "http://www-rl.netscape.com/wtgn?");
 pref("browser.related.disabledForDomains", "");
+pref("keyword.moreInfoURL", "chrome://branding/locale/brand.properties");
 
 // Bookmarks prefs
 pref("browser.bookmarks.confirm_sorting", true);
diff --git a/xpfe/global/resources/locale/en-US/region.properties b/xpfe/global/resources/locale/en-US/region.properties
index 3b04c88041a3..4ddc6af642be 100644
--- a/xpfe/global/resources/locale/en-US/region.properties
+++ b/xpfe/global/resources/locale/en-US/region.properties
@@ -13,5 +13,4 @@ plugindoc_url=http://plugindoc.mozdev.org/
 # brand.properties
 #
 getNewThemesURL=http://mozilla.org/themes/download/
-smartBrowsingURL=http://www.mozilla.org/docs/end-user/internet-keywords.html