File:  [mozdev] / compactheader / www / CompactHeader-1.1.7-1.2.0.diff
Revision 1.1: download - view: text, annotated - select for diffs - revision graph
Tue May 4 18:24:57 2010 UTC (9 years, 5 months ago) by joachim.herb
Branches: MAIN
CVS tags: V_2_0_6, V_2_0_4, V_2_0_3bata2, V_2_0_1, V_2_0_0beta1, V_2_0_0alpha2, V_2_0_0alpha1, V_2_0_0_beta_1, V_2_0_0, V_1_4_6beta1, V_1_4_6, V_1_4_5beta3, V_1_4_5beta2, V_1_4_5, V_1_4_3beta2, V_1_4_3beta1, V_1_4_3, V_1_4_2beta5, V_1_4_2beta4, V_1_4_2beta3, V_1_4_2beta1, V_1_4_2, V_1_4_1, V_1_4_0, V_1_3_0beta2, V_1_3_0beta1, V_1_2_5_beta1, V_1_2_4, V_1_2_3, V_1_2_2, V_1_2_1, V_1_2_0, HEAD, B_2_0, B_1_2
Show differences between versions 1.1.7 and 1.2.0

diff -ru -bBw -U 10 1.1.7/chrome/CompactHeader/content/compactHeaderOverlay.js 1.2.0/chrome/CompactHeader/content/compactHeaderOverlay.js
--- 1.1.7/chrome/CompactHeader/content/compactHeaderOverlay.js	2010-02-06 01:16:20 +0000
+++ 1.2.0/chrome/CompactHeader/content/compactHeaderOverlay.js	2010-05-03 20:57:10 +0000
@@ -68,21 +68,21 @@
   var gCoheCollapsedHeaderViewMode = false;
   var gCoheBuiltCollapsedView = false;
   
   /**
    * The collapsed view: very lightweight. We only show a couple of fields.  See
    * msgHdrViewOverlay.js for details of the field definition semantics.
    */
   var gCoheCollapsedHeader1LListLongAddresses = [
     {name:"subject", outputFunction:coheOutputSubject},
     {name:"from", useToggle:true, outputFunction:coheOutputEmailAddresses},
-    {name:"toCcBcc", useToggle:true, outputFunction:coheOutputEmailAddresses},
+//    {name:"toCcBcc", useToggle:true, outputFunction:coheOutputEmailAddresses},
     {name:"date", outputFunction:coheUpdateDateValue}
     ];
   
   var gCoheCollapsedHeader2LListLongAddresses = [
     {name:"subject", outputFunction:coheOutputSubject},
     {name:"from", useToggle:true, outputFunction:coheOutputEmailAddresses},
     {name:"toCcBcc", useToggle:true, outputFunction:coheOutputEmailAddresses},
     {name:"date", outputFunction:coheUpdateDateValue}
     ];
     
@@ -141,28 +141,29 @@
       // addresses to reach the cutoff valve yet then add it to the default (short) div.
       var address = {};
       address.emailAddress = addresses.value[index];
       address.fullAddress = fullNames.value[index];
       if (cohePrefBranch.getBoolPref("headersize.addressstyle")) {
         address.displayName = address.emailAddress;
         address.fullAddress = address.emailAddress;
       } else {
         address.displayName = names.value[index];
       }
-      if (headerEntry.useToggle)
+      if (headerEntry.useToggle && (typeof headerEntry.enclosingBox.addAddressView == 'function')) {
         headerEntry.enclosingBox.addAddressView(address);
-      else
+      } else {
         updateEmailAddressNode(headerEntry.enclosingBox.emailAddressNode, address);
+      }
       index++;
     }
   
-    if (headerEntry.useToggle)
+    if (headerEntry.useToggle && (typeof headerEntry.enclosingBox.buildViews == 'function'))
       headerEntry.enclosingBox.buildViews();
     //OutputEmailAddresses(headerEntry, emailAddresses);
   }
   
   // Now, for each view the message pane can generate, we need a global table
   // of headerEntries. These header entry objects are generated dynamically
   // based on the static data in the header lists (see above) and elements
   // we find in the DOM based on properties in the header lists.
   var gCoheCollapsedHeaderView = {};
   
