[Pkg-mozext-commits] [compactheader] 214/441: Merge DispMUA part of B_DispMUA_patch

[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 54a7c73a014f6ff11901daa723471ff9f1ccd79f
Merge: e871776 0240212
Author: joachim <none at none>
Date:   Mon Jun 6 23:12:31 2011 +0200

    Merge DispMUA part of B_DispMUA_patch
    
    --HG--
    branch : B_DispMUA

 .../CompactHeader/content/compactHeaderOverlay.js  | 74 ++++++++++++++++++++--
 .../CompactHeader/content/compactHeaderOverlay.xul | 18 ++++++
 install.rdf                                        |  3 +-
 3 files changed, 88 insertions(+), 7 deletions(-)

diff --cc chrome/CompactHeader/content/compactHeaderOverlay.js
index e093576,c612067..18c7750
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@@ -275,28 -325,61 +275,32 @@@ org.mozdev.compactHeader.pane = functio
        coheCheckFirstRun();
      }
  
 -    var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
 -                            .getService(Components.interfaces.nsIXULAppInfo);
 -    var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
 -                                 .getService(Components.interfaces.nsIVersionComparator);
 -    if(versionChecker.compare(appInfo.version, "3.1b2") < 0) {
 -      if (cohe.firstrun || document.getElementById("hdrReplyAllButton") == null) {
 -        org.mozdev.customizeHeaderToolbar.pane.CHTSetDefaultButtons();
 -        cohe.firstrun = false;
 -      }
 -    }
 -    else {
 -      if (cohe.firstrun) {
 -        org.mozdev.customizeHeaderToolbar.pane.CHTSetDefaultButtons();
 -        cohe.firstrun = false;
 -      }
 -    }
 -
 +    coheToggleHeaderContent();
+     var dispMUA = document.getElementById('dispMUA');
+     if (dispMUA) {
+       dispMUA.collapsed = true;
+     }
 -
 -    debugLog("mid coheOnLoadMsgHeaderPane 4");
      setButtonStyle();
      org.mozdev.customizeHeaderToolbar.messenger.saveToolboxData();
 -    delayedCurrentToolboxPosition(200);
      dispMUACheck();
 -    //coheToggleHeaderContent();
 -    
 -    debugLog("mid coheOnLoadMsgHeaderPane 5");
 -    var messengerWindow = document.getElementById("messengerWindow");
 -    if (messengerWindow) {
 -      messengerWindow.addEventListener('messagepane-hide',   onMessagePaneHide, false);
 -      messengerWindow.addEventListener('messagepane-unhide', onMessagePaneUnHide, false);
 -    }
 -    
 -    debugLog("stop coheOnLoadMsgHeaderPane");
    }
 -
 -  var coheMessageListener =
 +  
 +  var coheMessageListener = 
    {
 -    onStartHeaders:
 +    onStartHeaders: 
      function cML_onStartHeaders () {
 -        gCoheBuiltCollapsedView = false;
 +        gCoheBuiltCollapsedView = false;    
      },
 -
 -    onEndHeaders:
 +    
 +    onEndHeaders: 
      function cML_onEndHeaders() {
 -      ClearHeaderView(gCoheCollapsedHeaderView);
 +      ClearHeaderView(gCoheCollapsedHeaderView);  
        coheUpdateMessageHeaders();
      },
 -
 +    
      onEndAttachments: function cML_onEndAttachments(){}
    };
 -
 +  
    pub.coheOnUnloadMsgHeaderPane = function()
    {
      Components.classes["@mozilla.org/abmanager;1"]
diff --cc install.rdf
index 07f11fb,5f1d47e..125b267
--- a/install.rdf
+++ b/install.rdf
@@@ -6,7 -6,7 +6,7 @@@
  
  	<RDF:Description about="urn:mozilla:install-manifest">
  		<em:name>CompactHeader</em:name>
- 		<em:version>1.4.0</em:version>
 -		<em:version>1.3.0-dispMUA-beta6</em:version>
++		<em:version>1.4.1beta1</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