[Pkg-mozext-commits] [tabmixplus] 76/123: Move call to text_link.css from overlay files and add it as style to chrome.manifest

[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 aad2c88ceabcf74c8e578e1cb2cada36c717c2e4
Author: onemen <tabmix.onemen at gmail.com>
Date:   Thu Sep 4 18:55:27 2014 +0300

    Move call to text_link.css from overlay files and add it as style to chrome.manifest
---
 chrome.manifest                                             | 4 ++++
 chrome/content/preferences/overlay/incontentPreferences.xul | 1 -
 chrome/content/preferences/overlay/preferencesOverlay.xul   | 2 --
 chrome/content/tab/text.xml                                 | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/chrome.manifest b/chrome.manifest
index 5cb0ee9..30a1681 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -55,6 +55,10 @@ overlay   chrome://browser/content/pageinfo/pageInfo.xul            chrome://tab
 overlay   chrome://browser/content/aboutDialog.xul                  chrome://tabmixplus/content/links/text_link.xul appversion<20.0a1
 overlay   chrome://browser/content/sync/setup.xul                   chrome://tabmixplus/content/links/text_link.xul appversion<20.0a1
 overlay   chrome://mozapps/content/update/history.xul               chrome://tabmixplus/content/links/text_link.xul appversion<20.0a1
+style     chrome://browser/content/preferences/preferences.xul      chrome://tabmixplus/content/links/text_link.css appversion<20.0a1
+style     about:preferences                                         chrome://tabmixplus/content/links/text_link.css appversion<20.0a1  os=WINNT
+style     about:preferences                                         chrome://tabmixplus/content/links/text_link.css appversion<20.0a1  os=Darwin
+style     about:preferences#general                                 chrome://tabmixplus/content/links/text_link.css appversion<20.0a1  os=Linux
 
 overlay   chrome://browser/content/bookmarks/bookmarksPanel.xul     chrome://tabmixplus/content/places/places.xul
 overlay   chrome://browser/content/history/history-panel.xul        chrome://tabmixplus/content/places/places.xul
diff --git a/chrome/content/preferences/overlay/incontentPreferences.xul b/chrome/content/preferences/overlay/incontentPreferences.xul
index 625d4cd..13115f3 100644
--- a/chrome/content/preferences/overlay/incontentPreferences.xul
+++ b/chrome/content/preferences/overlay/incontentPreferences.xul
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 
-<?xml-stylesheet href="chrome://tabmixplus/content/links/text_link.css" type="text/css"?>
 <?xml-stylesheet href="chrome://tabmixplus/skin/preferencesOverlay.css" type="text/css"?>
 
 <!DOCTYPE overlay [
diff --git a/chrome/content/preferences/overlay/preferencesOverlay.xul b/chrome/content/preferences/overlay/preferencesOverlay.xul
index 7bb2675..8b9c8e1 100644
--- a/chrome/content/preferences/overlay/preferencesOverlay.xul
+++ b/chrome/content/preferences/overlay/preferencesOverlay.xul
@@ -1,7 +1,5 @@
 <?xml version="1.0"?>
 
-<?xml-stylesheet href="chrome://tabmixplus/content/links/text_link.css" type="text/css"?>
-
 <!DOCTYPE overlay [
 <!ENTITY % pref-tabmixDTD SYSTEM "chrome://tabmixplus/locale/pref-tabmix.dtd" >
 %pref-tabmixDTD;
diff --git a/chrome/content/tab/text.xml b/chrome/content/tab/text.xml
index 68f4970..713735f 100644
--- a/chrome/content/tab/text.xml
+++ b/chrome/content/tab/text.xml
@@ -9,7 +9,8 @@
     <implementation>
       <constructor>
         <![CDATA[
-           if (Tabmix.isVersion(200))
+           let topWin = Services.wm.getMostRecentWindow("navigator:browser");
+           if (!topWin || topWin.Tabmix.isVersion(200))
              return;
            eval("this.open ="+this.open.toString().replace(
              'if (uri)',

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