[Pkg-mozext-commits] [compactheader] 82/441: Update 0.99.2: Cleanup Windows XP Fix problem with RSSLinkify (turning off broke compact header view)

[David Prévot]

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

taffit pushed a commit to branch master
in repository compactheader.

commit ac53d958fb793c0db37bb34c9eefd15f89cce29e
Author: joachim.herb <none at none>
Date:   Thu Oct 29 00:13:34 2009 +0000

    Update 0.99.2:
    Cleanup Windows XP
    Fix problem with RSSLinkify (turning off broke compact header view)
---
 chrome/CompactHeader/content/compactHeaderOverlay.js  | 14 ++++++++------
 chrome/CompactHeader/content/compactHeaderOverlay.xul |  4 ++--
 chrome/CompactHeader/content/preferences.js           |  2 --
 chrome/CompactHeader/skin/windows/osdef.css           |  4 ++--
 install.rdf                                           |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index acb05af..1fb7bce 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -79,10 +79,8 @@ var prefBranch = Components.classes["@mozilla.org/preferences-service;1"]
 var coheIntegrateRSSLinkify = false;
 
 var RSSLinkify = {
-    oldSubject1L: null,
-    newSubject1L: null,
-    oldSubject2L: null,
-    newSubject2L: null
+    oldSubject: null,
+    newSubject: null
 };
 
 var coheFirstTime = true;
@@ -267,8 +265,12 @@ function coheUpdateHeaderView()
         RSSLinkify.oldSubject.setAttribute("collapsed", "false");
     }
   } else {
-    RSSLinkify.newSubject.setAttribute("collapsed", "true");
-    RSSLinkify.oldSubject.setAttribute("collapsed", "false");
+  	if (RSSLinkify.newSubject) {
+      RSSLinkify.newSubject.setAttribute("collapsed", "true");
+  	}
+  	if (RSSLinkify.oldSubject) {
+      RSSLinkify.oldSubject.setAttribute("collapsed", "false");
+  	}
   }
   if (prefBranch.getBoolPref("headersize.addressstyle")) {
     selectEmailDisplayed();
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.xul b/chrome/CompactHeader/content/compactHeaderOverlay.xul
index 35c672f..af96844 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.xul
@@ -37,7 +37,7 @@
 			<button id="hideDetailsButton"  
 							tooltiptext="&hideDetailsButton.label;"
 							onclick="coheToggleHeaderView();" 
-							class="msgHeaderView-button msgHeaderView-flat-button"/>
+							class="msgHeaderView-flat-button"/>
 	  </vbox>
 
     <hbox id="coheStringTransferBox" hidden="true">
@@ -128,7 +128,7 @@
 	    <button id="showDetailsButton"
 		          tooltiptext="&showDetailsButton.label;"
 		          onclick="coheToggleHeaderView();"
-		          class="msgHeaderView-button msgHeaderView-flat-button"/>
+		          class="msgHeaderView-flat-button"/>
     </vbox>
 		<vbox id="collapsed1LHeadersBox" flex="1" collapsed="false">
 			<hbox id="collapsed1LHeaderViewFirstLine" flex="0">
diff --git a/chrome/CompactHeader/content/preferences.js b/chrome/CompactHeader/content/preferences.js
index d923d56..fd10d21 100644
--- a/chrome/CompactHeader/content/preferences.js
+++ b/chrome/CompactHeader/content/preferences.js
@@ -76,8 +76,6 @@ function onLoad()
   loadPrefCheckbox("headersize.addressstyle", "checkbox.ShowOnlyAddress");
   
   updateTwolineView(prefBranch.getBoolPref("headersize.twolineview")); 
-
-  loadPrefCheckbox("buttons.showonlyicon", "checkbox.IconText");
 }
 
 function updateTwolineView(boolTwolineview) {
diff --git a/chrome/CompactHeader/skin/windows/osdef.css b/chrome/CompactHeader/skin/windows/osdef.css
index ae65d6f..f8cc695 100644
--- a/chrome/CompactHeader/skin/windows/osdef.css
+++ b/chrome/CompactHeader/skin/windows/osdef.css
@@ -53,7 +53,7 @@ toolbar[iconsize="small"] .hdrOtherActionsButton {
 
 toolbox[labelalign="end"] toolbar[mode="full"] .hdrJunkButton,
 toolbox[labelalign="end"] toolbar[mode="full"] toolbarpaletteitem .hdrJunkButton {
-  padding-top: 3px !important;
+  /*padding-top: 3px !important; */
 }
 
 toolbox[labelalign="end"] toolbar[mode="full"] .hdrJunkButton .toolbarbutton-icon,
@@ -68,5 +68,5 @@ toolbox[labelalign="end"] toolbar[mode="full"] toolbarpaletteitem .hdrJunkButton
 
 toolbox[labelalign="end"] toolbar[mode="full"] .hdrJunkButton .toolbarbutton-text,
 toolbox[labelalign="end"] toolbar[mode="full"] toolbarpaletteitem .hdrJunkButton .toolbarbutton-text {
-  -moz-margin-start: 2px !important;
+  /*-moz-margin-start: 2px !important; */
 }
diff --git a/install.rdf b/install.rdf
index 521081b..0550c73 100644
--- a/install.rdf
+++ b/install.rdf
@@ -6,7 +6,7 @@
 
 	<RDF:Description about="urn:mozilla:install-manifest">
 		<em:name>CompactHeader</em:name>
-		<em:version>0.99.1</em:version>
+		<em:version>0.99.2</em:version>
 		<em:description>Add ability to reduce header size to one or two lines. Linkify subjects in RSS feeds.</em:description>
 		<em:creator>Joachim Herb</em:creator>
 		<em:contributor>Zamula</em:contributor>

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