Merge lp:~pitti/ubufox/default-homepage-override into lp:ubufox

[Martin Pitt]

Allow defaults packages to set their own homepage in distribution.ini

[Chris Coulson (chrisccoulson)]

Thanks, will merge this now

review: Approve

=== modified file 'components/aboutStartpage.js'
--- components/aboutStartpage.js	2011-04-08 18:50:30 +0000
+++ components/aboutStartpage.js	2011-06-01 14:31:07 +0000
@@ -123,7 +123,13 @@
     if (!getIsOffline()) {
       let searchEngineName = getCurrentSearchEngineName();
       let release = Services.prefs.getCharPref("[e-mail]");
-      let uri = HOMEPAGE_ONLINE_PREFIX + release + "/" + searchEngineName + "/";
+      var uri;
+      // allow defaults packages to overwrite the homepage
+      try {
+        uri = Services.prefs.getCharPref("[e-mail]_homepage");
+      } catch(e) {
+        uri = HOMEPAGE_ONLINE_PREFIX + release + "/" + searchEngineName + "/";
+      }
       let channel = ios.newChannel(uri, null, null);
       channel.originalURI = aURI;
       channel.owner = principal;