3 files changed, 22 insertions, 7 deletions
diff --git a/application/palemoon/modules/QuotaManager.jsm b/application/palemoon/modules/QuotaManager.jsm
index e03161a69..48cfe88b3 100644
--- a/application/palemoon/modules/QuotaManager.jsm
+++ b/application/palemoon/modules/QuotaManager.jsm
@@ -6,8 +6,9 @@ this.EXPORTED_SYMBOLS = ["QuotaManagerHelper"];
 
 Components.utils.import('resource://gre/modules/Services.jsm');
 
-const Cc = Components.classes;
 const Ci = Components.interfaces;
+const Cc = Components.classes;
+const Cu = Components.utils;
 
 this.QuotaManagerHelper = {
   clear: function(isShutDown) {
@@ -34,12 +35,17 @@ this.QuotaManagerHelper = {
             }
           }
         }
-        var qm = Cc["@mozilla.org/dom/quota/manager;1"].getService(Ci.nsIQuotaManager);
+        var qm = Cc["@mozilla.org/dom/quota-manager-service;1"]
+                 .getService(Ci.nsIQuotaManagerService);
         for (var dom in doms) {
           var uri = Services.io.newURI(dom, null, null);
-          qm.clearStoragesForURI(uri);
+          let principal = Services.scriptSecurityManager
+                          .createCodebasePrincipal(uri, {});
+          qm.clearStoragesForPrincipal(principal);
         }
       }
-    } catch(er) {}
+    } catch(er) {
+      Cu.reportError(er);
+    }
   }
 };
diff --git a/application/palemoon/modules/WindowsPreviewPerTab.jsm b/application/palemoon/modules/WindowsPreviewPerTab.jsm
index 41b38f0cf..e186bcad2 100644
--- a/application/palemoon/modules/WindowsPreviewPerTab.jsm
+++ b/application/palemoon/modules/WindowsPreviewPerTab.jsm
@@ -510,7 +510,14 @@ TabWindow.prototype = {
 
     // Previews are internally stored using a map, so we need to iterate over
     // the tabbrowser's array of tabs to retrieve previews in the same order.
-    let inorder = [previews.get(t) for (t of tabs) if (previews.has(t))];
+    // Tycho: let inorder = [previews.get(t) for (t of tabs) if (previews.has(t))];
+    let inorder = [];
+    
+    for (let t of tabs) {
+      if (previews.has(t)) {
+        inorder.push(previews.get(t));
+      }
+    }
 
     // Since the internal taskbar array has not yet been updated, we must force
     // the sorting order of our local array on it.  To do so, we must walk
diff --git a/application/palemoon/modules/moz.build b/application/palemoon/modules/moz.build
index b3459bcd5..7620b9862 100644
--- a/application/palemoon/modules/moz.build
+++ b/application/palemoon/modules/moz.build
@@ -19,10 +19,12 @@ EXTRA_JS_MODULES += [
     'PageMenu.jsm',
     'PopupNotifications.jsm',
     'QuotaManager.jsm',
-    'SharedFrame.jsm',
-    'webrtcUI.jsm'
+    'SharedFrame.jsm'
 ]
 
+if CONFIG['MOZ_WEBRTC']:
+    EXTRA_JS_MODULES += ['webrtcUI.jsm']
+
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXTRA_JS_MODULES += [
         'Windows8WindowFrameColor.jsm',