bug 391130 - View->Apply Theme->Get New Themes doesn't work, p=aqualon@aquachan.de, r=Neil

suite/browser/hiddenWindow.xul

@@ -79,7 +79,6 @@
     <stringbundle id="bundle_navigator" src="chrome://navigator/locale/navigator.properties"/>
     <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="bundle_navigator_region" src="chrome://navigator-region/locale/region.properties"/>
-    <stringbundle id="bundle_brand_region" src="chrome://global-region/locale/region.properties"/>
   </stringbundleset>
 
   <!-- keys are appended from the overlay -->

suite/browser/navigator.js

@@ -49,7 +49,6 @@ var gSearchService = null;
 var gNavigatorBundle;
 var gBrandBundle;
 var gNavigatorRegionBundle;
-var gBrandRegionBundle;
 var gLastValidURLStr = "";
 var gLastValidURL = null;
 var gClickSelectsAll = false;
@@ -516,7 +515,6 @@ function Startup()
   gNavigatorBundle = document.getElementById("bundle_navigator");
   gBrandBundle = document.getElementById("bundle_brand");
   gNavigatorRegionBundle = document.getElementById("bundle_navigator_region");
-  gBrandRegionBundle = document.getElementById("bundle_brand_region");
 
   gBrowser = document.getElementById("content");
   gURLBar = document.getElementById("urlbar");
@@ -1790,7 +1788,6 @@ function hiddenWindowStartup()
   // init string bundles
   gNavigatorBundle = document.getElementById("bundle_navigator");
   gNavigatorRegionBundle = document.getElementById("bundle_navigator_region");
-  gBrandRegionBundle = document.getElementById("bundle_brand_region");
   gBrandBundle = document.getElementById("bundle_brand");
 
   // now load bookmarks after a delay
@@ -2037,7 +2034,15 @@ function applyTheme(themeName)
 
 function getNewThemes()
 {
-  openTopWin(gBrandRegionBundle.getString("getNewThemesURL"));
+  // get URL for more themes from prefs
+  try {
+    var formatter = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"]
+                              .getService(Components.interfaces.nsIURLFormatter);
+    openTopWin(formatter.formatURLPref("extensions.getMoreThemesURL"));
+  }
+  catch (ex) { 
+    dump(ex); 
+  }
 }
 
 function URLBarFocusHandler(aEvent)

suite/browser/navigator.xul

@@ -100,7 +100,6 @@
     <stringbundle id="bundle_navigator" src="chrome://navigator/locale/navigator.properties"/>
     <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="bundle_navigator_region" src="chrome://navigator-region/locale/region.properties"/>
-    <stringbundle id="bundle_brand_region" src="chrome://global-region/locale/region.properties"/>
     <stringbundle id="findBundle" src="chrome://global/locale/finddialog.properties"/>
   </stringbundleset>