[Pkg-mozext-commits] [tabmixplus] 06/13: Don't change session preference when Session manager extension installed

[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 d1b7e704a7b7b060db9bd45eb98ef898b4d43290
Author: onemen <tabmix.onemen at gmail.com>
Date:   Wed Oct 15 22:01:35 2014 +0300

    Don't change session preference when Session manager extension installed
---
 chrome/content/preferences/preferences.js | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/chrome/content/preferences/preferences.js b/chrome/content/preferences/preferences.js
index b6795d0..33b308c 100644
--- a/chrome/content/preferences/preferences.js
+++ b/chrome/content/preferences/preferences.js
@@ -300,6 +300,11 @@ function setPrefAfterImport(aPref) {
   return false;
 }
 
+let sessionPrefs = ["browser.sessionstore.resume_from_crash",
+                    "browser.startup.page",
+                    "extensions.tabmix.sessions.manager",
+                    "extensions.tabmix.sessions.crashRecovery"];
+
 XPCOMUtils.defineLazyGetter(window, "gPreferenceList", function() {
   // other settings not in extensions.tabmix. branch that we save
   let otherPrefs = ["browser.allTabs.previews","browser.ctrlTab.previews",
@@ -331,11 +336,18 @@ XPCOMUtils.defineLazyGetter(window, "gPreferenceList", function() {
   return tabmixPrefs;
 });
 
+__defineGetter__("_sminstalled", function() {
+  return Tabmix.getTopWin().Tabmix.extensions.sessionManager;
+});
+
 function defaultSetting() {
   // set flag to prevent TabmixTabbar.updateSettings from run for each change
   Tabmix.prefs.setBoolPref("setDefault", true);
   Shortcuts.prefsChangedByTabmix = true;
-  gPreferenceList.forEach(function(pref) {
+  let SMinstalled = _sminstalled;
+  let prefs = !SMinstalled ? gPreferenceList :
+      gPreferenceList.map(function(pref) sessionPrefs.indexOf(pref) == -1);
+  prefs.forEach(function(pref) {
     Services.prefs.clearUserPref(pref);
   });
   // we enable our session manager on default
@@ -435,11 +447,14 @@ function loadData (pattern) {
   Tabmix.prefs.setBoolPref("setDefault", true);
 
   // disable both Firefox & Tabmix session manager to prevent our prefs observer to block the change
-  Tabmix.prefs.setBoolPref("sessions.manager", false);
-  Tabmix.prefs.setBoolPref("sessions.crashRecovery", false);
-  Services.prefs.setBoolPref("browser.sessionstore.resume_from_crash", false);
-  Services.prefs.setIntPref("browser.startup.page", false);
-  Services.prefs.savePrefFile(null);
+  let SMinstalled = _sminstalled;
+  if (!SMinstalled) {
+    Tabmix.prefs.setBoolPref("sessions.manager", false);
+    Tabmix.prefs.setBoolPref("sessions.crashRecovery", false);
+    Services.prefs.setBoolPref("browser.sessionstore.resume_from_crash", false);
+    Services.prefs.setIntPref("browser.startup.page", 0);
+    Services.prefs.savePrefFile(null);
+  }
 
   // set updateOpenedTabsLockState before lockallTabs and lockAppTabs
   let pref = "extensions.tabmix.updateOpenedTabsLockState=";
@@ -453,6 +468,8 @@ function loadData (pattern) {
     let index = pattern[i].indexOf("=");
     if (index > 0){
       prefName  = pattern[i].substring(0,index);
+      if (SMinstalled && sessionPrefs.indexOf(prefName) > -1)
+        continue;
       prefValue = pattern[i].substring(index+1,pattern[i].length);
       setPrefByType(prefName, prefValue, true);
     }

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