[Pkg-mozext-commits] [tabmixplus] 12/107: Fix compatibility with Cyberfox 41, NewTabURL.jsm not exist

[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 ce0dbead7e55ffe2aa6a9177ec580d305bc4e8cc
Author: onemen <tabmix.onemen at gmail.com>
Date:   Sat Oct 10 22:36:52 2015 +0300

    Fix compatibility with Cyberfox 41, NewTabURL.jsm not exist
---
 modules/Services.jsm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/Services.jsm b/modules/Services.jsm
index e2cce94..829454b 100644
--- a/modules/Services.jsm
+++ b/modules/Services.jsm
@@ -187,7 +187,7 @@ this.TabmixSvc = {
       if (isVersion(320))
         prefs.setBoolPref("extensions.tabmix.tabcontext.openNonRemoteWindow", true);
 
-      if (isVersion(410)) {
+      if (isVersion(410) && !TabmixSvc.isCyberfox) {
         prefs.setCharPref(TabmixSvc.newtabUrl, TabmixSvc.aboutNewtab);
         Cu.import("resource://tabmixplus/NewTabURL.jsm", {});
       }
@@ -288,6 +288,10 @@ XPCOMUtils.defineLazyGetter(TabmixSvc, "isLinux", function() {
   return Services.appinfo.OS == "Linux";
 });
 
+XPCOMUtils.defineLazyGetter(TabmixSvc, "isCyberfox", function() {
+  return Services.appinfo.name == "Cyberfox";
+});
+
 XPCOMUtils.defineLazyGetter(TabmixSvc, "isPaleMoon", function() {
   return Services.appinfo.name == "Pale Moon";
 });

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