← Back to branch summary

~ubuntu-branches/ubuntu/natty/ubufox/natty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/02_fix_about_home.patch

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2011-04-09 00:08:51 UTC
  • mfrom: (1.1.21 upstream)
  • Revision ID: james.westby@ubuntu.com-20110409000851-5wd2d1p8cws3y3u8
Tags: 0.9-0ubuntu1
https://launchpad.net/bugs/750305
https://launchpad.net/bugs/752364
https://launchpad.net/bugs/728826
https://launchpad.net/bugs/709125
* New upstream release v0.9
* All patches are merged in to the upstream branch now

* Fix LP: #750305 - Please update links and configs for Natty release.
  Rather than doing this manually for every release, we add a dist.js with
  distro information (populated at build time with lsb_release) and just
  do all this automatically.
* Fix LP: #752364 - Plugin Finder Service never finds anything. Use the
  release info in dist.js to construct the URL, now that this got dropped
  from Firefox
* Fix LP: #728826 - Update icons to new versions.
* Drop the pluginGlue.js module. This didn't work, as we can no longer
  use a modules registerSelf method to use nsICategoryManager at startup,
  due to the XPCOM registration changes in Firefox 4. Instead, add
  category entries with the chrome.manifest
* Fix LP: #709125 - User agent doesn't include Ubuntu in it so
  apt.ubuntu.com doesn't work. We add an extra X-Ubuntu HTTP header in
  requests to apt.ubuntu.com, rather than send this information out in
  every request in the UA string

* Add build-depend on lsb-release so we can create dist.js

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_fix_about_home.patch
1
 
=== modified file 'components/aboutHome.js'
2
 
--- ubufox/components/aboutHome.js      2010-04-09 13:17:27 +0000
3
 
+++ ubufox/components/aboutHome.js      2010-07-17 19:05:27 +0000
4
 
@@ -43,7 +43,7 @@
5
 
 var HOMEPAGE_OFFLINE = "file:///usr/share/ubuntu-artwork/home/index.html";
6
 
 var HOMEPAGE_OFFLINE_TMPL = "/usr/share/ubuntu-artwork/home/locales/index-"
7
 
 
8
 
-var HOMEPAGE_ONLINE_PREFIX = "http://start.ubuntu.com/10.04/";
9
 
+var HOMEPAGE_ONLINE_PREFIX = "http://start.ubuntu.com/10.04";
10
 
 
11
 
 function getIsOffline() {
12
 
   var ios = Cc["@mozilla.org/network/io-service;1"]
13
 
@@ -121,7 +121,8 @@
14
 
 
15
 
     if (!getIsOffline()) {
16
 
       let searchEngineName = getCurrentSearchEngineName();
17
 
-      let channel = ios.newChannel(HOMEPAGE_ONLINE_PREFIX + "/" + searchEngineName + "/", null, null);
18
 
+      let uri = HOMEPAGE_ONLINE_PREFIX + "/" + searchEngineName + "/";
19
 
+      let channel = ios.newChannel(uri, null, null);
20
 
       channel.originalURI = aURI;
21
 
       channel.owner = principal;
22
 
       return channel;
23