Updated to v31.4.0ESR

 * Search form in about:icecat now searches in default search engine
 * Disabled accessibility.blockautorefresh
 * Replaced references to Open Source with Free Software where applicable
 * Added html5-video-everywhere v0.1.1 extension: https://github.com/lejenome/html5-video-everywhere
 * Updated LibreJS to 6.0.8

Build scripts updated to use pbuilder

1 files changed, 6 insertions, 4 deletions

diff --git a/data/extensions/https-everywhere@eff.org/chrome/content/code/ChannelReplacement.js b/data/extensions/https-everywhere@eff.org/chrome/content/code/ChannelReplacement.js
index 551bcab..ca70939 100644
--- a/data/extensions/https-everywhere@eff.org/chrome/content/code/ChannelReplacement.js
+++ b/data/extensions/https-everywhere@eff.org/chrome/content/code/ChannelReplacement.js
@@ -1,3 +1,5 @@
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+
 function CtxCapturingListener(tracingChannel, captureObserver) {

   this.originalListener = tracingChannel.setNewListener(this);

   this.captureObserver = captureObserver;

@@ -13,7 +15,7 @@ CtxCapturingListener.prototype = {
   },

   onDataAvailable: function(request, ctx, inputStream, offset, count) {},

   onStopRequest: function(request, ctx, statusCode) {},

-  QueryInterface: xpcom_generateQI([Ci.nsIStreamListener])

+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIStreamListener])

 };

 

 function ChannelReplacement(chan, newURI, newMethod) {

@@ -211,7 +213,7 @@ ChannelReplacement.prototype = {
   

   _redirectCallback: ("nsIAsyncVerifyRedirectCallback" in Ci)

     ? {

-        QueryInterface: xpcom_generateQI([Ci.nsIAsyncVerifyRedirectCallback]),

+        QueryInterface: XPCOMUtils.generateQI([Ci.nsIAsyncVerifyRedirectCallback]),

         onRedirectVerifyCallback: function(result) {}

       }

     : null

@@ -332,7 +334,7 @@ function LoadGroupWrapper(channel, callback) {
   channel.loadGroup = this;

 }

 LoadGroupWrapper.prototype = {

-  QueryInterface: xpcom_generateQI([Ci.nsILoadGroup]),

+  QueryInterface: XPCOMUtils.generateQI([Ci.nsILoadGroup]),

   

   get activeCount() {

     return this._inner ? this._inner.activeCount : 0;

@@ -380,7 +382,7 @@ LoadGroupWrapper.prototype = {
     if (this._channel.loadGroup) this._channel.loadGroup = this._inner;

   },

   _emptyEnum: {

-    QueryInterface: xpcom_generateQI([Ci.nsISimpleEnumerator]),

+    QueryInterface: XPCOMUtils.generateQI([Ci.nsISimpleEnumerator]),

     getNext: function() { return null; },

     hasMoreElements: function() { return false; }

   }