@@ -669,35 +670,47 @@
     org.mozdev.customizeHeaderToolbar.messenger.loadToolboxData();
   
     var hdrToolbox = document.getElementById("header-view-toolbox");
     var hdrToolbar = document.getElementById("header-view-toolbar");
     var firstPermanentChild = hdrToolbar.firstPermanentChild;
     var lastPermanentChild = hdrToolbar.lastPermanentChild;
     if (gCoheCollapsedHeaderViewMode) {
       strLabel = strShowLabel;
       var cBox = document.getElementById("collapsed2LButtonBox");
       if (cBox.parentNode.id != hdrToolbox.parentNode.id) {
-        var cloneToolboxPalette = hdrToolbox.palette.cloneNode(true);
-        var cloneToolbarset = hdrToolbox.toolbarset.cloneNode(true);
+        var cloneToolboxPalette;
+        var cloneToolbarset;
+        if (hdrToolbox.palette) {
+          cloneToolboxPalette = hdrToolbox.palette.cloneNode(true);
+        }
+        if (hdrToolbox.toolbarset) {
+          cloneToolbarset = hdrToolbox.toolbarset.cloneNode(true);
+        }
         cBox.parentNode.insertBefore(hdrToolbox, cBox);
         hdrToolbox.palette = cloneToolboxPalette;
         hdrToolbox.toolbarset = cloneToolbarset;
         hdrToolbar = document.getElementById("header-view-toolbar");
         hdrToolbar.firstPermanentChild = firstPermanentChild;
         hdrToolbar.lastPermanentChild = lastPermanentChild;
       }
     } else {
       strLabel = strHideLabel;
       var cBox = document.getElementById("expandedHeaders");
       if (cBox.parentNode.id != hdrToolbox.parentNode.id) {
-        var cloneToolboxPalette = hdrToolbox.palette.cloneNode(true);
-        var cloneToolbarset = hdrToolbox.toolbarset.cloneNode(true);
+        var cloneToolboxPalette;
+        var cloneToolbarset;
+        if (hdrToolbox.palette) {
+          cloneToolboxPalette = hdrToolbox.palette.cloneNode(true);
+        }
+        if (hdrToolbox.toolbarset) {
+          cloneToolbarset = hdrToolbox.toolbarset.cloneNode(true);
+        }
         cBox.parentNode.appendChild(hdrToolbox);
         hdrToolbox.palette = cloneToolboxPalette;
         hdrToolbox.toolbarset = cloneToolbarset;
         hdrToolbar = document.getElementById("header-view-toolbar");
         hdrToolbar.firstPermanentChild = firstPermanentChild;
         hdrToolbar.lastPermanentChild = lastPermanentChild;
       }
     }
     
     if (document.getElementById("hideDetailsMenu")) {
@@ -760,21 +773,21 @@
   }
   
   function addClass(el, strClass) {
     var testnew = new RegExp('\\b'+strClass+'\\b').test(el.className);  
     if (!testnew) {
       el.className += el.className?' '+strClass:strClass;
     }
   }
   
   function removeClass(el, strClass) {
-    var str = new RegExp(strClass, 'g');
+    var str = new RegExp('(\\s|^)'+strClass+'(\\s|$)', 'g');
     el.className = el.className.replace(str, '');
   }
   
   function CoheCopyWebsiteAddress(websiteAddressNode)
   {
     if (websiteAddressNode)
     {
       var websiteAddress = websiteAddressNode.getAttribute("url");
   
       var contractid = "@mozilla.org/widget/clipboardhelper;1";
diff -ru -bBw -U 10 1.1.7/chrome/CompactHeader/content/compactHeaderOverlay.xul 1.2.0/chrome/CompactHeader/content/compactHeaderOverlay.xul
--- 1.1.7/chrome/CompactHeader/content/compactHeaderOverlay.xul	2010-02-18 21:03:32 +0000
+++ 1.2.0/chrome/CompactHeader/content/compactHeaderOverlay.xul	2010-05-03 20:58:26 +0000
@@ -14,21 +14,21 @@
   %messengerDTD;
 ]>
 
 <?xml-stylesheet href="chrome://CompactHeader/skin/CompactHeader.css" type="text/css"?>
 <?xml-stylesheet href="chrome://CompactHeader-os/skin/osdef.css" type="text/css"?>
 
 
 <overlay id="compactHeaderOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/javascript" src="chrome://CompactHeader/content/compactHeaderOverlay.js"/>
+  <script type="application/javascript" src="chrome://CompactHeader-d/content/compactHeaderOverlay.js"/>
 
   <keyset>
     <key id="hideDetailsKey" 
          modifiers="shift" 
          key="&toggleDetails.key;"
          oncommand="org.mozdev.compactHeader.pane.coheToggleHeaderView();"/>
   </keyset>
 
   <popup id="header-toolbar-context-menu">
     <menuitem id="hidecohePreferencesButton" 
@@ -139,25 +139,33 @@
             <columns>
               <column flex="0"/>
             </columns>
             <rows>
               <row id="collapsed1LfromRow">
                 <mail-multi-emailHeaderField id="collapsed1LfromBox" flex="0"/>
               </row>
             </rows>
           </grid>
         </hbox>
+<!--
         <grid id="collapsed1LtoCcBccOutBox" flex="1" hidden="true">
+          <columns>
+            <column flex="0"/>
+            <column flex="1"/>
+          </columns>
           <row id="collapsed1LtoCcBccRow" align="baseline">
+            <label id="collapsed1LtoCcBccLabel" class="headerName" 
+                   value="&toField2.label;" control="collapsed1LtoCcBccBox"/>
              <mail-multi-emailHeaderField id="collapsed1LtoCcBccBox" flex="1"/>
           </row>
         </grid>
+-->
         <hbox id="collapsed1LdateOutBox" align="start" pack="end" flex="0">
           <row id="collapsed1LdateRow">
             <label id="collapsed1LdateBox" class="dateLabel" flex="1"/>
           </row>
         </hbox>        
         <header-view-button-box id="collapsed1LButtonBox" flex="0" align="start" hidden="true"/>
       </hbox>
       <hbox id="collapsed1LHeaderViewSecondLine" align="top" flex="1" collapsed="true">
       </hbox>
     </vbox>
Only in 1.2.0/chrome/CompactHeader: content-31
diff -ru -bBw -U 10 1.1.7/chrome/CustomizeHeaderToolbar/content/CHTDialogOverlay.js 1.2.0/chrome/CustomizeHeaderToolbar/content/CHTDialogOverlay.js
--- 1.1.7/chrome/CustomizeHeaderToolbar/content/CHTDialogOverlay.js	2010-03-14 13:32:56 +0000
+++ 1.2.0/chrome/CustomizeHeaderToolbar/content/CHTDialogOverlay.js	2010-03-27 15:16:20 +0000
@@ -90,45 +90,29 @@
     
     overlayOnLoad();
     CHToverlayRepositionDialog();
 
   }
   
   function CHToverlayRepositionDialog()
   {
     // Position the dialog so it is fully visible on the screen  
     // (if possible)
-    window.sizeToContent();
-
-    /* resize customization dialog so it fist on the screen */
-    var maxHeight = window.screen.availHeight - window.screenX;
-    var maxWidth  = window.screen.availWidth - window.screenY;
-    
-    var wH  = window.outerHeight;
-    var wW  = window.outerWidth;
-
-    var newHeight = Math.min(wH, maxHeight);
-    var newWidth  = Math.min(wW, maxWidth);
     
     // Seems to be necessary to get the correct dialog height/width
+    window.sizeToContent();
     var wH  = window.outerHeight;
     var wW  = window.outerWidth;
     var sH  = window.screen.height;
     var sW  = window.screen.width;
     var sX  = window.screenX;
     var sY  = window.screenY;
     var sAL = window.screen.availLeft;
     var sAT = window.screen.availTop;
     
-    var maxHeight = window.screen.availHeight - window.screenX;
-    var maxWidth  = window.screen.availWidth - window.screenY;
-    
-    var newX = Math.max(Math.min(sX, sW - wW), sAL);
-    var newY = Math.max(Math.min(sY, sH - wH), sAT);
-//    window.moveTo(newX, newY);
-//    window.resizeTo(newWidth, newHeight);
-    //window.moveTo(100, 100);
-    window.resizeTo(200,200);
+    var nX = Math.max(Math.min(sX, sW - wW), sAL);
+    var nY = Math.max(Math.min(sY, sH - wH), sAT);
+    window.moveTo(nX, nY);
   }
   
   return pub;
 }();
