[Pkg-mozext-commits] [compactheader] 285/441: New version 1.4.5beta1: Finalize merge for dispMUA compatibility.

[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 967e9d56ca60b10b1891e953c4c8ed946d7eddcb
Author: joachim <none at none>
Date:   Fri Sep 23 21:32:32 2011 +0200

    New version 1.4.5beta1: Finalize merge for dispMUA compatibility.
---
 chrome/CompactHeader/content/buttonsOverlay.xul         | 6 +++---
 chrome/CompactHeader/content/compactHeaderOverlay-9.xul | 6 +++---
 chrome/CompactHeader/content/compactHeaderOverlay.xul   | 6 +++---
 chrome/CompactHeader/content/toolbar.js                 | 4 +++-
 install.rdf                                             | 2 +-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/chrome/CompactHeader/content/buttonsOverlay.xul b/chrome/CompactHeader/content/buttonsOverlay.xul
index c8db9e4..381ec94 100644
--- a/chrome/CompactHeader/content/buttonsOverlay.xul
+++ b/chrome/CompactHeader/content/buttonsOverlay.xul
@@ -31,9 +31,9 @@
   image="chrome://dispmua/content/48x48/thunderbird-windows.png"
   label="display MUA"
   oncommand="dispMUA.infopopup();">
-  <observes element="dispMUAicon" attribute="src"
-            onbroadcast="org.mozdev.compactHeader.toolbar.onChangeDispMUAicon('src');"/>
-  <observes element="dispMUAicon" attribute="tooltiptext"/>
+  <observes element="dispMUAbroadcast" attribute="src"
+            onbroadcast="org.mozdev.compactHeader.toolbar.onChangeDispMUAicon();"/>
+  <observes element="dispMUAbroadcast" attribute="tooltiptext"/>
 </toolbarbutton>
 </toolbarpalette>
 
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay-9.xul b/chrome/CompactHeader/content/compactHeaderOverlay-9.xul
index e7e49b4..26bf8a2 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay-9.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay-9.xul
@@ -121,7 +121,7 @@
     </vbox>
 
     <vbox id="CompactHeader_dispMUAexp" collapsed="false">
-        <image id="CompactHeader_dispMUAiconExp" observes="dispMUAicon" tooltiptext=""
+        <image id="CompactHeader_dispMUAiconExp" observes="dispMUAbroadcast" tooltiptext=""
                style="width:48px; height:48px; margin-left:2px; margin-right:2px;"
                onclick="dispMUA.infopopup();"/>
     </vbox>
@@ -216,14 +216,14 @@
     </vbox>
 
     <vbox id="CompactHeader_dispMUA2line">
-      <image id="CompactHeader_dispMUAicon2line" observes="dispMUAicon"
+      <image id="CompactHeader_dispMUAicon2line" observes="dispMUAbroadcast"
              tooltiptext=""
              style="width:32px; height:32px; margin-left:2px; margin-right:2px;"
              onclick="dispMUA.infopopup();"/>
     </vbox>
 
     <vbox id="CompactHeader_dispMUAcompact">
-      <image id="CompactHeader_dispMUAiconCompact" observes="dispMUAicon"
+      <image id="CompactHeader_dispMUAiconCompact" observes="dispMUAbroadcast"
              tooltiptext=""
              style="width:24px; height:24px; margin:-2px 2px -2px 2px;"
              onclick="dispMUA.infopopup();"/>
diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.xul b/chrome/CompactHeader/content/compactHeaderOverlay.xul
index 063ed84..54734e7 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.xul
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.xul
@@ -121,7 +121,7 @@
     </vbox>
 
     <vbox id="CompactHeader_dispMUAexp" collapsed="false">
-        <image id="CompactHeader_dispMUAiconExp" observes="dispMUAicon" tooltiptext=""
+        <image id="CompactHeader_dispMUAiconExp" observes="dispMUAbroadcast" tooltiptext=""
                style="width:48px; height:48px; margin-left:2px; margin-right:2px;"
                onclick="dispMUA.infopopup();"/>
     </vbox>
@@ -216,14 +216,14 @@
     </vbox>
 
     <vbox id="CompactHeader_dispMUA2line">
-      <image id="CompactHeader_dispMUAicon2line" observes="dispMUAicon"
+      <image id="CompactHeader_dispMUAicon2line" observes="dispMUAbroadcast"
              tooltiptext=""
              style="width:32px; height:32px; margin-left:2px; margin-right:2px;"
              onclick="dispMUA.infopopup();"/>
     </vbox>
 
     <vbox id="CompactHeader_dispMUAcompact">
-      <image id="CompactHeader_dispMUAiconCompact" observes="dispMUAicon"
+      <image id="CompactHeader_dispMUAiconCompact" observes="dispMUAbroadcast"
              tooltiptext=""
              style="width:24px; height:24px; margin:-2px 2px -2px 2px;"
              onclick="dispMUA.infopopup();"/>
diff --git a/chrome/CompactHeader/content/toolbar.js b/chrome/CompactHeader/content/toolbar.js
index 3bad02d..c64e918 100644
--- a/chrome/CompactHeader/content/toolbar.js
+++ b/chrome/CompactHeader/content/toolbar.js
@@ -241,7 +241,7 @@ org.mozdev.compactHeader.toolbar = function() {
         hdrToolbar.lastPermanentChild = lastPermanentChild;
       }
     }
-    pub.onChangeDispMUAicon(); // XXX Check if necessary
+    pub.onChangeDispMUAicon();
     org.mozdev.compactHeader.debug.log("toolbar toggle stop");
   };
 
@@ -307,6 +307,8 @@ org.mozdev.compactHeader.toolbar = function() {
 
   pub.onChangeDispMUAicon = function() {
     org.mozdev.compactHeader.debug.log("onChangeDispMUAicon start");
+    var imageSrc = document.getElementById("dispMUAbroadcast").getAttribute("src");
+    org.mozdev.compactHeader.debug.log("onChangeDispMUAicon: " + imageSrc);
     var IconContainerDispMUA = null;
     /* toolbar button */
     if (IconContainerDispMUA = document.getElementById("CompactHeader_button-dispMUA")) {
diff --git a/install.rdf b/install.rdf
index cdbffc3..e07e407 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>1.4.3</em:version>
+		<em:version>1.4.5beta1</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