[Pkg-mozext-commits] [tabmixplus] 33/107: Incompatibility with Tree Style Tab extension

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository tabmixplus.

commit fab65bf492a6c4662e6ca0a099c73948f33c6b0c
Author: onemen <tabmix.onemen at gmail.com>
Date:   Tue Oct 27 23:26:06 2015 +0200

    Incompatibility with Tree Style Tab extension
---
 chrome/content/links/setup.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/chrome/content/links/setup.js b/chrome/content/links/setup.js
index 86893c9..e15e57b 100644
--- a/chrome/content/links/setup.js
+++ b/chrome/content/links/setup.js
@@ -191,9 +191,12 @@ Tabmix.beforeBrowserInitOnLoad = function() {
     }
 
     // At the moment we must init TabmixSessionManager before sessionStore.init
-    var [obj, fn] = "gBrowserInit" in window ?
-          [gBrowserInit, "gBrowserInit._delayedStartup"] :
-          [window, "delayedStartup"];
+    var fn;
+    if (typeof gBrowserInit.__treestyletab___delayedStartup == "function") {
+      fn = "gBrowserInit.__treestyletab___delayedStartup";
+    } else {
+      fn = "gBrowserInit._delayedStartup";
+    }
 
     let insertionPoint, ssPromise = "";
     if (this.isVersion(250, 250)) {
@@ -204,7 +207,7 @@ Tabmix.beforeBrowserInitOnLoad = function() {
     else
       insertionPoint = 'Services.obs.addObserver';
 
-    this.changeCode(obj, fn)._replace(
+    this.changeCode(gBrowserInit, fn)._replace(
       'Services.obs.addObserver', loadOnStartup, {check: this.isVersion(190) && !!loadOnStartup}
     )._replace(
       insertionPoint,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git