[Pkg-mozext-commits] [tabmixplus] 10/26: Remove support for Firefox 19 - browser.warnOnRestart was removed

[David Prévot]

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

taffit pushed a commit to tag 0.4.2.3pre.160319a1
in repository tabmixplus.

commit 606ac0ab571e53efe070172eb0f65311d5cd7e2b
Author: onemen <tabmix.onemen at gmail.com>
Date:   Sat Mar 12 19:00:18 2016 +0200

    Remove support for Firefox 19 - browser.warnOnRestart was removed
---
 chrome/content/preferences/preferences.js |  3 ---
 chrome/content/preferences/session.js     |  6 ------
 chrome/content/preferences/session.xul    |  2 --
 chrome/content/session/sessionStore.js    | 12 +++---------
 chrome/content/tab/tab.js                 |  2 --
 5 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/chrome/content/preferences/preferences.js b/chrome/content/preferences/preferences.js
index e7a5716..4b24061 100644
--- a/chrome/content/preferences/preferences.js
+++ b/chrome/content/preferences/preferences.js
@@ -365,9 +365,6 @@ XPCOMUtils.defineLazyGetter(window, "gPreferenceList", function() {
     "toolkit.scrollbox.clickToScroll.scrollDelay", "toolkit.scrollbox.smoothScroll"
   ];
 
-  if (!Tabmix.isVersion(200))
-    otherPrefs.push("browser.warnOnRestart");
-
   let prefs = Services.prefs.getDefaultBranch("");
   let tabmixPrefs = Services.prefs.getChildList("extensions.tabmix.").sort();
   // filter out preference without default value
diff --git a/chrome/content/preferences/session.js b/chrome/content/preferences/session.js
index 76c57b3..d14ca62 100644
--- a/chrome/content/preferences/session.js
+++ b/chrome/content/preferences/session.js
@@ -13,9 +13,6 @@ var gSessionPane = {
     this.isSessionStoreEnabled(true);
     this.updateSessionShortcuts();
 
-    if (Tabmix.isVersion(200))
-      gPrefWindow.removeChild("pref_browser.warnOnRestart");
-
     gPrefWindow.initPane("paneSession");
   },
 
@@ -65,9 +62,6 @@ var gSessionPane = {
 
     // sessionstore pref
     function sessionstorePrefs() {
-      // browser.warnOnRestart remove on Firefox 20
-      if (!Tabmix.isVersion(200))
-        updatePrefs("browser.warnOnRestart", !useSessionManager);
       updatePrefs("browser.warnOnQuit", !useSessionManager);
       updatePrefs("resume_from_crash", !useSessionManager);
       // "browser.startup.page"
diff --git a/chrome/content/preferences/session.xul b/chrome/content/preferences/session.xul
index c0c3b89..07da5f7 100644
--- a/chrome/content/preferences/session.xul
+++ b/chrome/content/preferences/session.xul
@@ -28,8 +28,6 @@
                   onchange="gSessionPane.updateSessionShortcuts();"/>
       <preference id="pref_sessionCrashRecovery"
                   name="extensions.tabmix.sessions.crashRecovery"            type="bool"/>
-      <preference id="pref_browser.warnOnRestart"
-                  name="browser.warnOnRestart"                               type="bool"/>
       <preference id="pref_browser.warnOnQuit"
                   name="browser.warnOnQuit"                                  type="bool"/>
       <preference id="pref_browserStartupPage"
diff --git a/chrome/content/session/sessionStore.js b/chrome/content/session/sessionStore.js
index 80dd8d2..027dcb3 100644
--- a/chrome/content/session/sessionStore.js
+++ b/chrome/content/session/sessionStore.js
@@ -185,7 +185,7 @@ var TMP_SessionStore = { // jshint ignore:line
         } else {
           // we don't change any of sessionstore default setting
           // the user will be ask on exit what to do.
-          // (browser.warnOnRestart and browser.warnOnQuit are both true on default)
+          // browser.warnOnQuit default value is true
           Services.prefs.setBoolPref(TMP_SS_MANAGER, false);
           Services.prefs.setBoolPref(TMP_SS_CRASHRECOVERY, false);
         }
@@ -195,12 +195,8 @@ var TMP_SessionStore = { // jshint ignore:line
                                         [title, msg, "", "", buttons], window, start ? callBack : null);
       if (!start)
         callBack(result);
-    } else if (!Services.prefs.prefHasUserValue("browser.warnOnRestart") ||
-               !Services.prefs.prefHasUserValue("browser.warnOnQuit ")) {
-      // when user start new profile or update from firefox 2.0 profile
-      // browser.warnOnRestart and browser.warnOnQuit are both true on default
-      if (!Tabmix.isVersion(200))
-        Services.prefs.setBoolPref("browser.warnOnRestart", false);
+    } else if (!Services.prefs.prefHasUserValue("browser.warnOnQuit ")) {
+      // browser.warnOnQuit default value is true
       Services.prefs.setBoolPref("browser.warnOnQuit", false);
       TabmixSvc.sm.settingPreference = false;
     }
@@ -255,8 +251,6 @@ var TMP_SessionStore = { // jshint ignore:line
   },
 
   setSessionRestore: function(aEnable) {
-    if (!Tabmix.isVersion(200))
-      Services.prefs.setBoolPref("browser.warnOnRestart", aEnable);
     Services.prefs.setBoolPref("browser.warnOnQuit", aEnable);
     Services.prefs.setBoolPref("browser.sessionstore.resume_from_crash", aEnable);
     if (aEnable)
diff --git a/chrome/content/tab/tab.js b/chrome/content/tab/tab.js
index bc9a7fb..c86629f 100644
--- a/chrome/content/tab/tab.js
+++ b/chrome/content/tab/tab.js
@@ -1222,7 +1222,6 @@ gTMPprefObserver = {
       if (condition)
         this.OBSERVING.push(pref);
     }.bind(this);
-    addObserver("browser.warnOnRestart", !Tabmix.isVersion(200));
     addObserver("browser.tabs.autoHide", !Tabmix.isVersion(230));
     addObserver("layout.css.devPixelsPerPx", TabmixSvc.australis);
     addObserver("browser.tabs.onTop", !Tabmix.isVersion(290));
@@ -1495,7 +1494,6 @@ gTMPprefObserver = {
         TMP_ClosedTabs.setButtonDisableState(state);
         break;
       }
-      case "browser.warnOnRestart":
       case "browser.warnOnQuit":
       case "browser.sessionstore.resume_from_crash":
         if (!Services.prefs.getBoolPref(prefName))

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