[Pkg-mozext-commits] [tabmixplus] 43/51: Update changeset d6d2bef4a2e0, Classic theme restorer control close tab button only when the default theme is in use

[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 ab8ef9cce83ae7d6a50d3b1b40d3148b86115485
Author: onemen <tabmix.onemen at gmail.com>
Date:   Wed Jan 21 09:15:38 2015 +0200

    Update changeset d6d2bef4a2e0, Classic theme restorer control close tab button only when the default theme is in use
---
 chrome/content/extensions/extensions.js | 6 ++++--
 chrome/content/tab/tab.js               | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/chrome/content/extensions/extensions.js b/chrome/content/extensions/extensions.js
index e5f5af0..566e09a 100644
--- a/chrome/content/extensions/extensions.js
+++ b/chrome/content/extensions/extensions.js
@@ -27,8 +27,10 @@ var TMP_extensionsCompatibility = {
       Tabmix.extensions.ctr = true;
       let onLeft = Tabmix.prefs.getBoolPref("tabs.closeButtons.onLeft");
       Services.prefs.setBoolPref("extensions.classicthemerestorer.closeonleft", onLeft);
-      // let Classic theme restorer control close tab button placement
-      gBrowser.tabContainer.setAttribute("closebuttons-side", "right");
+      // let Classic theme restorer control close tab button placement when the
+      // default theme is in use.
+      if (Services.prefs.getCharPref("general.skins.selectedSkin") == "classic/1.0")
+        gBrowser.tabContainer.setAttribute("closebuttons-side", "right");
     }
 
     // sessionManager extension is restartless since version 0.8
diff --git a/chrome/content/tab/tab.js b/chrome/content/tab/tab.js
index fee419a..4b62b47 100644
--- a/chrome/content/tab/tab.js
+++ b/chrome/content/tab/tab.js
@@ -1306,7 +1306,10 @@ var gTMPprefObserver = {
         break;
       case "extensions.tabmix.tabs.closeButtons.onLeft":
       case "extensions.classicthemerestorer.closeonleft":
-        if (Tabmix.extensions.ctr) {
+        // let Classic theme restorer control close tab button placement when
+        // the default theme is in use.
+        if (Tabmix.extensions.ctr &&
+            Services.prefs.getCharPref("general.skins.selectedSkin") == "classic/1.0") {
           let otherPref = prefName == "extensions.tabmix.tabs.closeButtons.onLeft" ?
                                       "extensions.classicthemerestorer.closeonleft" :
                                       "extensions.tabmix.tabs.closeButtons.onLeft";

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