Merge branch 'upstream' into dfsg-upstream

mail/components/preferences/compose.js

@@ -49,7 +49,7 @@ var gComposePane = {
 
     this.populateFonts();
 
-    document.getElementById('downloadDictionaries').setAttribute('href', this.getDictionaryURL());
+    document.getElementById('downloadDictionaries').setAttribute('getDictionariesURL', this.getDictionaryURL());
 
     var preference = document.getElementById("mail.preferences.compose.selectedTabIndex");
     if (preference.value)

mail/components/preferences/compose.xul

@@ -51,6 +51,7 @@
 
   <prefpane id="paneCompose" onpaneload="gComposePane.init();">
     <script type="application/x-javascript" src="chrome://messenger/content/preferences/compose.js"/>
+    <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
 
     <stringbundle id="languageBundle" src="chrome://global/locale/languageNames.properties"/>
     <stringbundle id="regionBundle" src="chrome://global/locale/regionNames.properties"/>
@@ -251,6 +252,7 @@
             <separator/>
             <hbox>
               <label id="downloadDictionaries" class="text-link"
+                     onclick="if (event.button == 0) { openURL(this.getAttribute('getDictionariesURL')); }"
                      value="&downloadDictionaries.label;"/>
               <spacer flex="1"/>
             </hbox>

mail/themes/install.rdf

@@ -7,7 +7,7 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>{972ce4c6-7e08-4474-a285-3208198ce6fd}</em:id>
-    <em:version>2.0</em:version>
+    <em:version>@THUNDERBIRD_VERSION@</em:version>
     
     <!-- Target Application this theme can install into, 
         with minimum and maximum supported versions. --> 

mailnews/base/prefs/content/accountcreation/accountConfig.js

@@ -72,7 +72,8 @@ function AccountConfig()
     daysToLeaveMessagesOnServer : 14,
     deleteByAgeFromServer : true,
     // When user hits delete, delete from local store and from server
-    deleteOnServerWhenLocalDelete: true
+    deleteOnServerWhenLocalDelete: true,
+    downloadOnBiff: true
   },
   this.outgoing =
   {

mailnews/base/prefs/content/accountcreation/createInBackend.js

@@ -95,6 +95,8 @@ function createAccountInBackend(config)
       "mail.server.%serverkey%.delete_mail_left_on_server";
     const deleteByAgeFromServerPrefTemplate =
       "mail.server.%serverkey%.delete_by_age_from_server";
+    const downloadOnBiffPrefTemplate =
+      "mail.server.%serverkey%.download_on_biff";
     var leaveOnServerPref =
       leaveOnServerPrefTemplate.replace("%serverkey%", inServer.key);
     var ageFromServerPref =
@@ -103,6 +105,8 @@ function createAccountInBackend(config)
       daysToLeaveOnServerPrefTemplate.replace("%serverkey%", inServer.key);
     var deleteFromServerPref =
       deleteFromServerPrefTemplate.replace("%serverkey%", inServer.key);
+    let downloadOnBiffPref =
+      downloadOnBiffPrefTemplate.replace("%serverkey%", inServer.key);
     prefs.setBoolPref(leaveOnServerPref,
                       config.incoming.leaveMessagesOnServer);
     prefs.setIntPref(daysToLeaveOnServerPref,
@@ -111,6 +115,8 @@ function createAccountInBackend(config)
                       config.incoming.deleteOnServerWhenLocalDelete);
     prefs.setBoolPref(ageFromServerPref,
                       config.incoming.deleteByAgeFromServer);
+    prefs.setBoolPref(downloadOnBiffPref,
+                      config.incoming.downloadOnBiff);
   }
   inServer.valid = true;
 

mailnews/base/prefs/content/accountcreation/readFromXML.js

@@ -82,6 +82,8 @@ function readFromXML(clientConfigXML)
       iO.leaveMessagesOnServer = sanitize.boolean(iX.pop3.leaveMessagesOnServer);
     if ("daysToLeaveMessagesOnServer" in iX.pop3)
       iO.daysToLeaveMessagesOnServer = iX.pop3.daysToLeaveMessagesOnServer;
+    if ("downloadOnBiff" in iX.pop3)
+      iO.downloadOnBiff = iX.pop3.downloadOnBiff;
   }
 
   // outgoing server

mailnews/imap/src/nsImapProtocol.cpp

@@ -1687,6 +1687,9 @@ PRBool nsImapProtocol::ProcessCurrentURL()
         else if (m_socketType == nsIMsgIncomingServer::tryTLS
             && (GetServerStateParser().GetCapabilityFlag() & kHasStartTLSCapability))
         {
+          ClearFlag(IMAP_CONNECTION_IS_OPEN);
+          TellThreadToDie();
+          SetConnectionStatus(-1);
           return RetryUrl();
         }
         logonFailed = !TryToLogon();