\ No newline at end of file
diff -ru -bBw -U 10 1.1.7/chrome/CustomizeHeaderToolbar/content/CHTMessenger.js 1.2.0/chrome/CustomizeHeaderToolbar/content/CHTMessenger.js
--- 1.1.7/chrome/CustomizeHeaderToolbar/content/CHTMessenger.js	2010-01-29 22:44:56 +0000
+++ 1.2.0/chrome/CustomizeHeaderToolbar/content/CHTMessenger.js	2010-05-02 22:19:36 +0000
@@ -37,49 +37,194 @@
 #
 # ***** END LICENSE BLOCK *****
 */
 
 if(!org) var org={};
 if(!org.mozdev) org.mozdev={};
 if(!org.mozdev.customizeHeaderToolbar) org.mozdev.customizeHeaderToolbar = {};
 
 org.mozdev.customizeHeaderToolbar.messenger = function(){
   var pub = {};
-	pub.CHTOnLoadMessenger = function() {
-    pub.saveToolboxData();
-    OnLoadMessenger();
+  
+  pub.init = function () {
+    var onLoadFkt = document.getElementById("messengerWindow").getAttribute("onload");
+    if (onLoadFkt) {
+      var strTest = new RegExp('OnLoadMessenger', 'g');;
+      onLoadFkt = onLoadFkt.replace(strTest, 
+        "org.mozdev.customizeHeaderToolbar.messenger.CHTLoadMessenger");
+      document.getElementById("messengerWindow").setAttribute("onload", onLoadFkt);
+    }
   }
   
   pub.saveToolboxData = function() {
     var hdrToolbox = document.getElementById("header-view-toolbox");
     var hdrToolbar = document.getElementById("header-view-toolbar");
     var saveToolbox = document.getElementById("CHTSaveToolboxData");
     var saveToolbar = document.getElementById("CHTSaveToolbarData");
     if (hdrToolbox && hdrToolbar && saveToolbox && saveToolbar) {
       saveToolbar.firstPermanentChild = hdrToolbar.firstPermanentChild;
       saveToolbar.lastPermanentChild  = hdrToolbar.lastPermanentChild;
+      if (hdrToolbox.palette) {
       saveToolbox.palette    = hdrToolbox.palette.cloneNode(true);
-      saveToolbox.setAttribute("gotData", "true");
-      if (!hdrToolbox.toolbarset) {
-      } else {
+      }
+      if (hdrToolbox.toolbarset) {
         saveToolbox.toolbarset = hdrToolbox.toolbarset.cloneNode(true);
       }
+      saveToolbox.setAttribute("gotData", "true");
+    }
+    else {
+      saveToolbox.setAttribute("gotData", "false");
     }
   }
   
   pub.loadToolboxData = function() {
     var hdrToolbox = document.getElementById("header-view-toolbox");
     var hdrToolbar = document.getElementById("header-view-toolbar");
     var saveToolbox = document.getElementById("CHTSaveToolboxData");
     var saveToolbar = document.getElementById("CHTSaveToolbarData");
     if (hdrToolbox && hdrToolbar && saveToolbox && saveToolbar && saveToolbox.getAttribute("gotData") == "true") {
       hdrToolbar.firstPermanentChild = saveToolbar.firstPermanentChild;
       hdrToolbar.lastPermanentChild = saveToolbar.lastPermanentChild;
+      if (saveToolbox.palette) {
       hdrToolbox.palette = saveToolbox.palette.cloneNode(true);
+      } else {
+      }
       if (saveToolbox.toolbarset) {
         hdrToolbox.toolbarset = saveToolbox.toolbarset.cloneNode(true);
       } else {
       }
     } 
   }
+  
+  pub.UpdateMailPaneConfig = function(aMsgWindowInitialized) {
+    const dynamicIds = ["messagesBox", "mailContent", "threadPaneBox"];
+    const layouts = ["standard", "wide", "vertical"];
+    var layoutView = gPrefBranch.getIntPref("mail.pane_config.dynamic");
+    var desiredId = dynamicIds[layoutView];
+    document.getElementById("mailContent")
+            .setAttribute("layout", layouts[layoutView]);
+    var messagePane = GetMessagePane();
+    if (messagePane.parentNode.id != desiredId) {
+      ClearAttachmentList();
+      var hdrToolbox = document.getElementById("header-view-toolbox");
+      var hdrToolbar = document.getElementById("header-view-toolbar");
+      var firstPermanentChild = hdrToolbar.firstPermanentChild;
+      var lastPermanentChild = hdrToolbar.lastPermanentChild;
+      var messagePaneSplitter = GetThreadAndMessagePaneSplitter();
+      var desiredParent = document.getElementById(desiredId);
+  
+      // Here the message pane including the header pane is moved to the
+      // new layout by the appendChild() method below.  As described in bug
+      // 519956 only elements in the DOM tree are copied to the new place
+      // whereas javascript class variables of DOM tree elements get lost.
+      // In this case the ToolboxPalette, Toolbarset first/lastPermanentChild
+      // are removed which results in the message header pane not being
+      // customizable any more.  A workaround for this problem is to clone
+      // them first and add them to the DOM tree after the message pane has
+      // been moved.
+      var cloneToolboxPalette;
+      var cloneToolbarset;
+      if (hdrToolbox.palette) {
+        cloneToolboxPalette = hdrToolbox.palette.cloneNode(true);
+      }
+      if (hdrToolbox.toolbarset) {
+        cloneToolbarset = hdrToolbox.toolbarset.cloneNode(true);
+      }
+  
+      // See Bug 381992. The ctor for the browser element will fire again when we
+      // re-insert the messagePaneBox back into the document.  But the dtor
+      // doesn't fire when the element is removed from the document.  Manually
+      // call destroy here to avoid a nasty leak.
+      document.getElementById("messagepane").destroy();
+      desiredParent.appendChild(messagePaneSplitter);
+      desiredParent.appendChild(messagePane);
+      hdrToolbox.palette  = cloneToolboxPalette;
+      hdrToolbox.toolbarset = cloneToolbarset;
+      hdrToolbar = document.getElementById("header-view-toolbar");
+      hdrToolbar.firstPermanentChild = firstPermanentChild;
+      hdrToolbar.lastPermanentChild = lastPermanentChild;
+      messagePaneSplitter.orient = desiredParent.orient;
+      if (aMsgWindowInitialized)
+      {
+        messenger.setWindow(null, null);
+        messenger.setWindow(window, msgWindow);
+        if (gDBView && GetNumSelectedMessages() == 1)
+          gDBView.reloadMessage();
+      }
+    }
+  }
+
+  const CHTMailPrefObserver = {
+    observe: function(subject, topic, prefName) {
+      // verify that we're changing the mail pane config pref
+      if (topic == "nsPref:changed")
+      {
+        if (prefName == "mail.pane_config.dynamic")
+          pub.UpdateMailPaneConfig(true);
+      }
+    }
+  }
+    
+  pub.CHTLoadMessenger = function () {   
+    // update the pane config before we exit onload otherwise the user may see a flicker if we poke the document   
+    // in delayedOnLoadMessenger...
+    pub.UpdateMailPaneConfig(false);
+    document.loadBindingDocument('chrome://global/content/bindings/textbox.xml');
+
+    // Set a sane starting width/height for all resolutions on new profiles.
+    // Do this before the window loads.
+    if (!document.documentElement.hasAttribute("width"))
+    {
+      // Prefer 1024xfull height.
+      let defaultHeight = screen.availHeight;
+      let defaultWidth = (screen.availWidth <= 1024) ? screen.availWidth : 1024;
+
+      // On small screens, default to maximized state.
+      if (defaultHeight <= 600)
+        document.documentElement.setAttribute("sizemode", "maximized");
+      document.documentElement.setAttribute("width", defaultWidth);
+      document.documentElement.setAttribute("height", defaultHeight);
+      // Make sure we're safe at the left/top edge of screen
+      document.documentElement.setAttribute("screenX", screen.availLeft);
+      document.documentElement.setAttribute("screenY", screen.availTop);
+    }
+    
+    gPrefBranch.QueryInterface(Components.interfaces.nsIPrefBranch2);
+    gPrefBranch.addObserver("mail.pane_config.dynamic", CHTMailPrefObserver, false);
+    
+    MailOfflineMgr.init();
+    CreateMailWindowGlobals();
+    GetMessagePane().collapsed = true;
+    
+    // - initialize tabmail system
+    // Do this before LoadPostAccountWizard since that code selects the first
+    //  folder for display, and we want gFolderDisplay setup and ready to handle
+    //  that event chain.
+    // Also, we definitely need to register the tab type prior to the call to
+    //  specialTabs.openSpecialTabsOnStartup below.
+    let tabmail = document.getElementById('tabmail');
+    if (tabmail)
+    {
+      // mailTabType is defined in mailWindowOverlay.js
+      tabmail.registerTabType(mailTabType);
+      // glodaFacetTab* in glodaFacetTab.js
+      tabmail.registerTabType(glodaFacetTabType);
+      tabmail.registerTabMonitor(QuickSearchTabMonitor);
+      tabmail.registerTabMonitor(statusMessageCountsMonitor);
+      tabmail.openFirstTab();
+    }
+    
+    // verifyAccounts returns true if the callback won't be called
+    // We also don't want the account wizard to open if any sort of account exists
+    if (verifyAccounts(LoadPostAccountWizard, false, AutoConfigWizard))
+      LoadPostAccountWizard();
+    
+    // This also registers the contentTabType ("contentTab")
+    specialTabs.openSpecialTabsOnStartup();
+    
+    window.addEventListener("AppCommand", HandleAppCommandEvent, true);
+  } 
+  
   return pub;
 }();
\ No newline at end of file
+
+org.mozdev.customizeHeaderToolbar.messenger.init();
diff -ru -bBw -U 10 1.1.7/chrome/CustomizeHeaderToolbar/content/CHTMessenger.xul 1.2.0/chrome/CustomizeHeaderToolbar/content/CHTMessenger.xul
--- 1.1.7/chrome/CustomizeHeaderToolbar/content/CHTMessenger.xul	2010-01-29 22:44:56 +0000
+++ 1.2.0/chrome/CustomizeHeaderToolbar/content/CHTMessenger.xul	2010-03-27 15:16:20 +0000
@@ -37,17 +37,16 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <!DOCTYPE overlay [
 ]>
 
 
 <overlay id="CHTmessengerWindow"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/x-javascript" 
           src="chrome://CustomizeHeaderToolbar/content/CHTMessenger.js"/>
-  <window id="messengerWindow" 
-  				onload="org.mozdev.customizeHeaderToolbar.messenger.CHTOnLoadMessenger();">
+  <window id="messengerWindow">
     <toolbox id="CHTSaveToolboxData" collapsed="true">
     	<toolbar id="CHTSaveToolbarData" collapsed="true"/>
     </toolbox>
   </window>
 </overlay>
diff -ru -bBw -U 10 1.1.7/chrome/CustomizeHeaderToolbar/skin/pinstripe/messageHeader.css 1.2.0/chrome/CustomizeHeaderToolbar/skin/pinstripe/messageHeader.css
--- 1.1.7/chrome/CustomizeHeaderToolbar/skin/pinstripe/messageHeader.css	2010-02-13 11:56:22 +0000
+++ 1.2.0/chrome/CustomizeHeaderToolbar/skin/pinstripe/messageHeader.css	2010-05-04 18:01:24 +0000
@@ -69,20 +69,21 @@
 }
 
 .hdrReplyButton > .toolbarbutton-menubutton-button {
   -moz-appearance: none;
   padding: 0;
   margin: 0;
   -moz-padding-start: 0px;
   -moz-padding-end: 0px;
   -moz-margin-start: 0px;
   -moz-margin-end: 0px;
+  padding-bottom: 2px !important;
   min-width: 1em;
   min-height: 1ex;
 }
 
 /* The default toolbarbutton CSS makes the dropmarker really tiny in icon mode;
  * make the click target easier to hit.
  */
  .hdrReplyButton > .toolbarbutton-menubutton-dropmarker {
   -moz-margin-start: 3px;
   -moz-margin-end: 4px;
diff -ru -bBw -U 10 1.1.7/chrome.manifest 1.2.0/chrome.manifest
--- 1.1.7/chrome.manifest	2010-01-03 23:05:38 +0000
+++ 1.2.0/chrome.manifest	2010-05-02 13:18:22 +0000
@@ -1,38 +1,42 @@
-content   CustomizeHeaderToolbar                 chrome/CustomizeHeaderToolbar/content/
+content   CustomizeHeaderToolbar                 chrome/CustomizeHeaderToolbar/content/                                 appversion<3.1a1pre
+content   CustomizeHeaderToolbar                 chrome/CompactHeader/content-31/                                          appversion>=3.1b2
 
-skin      CustomizeHeaderToolbar     global      chrome/CustomizeHeaderToolbar/skin/global/
-skin      CustomizeHeaderToolbar-os  classic/1.0 chrome/CustomizeHeaderToolbar/skin/global/
-skin      CustomizeHeaderToolbar-os  classic/1.0 chrome/CustomizeHeaderToolbar/skin/gnomestripe/  os=Linux
-skin      CustomizeHeaderToolbar-os  classic/1.0 chrome/CustomizeHeaderToolbar/skin/qute/         os=WINNT
-skin      CustomizeHeaderToolbar-os  classic/1.0 chrome/CustomizeHeaderToolbar/skin/pinstripe/    os=Darwin
+skin      CustomizeHeaderToolbar     global      chrome/CustomizeHeaderToolbar/skin/global/                             appversion<3.1a1pre
+skin      CustomizeHeaderToolbar-os  classic/1.0 chrome/CustomizeHeaderToolbar/skin/global/                             appversion<3.1a1pre
+skin      CustomizeHeaderToolbar-os  classic/1.0 chrome/CustomizeHeaderToolbar/skin/gnomestripe/  os=Linux              appversion<3.1a1pre
+skin      CustomizeHeaderToolbar-os  classic/1.0 chrome/CustomizeHeaderToolbar/skin/qute/         os=WINNT              appversion<3.1a1pre
+skin      CustomizeHeaderToolbar-os  classic/1.0 chrome/CustomizeHeaderToolbar/skin/pinstripe/    os=Darwin             appversion<3.1a1pre
 
-locale    CustomizeHeaderToolbar     en-US   chrome/CustomizeHeaderToolbar/locale/en-US/
+locale    CustomizeHeaderToolbar     en-US   chrome/CustomizeHeaderToolbar/locale/en-US/                                appversion<3.1a1pre
 
-overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CustomizeHeaderToolbar/content/CHTPaneOverlay.xul
-overlay chrome://global/content/customizeToolbar.xul     chrome://CustomizeHeaderToolbar/content/CHTDialogOverlay.xul
+overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CustomizeHeaderToolbar/content/CHTPaneOverlay.xul     appversion<3.1a1pre
+overlay chrome://global/content/customizeToolbar.xul     chrome://CustomizeHeaderToolbar/content/CHTDialogOverlay.xul   appversion<3.1a1pre
 overlay chrome://messenger/content/messenger.xul         chrome://CustomizeHeaderToolbar/content/CHTMessenger.xul
-style   chrome://global/content/customizeToolbar.xul     chrome://messenger/skin/messageHeader.css
-style   chrome://global/content/customizeToolbar.xul     chrome://CustomizeHeaderToolbar/skin/messageHeader.css
-style   chrome://global/content/customizeToolbar.xul     chrome://CustomizeHeaderToolbar-os/skin/messageHeader.css
+style   chrome://global/content/customizeToolbar.xul     chrome://messenger/skin/messageHeader.css                      appversion<3.1a1pre
+style   chrome://global/content/customizeToolbar.xul     chrome://CustomizeHeaderToolbar/skin/messageHeader.css         appversion<3.1a1pre
+style   chrome://global/content/customizeToolbar.xul     chrome://CustomizeHeaderToolbar-os/skin/messageHeader.css      appversion<3.1a1pre
 
 content   CompactHeader                 chrome/CompactHeader/content/
+content   CompactHeader-d               chrome/CompactHeader/content/        appversion<3.1a1pre
+content   CompactHeader-d               chrome/CompactHeader/content-31/     appversion>=3.1b2
 
 skin      CompactHeader     global      chrome/CompactHeader/skin/global/
 skin      CompactHeader-os  classic/1.0 chrome/CompactHeader/skin/common/
 skin      CompactHeader-os  classic/1.0 chrome/CompactHeader/skin/gnome/   os=Linux
 skin      CompactHeader-os  classic/1.0 chrome/CompactHeader/skin/windows/ os=WINNT
 skin      CompactHeader-os  classic/1.0 chrome/CompactHeader/skin/mac/     os=Darwin
 
 locale    CompactHeader     en-US   chrome/CompactHeader/locale/en-US/
 locale    CompactHeader     de-DE   chrome/CompactHeader/locale/de-DE/
 locale    CompactHeader     it-IT   chrome/CompactHeader/locale/it-IT/
 
-overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CompactHeader/content/compactHeaderOverlay.xul
+overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://CompactHeader-d/content/compactHeaderOverlay.xul
 overlay chrome://global/content/customizeToolbar.xul     chrome://CompactHeader/content/customizeToolbarOverlay.xul
 style   chrome://global/content/customizeToolbar.xul     chrome://CompactHeader-os/skin/osdef.css
 style   chrome://global/content/customizeToolbar.xul     chrome://CompactHeader/skin/CompactHeader.css
 
 overlay chrome://messenger/content/messageWindow.xul     chrome://CompactHeader/content/buttonsOverlay.xul
 overlay chrome://messenger/content/messenger.xul         chrome://CompactHeader/content/buttonsOverlay.xul
 style   chrome://global/content/customizeToolbar.xul     chrome://CompactHeader-os/skin/buttonsOverlay.css
 
+overlay chrome://messenger/content/messenger.xul         chrome://CompactHeader/content/messengerOverlay.xul appversion<3.1a1pre
diff -ru -bBw -U 10 1.1.7/install.rdf 1.2.0/install.rdf
--- 1.1.7/install.rdf	2010-02-18 21:04:52 +0000
+++ 1.2.0/install.rdf	2010-05-04 18:01:24 +0000
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
 	 xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
 	 xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 
 	<RDF:Description about="urn:mozilla:install-manifest">
 		<em:name>CompactHeader</em:name>
-		<em:version>1.1.7</em:version>
+		<em:version>1.2.0</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>
 		<em:contributor>Alex Dedul (original author of RSS Linkify Subject</em:contributor>
     <em:optionsURL>chrome://CompactHeader/content/preferences.xul</em:optionsURL>
 		<em:homepageURL>http://compactheader.mozdev.org/</em:homepageURL>
 
 
 		<em:id>{58D4392A-842E-11DE-B51A-C7B855D89593}</em:id>
 		<em:type>2</em:type>
   	<em:iconURL>chrome://CompactHeader/skin/cohe-icon.png</em:iconURL>
 		<em:targetApplication>
 			<RDF:Description>
 				<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
 				<em:minVersion>3.0</em:minVersion>
-				<em:maxVersion>3.0.*</em:maxVersion>
+				<em:maxVersion>3.2a1pre</em:maxVersion>
 			</RDF:Description>
 		</em:targetApplication>
 	</RDF:Description>
 </RDF>

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>