Bug 287806 - Add TCP timeout pref
authorIan Neal <iann_cvs@blueyonder.co.uk>
Mon, 21 Sep 2009 00:24:39 +0100
changeset 3855 0cb7f403694dfe1a81bd0375f134651aded66e23
parent 3854 9949fa923281c9af0a921a052a7b0c797cbae2f3
child 3856 6bb00ea3969d59644d9c7b8f69f111dc710bc3b8
push id3017
push useriann_cvs@blueyonder.co.uk
push dateSun, 20 Sep 2009 23:24:54 +0000
treeherdercomm-central@0cb7f403694d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs287806
Bug 287806 - Add TCP timeout pref r=stefanh/mnyromyr ui-r=stefanh sr=neil a-SM2.0=KaiRo
suite/locales/en-US/chrome/common/help/help-index1.rdf
suite/locales/en-US/chrome/common/help/mail_help.xhtml
suite/locales/en-US/chrome/common/help/suite-toc.rdf
suite/locales/en-US/chrome/mailnews/pref/mailPrefsOverlay.dtd
suite/locales/en-US/chrome/mailnews/pref/pref-offline.dtd
suite/mailnews/prefs/mailPrefsOverlay.xul
suite/mailnews/prefs/pref-offline.xul
--- a/suite/locales/en-US/chrome/common/help/help-index1.rdf
+++ b/suite/locales/en-US/chrome/common/help/help-index1.rdf
@@ -1153,16 +1153,21 @@
          nc:link="mail_help.xhtml#choosing_how_you_view_the_mail_window"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:message_searching"
          nc:name="message searching"
          nc:link="mail_help.xhtml#searching_through_messages"/>
      </rdf:li>
      <rdf:li>
+       <rdf:Description ID="Mail_and_Newsgroups:network_preferences"
+         nc:name="Mail and Newsgroups Network preferences"
+         nc:link="mail_help.xhtml#network_and_storage_preferences"/>
+     </rdf:li>
+     <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:offline_synchronization_settings"
          nc:name="offline synchronization settings"
          nc:link="mail_help.xhtml#synchronization_and_storage"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Mail_and_Newsgroups:POP_settings"
          nc:name="POP settings"
          nc:link="mail_help.xhtml#pop_server_settings"/>
@@ -1314,17 +1319,17 @@
    </nc:subheadings>
 </rdf:Description>
 
 <rdf:Description about="#Offline">
    <nc:subheadings>
      <rdf:Seq><rdf:li>
        <rdf:Description ID="Offline:general_preferences"
          nc:name="offline preferences"
-         nc:link="mail_help.xhtml#offline_and_disk_space_preferences"/>
+         nc:link="mail_help.xhtml#network_and_storage_preferences"/>
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Offline:Mail_and_Newsgroups"
          nc:name="Offline Mail and News"
          nc:link="mail_help.xhtml#working_offline"/>
      </rdf:li></rdf:Seq>
    </nc:subheadings>
 </rdf:Description>
--- a/suite/locales/en-US/chrome/common/help/mail_help.xhtml
+++ b/suite/locales/en-US/chrome/common/help/mail_help.xhtml
@@ -3514,17 +3514,17 @@ to filter unwanted mail, and how phishin
   replicating any changes you made while working offline.</p>
 
 <p><strong>Tip</strong>: &brandShortName; Mail &amp; Newsgroups saves any
   messages that you send while working offline in the Unsent Messages folder
   under Local Folders. To have &brandShortName; Mail &amp; Newsgroups
   automatically send your unsent messages when you reconnect, use the
   Preferences command on the <span class="mac">&brandShortName;</span>
   <span class="noMac">Edit</span> menu to change the
-  <a href="#offline_and_disk_space_preferences">offline preferences</a> for all
+  <a href="#network_and_storage_preferences">offline preferences</a> for all
   your accounts.</p>
 
 <p>[<a href="#working_offline">Return to beginning of section</a>]</p>
 
 <h2 id="downloading_an_individual_folder_for_offline_use">Downloading an
   Individual Folder for Offline Use</h2>
 
 <p>Note that POP accounts don&apos;t allow you to manage folders on the POP
@@ -3570,17 +3570,17 @@ to filter unwanted mail, and how phishin
 
 <p><strong>Tip</strong>: &brandShortName; Mail &amp; Newsgroups saves any
   messages that you sent while working offline in the Unsent Messages folder
   under Local Folders. When you reconnect, choose Send Unsent Messages from the
   File menu to send all your saved messages at once. To have &brandShortName;
   Mail &amp; Newsgroups automatically send your unsent messages when you
   reconnect, use the Preferences command on the
   <span class="mac">&brandShortName;</span> <span class="noMac">Edit</span>
-  menu to change your <a href="#offline_and_disk_space_preferences">offline
+  menu to change your <a href="#network_and_storage_preferences">offline
   preferences</a>.</p>
 
 <p>[<a href="#working_offline">Return to beginning of section</a>]</p>
 
 <h2 id="downloading_selected_or_flagged_messages_for_offline_use">Downloading
   Selected or Flagged Messages for Offline Use</h2>
 
 <p>Note that messages are downloaded by default for POP accounts. However, if
@@ -3641,17 +3641,17 @@ to filter unwanted mail, and how phishin
 
 <p><strong>Tip</strong>: &brandShortName; Mail &amp; Newsgroups saves any
   messages that you sent while working offline in the Unsent Messages folder
   under Local Folders. When you reconnect, choose Send Unsent Messages from the
   File menu to send all your saved messages at once. To have &brandShortName;
   Mail &amp; Newsgroups automatically send your unsent messages when you
   reconnect, use the Preferences command on the
   <span class="mac">&brandShortName;</span> <span class="noMac">Edit</span>
-  menu to change your <a href="#offline_and_disk_space_preferences">offline
+  menu to change your <a href="#network_and_storage_preferences">offline
   preferences</a>.</p>
 
 <p>[<a href="#working_offline">Return to beginning of section</a>]</p>
 
 <h2 id="downloading_directory_entries_for_offline_use">Downloading
   Directory Entries for Offline Use</h2>
 
 <p>You can download (replicate) the entries in a directory server to your
@@ -3838,20 +3838,22 @@ to filter unwanted mail, and how phishin
 </ol>
 
 <p><strong>Note</strong>: Message headers that have been downloaded for reading
   offline display a darker gray envelope or newsgroup icon.</p>
 
 <p><strong>Tip</strong>: To set &brandShortName; Mail &amp; Newsgroups&apos;
   download behavior when going offline, open the
   <span class="mac">&brandShortName;</span> <span class="noMac">Edit</span>
-  menu, choose Preferences, and then click the Synchronization &amp; Storage
-  category. You can choose to have &brandShortName; Mail &amp; Newsgroups
-  prompt you to download messages when going offline, to automatically
-  download messages, or to not download any messages.</p>
+  menu, choose Preferences, and then under the Mail &amp; Newsgroups category,
+  select Network &amp; Storage (if no subcategories are visible, double-click
+  Mail &amp; Newsgroups to expand the list). You can choose to have
+  &brandShortName; Mail &amp; Newsgroups prompt you to download messages when
+  going offline, to automatically download messages, or to not download any
+  messages.</p>
 
 <p>To reconnect and synchronize your messages:</p>
 
 <ol>
   <li>Click the online/offline indicator <img src="images/offline.png"
     alt=""/> in the lower-right corner of any &brandShortName; window.</li>
   <li>Open the File menu, choose Offline, and then choose Download/Sync
     Now.</li>
@@ -4950,17 +4952,17 @@ to filter unwanted mail, and how phishin
     <li><a href="#notifications">Notifications</a></li>
     <li><a href="#composition">Composition</a></li>
     <li><a href="#send_format">Send Format</a></li>
     <li><a href="#addressing_preferences">Addressing</a></li>
     <li><a href="#global_junk_settings">Junk Mail</a></li>
     <li><a href="#tags">Tags</a></li>
     <li><a href="#return_receipts_preferences">Return Receipts</a></li>
     <li><a href="#character_encoding">Character Encoding</a></li>
-    <li><a href="#offline_and_disk_space_preferences">Offline &amp; Disk Space
+    <li><a href="#network_and_storage_preferences">Network &amp; Storage
       Preferences</a></li>
   </ul>
 </div>
 
 <h2 id="mail_and_newsgroups">Mail &amp; Newsgroups Preferences - Mail &amp;
   Newsgroups</h2>
 
 <p>This section describes the main Mail &amp; Newsgroups preferences. If you
@@ -5507,36 +5509,38 @@ to filter unwanted mail, and how phishin
     Choose <strong>Always use this default character encoding in
     replies</strong> to use the default character encoding for outgoing
     messages even when replying.</li>
 </ul>
 
 <p>[<a href="#mail_and_newsgroup_preferences">Return to beginning of
   section</a>]</p>
 
-<h2 id="offline_and_disk_space_preferences">Mail &amp; Newsgroups Preferences -
-  Offline &amp; Disk Space</h2>
-
-<p>This section describes how to use the Offline &amp; Disk Space preferences
+<h2 id="network_and_storage_preferences">Mail &amp; Newsgroups Preferences -
+  Network &amp; Storage</h2>
+
+<p>This section describes how to use the Network &amp; Storage preferences
   panel. If you are not currently viewing the panel, follow these steps:</p>
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
-  <li>Under the Mail &amp; Newsgroups category, select Offline &amp; Disk
-    Space. (If no subcategories are visible, double-click Mail &amp;
-    Newsgroups to expand the list.).</li>
+  <li>Under the Mail &amp; Newsgroups category, select Network &amp; Storage.
+    (If no subcategories are visible, double-click Mail &amp; Newsgroups to
+    expand the list.)</li>
 </ol>
 
-<p>The Offline &amp; Disk Space preferences allow you to set preferences for
-  working offline, going online, and disk space.</p>
+<p>The Network &amp; Storage preferences allow you to set preferences for
+  working offline, going online, mail connections and disk space.</p>
 
 <ul>
   <li><strong>Offline</strong>: Select how you want Mail &amp; Newsgroups to
     handle messages when going online or offline.</li>
+  <li><strong>Mail Connections</strong>: Choose how long you want Mail &amp;
+    Newsgroups to keep trying to contact the server before timing out.</li>
   <li><strong>Disk Space</strong>: Select this to conserve disk space by 
     automatically compacting message folders when it will save the amount 
     of disk space you enter.</li>
 </ul>
 
 <p>See <a href="#working_offline">Working Offline</a> for information on
   working offline.</p>
 
--- a/suite/locales/en-US/chrome/common/help/suite-toc.rdf
+++ b/suite/locales/en-US/chrome/common/help/suite-toc.rdf
@@ -508,17 +508,17 @@
         <rdf:li> <rdf:Description ID="mail_prefs_notifications" nc:name="Notifications" nc:link="mail_help.xhtml#notifications"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail_prefs_messages" nc:name="Composition" nc:link="mail_help.xhtml#composition"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail_prefs_formatting" nc:name="Send Format" nc:link="mail_help.xhtml#send_format"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail_prefs_addressing" nc:name="Addressing" nc:link="mail_help.xhtml#addressing_preferences"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-prefs-junk" nc:name="Junk Mail" nc:link="mail_help.xhtml#global_junk_settings"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-prefs-tags" nc:name="Tags" nc:link="mail_help.xhtml#tags"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail-prefs-receipts" nc:name="Return Receipts" nc:link="mail_help.xhtml#return_receipts_preferences"/> </rdf:li>
         <rdf:li> <rdf:Description ID="mail_prefs_character_encoding" nc:name="Character Encoding" nc:link="mail_help.xhtml#character_encoding"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="mail_prefs_offline" nc:name="Offline and Disk Space" nc:link="mail_help.xhtml#offline_and_disk_space_preferences"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="mail_prefs_offline" nc:name="Network and Storage" nc:link="mail_help.xhtml#network_and_storage_preferences"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
 
 <!-- COMPOSER HELP SECTION -->
 
 <rdf:Description about="#comp">
     <nc:subheadings>
--- a/suite/locales/en-US/chrome/mailnews/pref/mailPrefsOverlay.dtd
+++ b/suite/locales/en-US/chrome/mailnews/pref/mailPrefsOverlay.dtd
@@ -13,9 +13,9 @@
 <!ENTITY notifications.label              "Notifications">
 <!ENTITY address.label                    "Addressing">
 <!ENTITY composingMessages.label          "Composition">
 <!ENTITY format.label                     "Send Format">
 <!ENTITY return.label                     "Return Receipts">
 <!ENTITY junk.label                       "Junk Mail">
 <!ENTITY tags.label                       "Tags">
 <!ENTITY characterEncoding.label          "Character Encoding">
-<!ENTITY offline.label                    "Offline &amp; Disk Space">
+<!ENTITY networkStorage.label             "Network &amp; Storage">
--- a/suite/locales/en-US/chrome/mailnews/pref/pref-offline.dtd
+++ b/suite/locales/en-US/chrome/mailnews/pref/pref-offline.dtd
@@ -1,12 +1,12 @@
 <!-- extracted from content/pref-offline.xul -->
 
 <!--LOCALIZATION NOTE : FILE The 'Offline' preferences dialog -->
-<!ENTITY pref.offline.title               "Offline &amp; Disk Space">
+<!ENTITY pref.network.title               "Network &amp; Storage">
 <!ENTITY pref.offline.caption             "Offline">
 <!ENTITY textStartUp                      "When starting up:">
 <!ENTITY textStartUp.accesskey            "W">
 <!ENTITY menuitemRememberPrevState        "Remember previous online state">
 <!ENTITY menuitemAskMe                    "Ask me for online state at startup">
 <!ENTITY menuitemAlwaysOnline             "Always start up online">
 <!ENTITY menuitemAlwaysOffline            "Always start up offline">
 <!ENTITY menuitemAutomatic                "Detect automatically (if available)">
@@ -19,12 +19,16 @@
 <!ENTITY radioAskUnsent.accesskey         "s">
 <!ENTITY textGoingOffline                 "Download messages for offline use when going offline?">
 <!ENTITY radioAutoDownload                "Yes">
 <!ENTITY radioAutoDownload.accesskey      "e">
 <!ENTITY radioNotDownload                 "No">
 <!ENTITY radioNotDownload.accesskey       "o">
 <!ENTITY radioAskDownload                 "Ask me">
 <!ENTITY radioAskDownload.accesskey       "k">
+<!ENTITY mailConnections.caption          "Mail Connections">
+<!ENTITY mailnewsTimeout.label            "Connection timeout:">
+<!ENTITY mailnewsTimeout.accesskey        "m">
+<!ENTITY mailnewsTimeoutSeconds.label     "seconds">
 <!ENTITY Diskspace                        "Disk Space">
 <!ENTITY offlineCompact.label             "Compact folders when it will save over">
 <!ENTITY offlineCompact.accesskey         "C">
 <!ENTITY kb.label                         "KB">
--- a/suite/mailnews/prefs/mailPrefsOverlay.xul
+++ b/suite/mailnews/prefs/mailPrefsOverlay.xul
@@ -94,17 +94,17 @@
                   url="chrome://messenger/content/pref-receipts.xul"
                   helpTopic="mail-prefs-receipts"/>
         <treeitem id="characterEncodingItem"
                   label="&characterEncoding.label;"
                   prefpane="character_encoding_pane"
                   url="chrome://messenger/content/pref-character_encoding.xul"
                   helpTopic="mail_prefs_character_encoding"/>
         <treeitem id="offlineItem"
-                  label="&offline.label;"
+                  label="&networkStorage.label;"
                   prefpane="offline_pane"
                   url="chrome://messenger/content/pref-offline.xul"
                   helpTopic="mail_prefs_offline"/>
       </treechildren>
     </treeitem>
   </treechildren>
 
 </overlay>
--- a/suite/mailnews/prefs/pref-offline.xul
+++ b/suite/mailnews/prefs/pref-offline.xul
@@ -20,17 +20,17 @@
  Netscape Communications Corporation.
  Portions created by the Initial Developer are Copyright (C) 1998-1999
  the Initial Developer. All Rights Reserved.
 
  Contributor(s):
    Mohan Bhamidipati (mohanb@netscape.com)
    Diego Biurrun     (diego@biurrun.de)
    David Bienvenu    (bienvenu@nventure.com)
-   Ian Neal          (bugzilla@arlen.demon.co.uk)
+   Ian Neal          (iann_bugzilla@blueyonder.co.uk)
 
  Alternatively, the contents of this file may be used under the terms of
  either of the GNU General Public License Version 2 or later (the "GPL"),
  or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  in which case the provisions of the GPL or the LGPL are applicable instead
  of those above. If you wish to allow use of your version of this file only
  under the terms of either the GPL or the LGPL, and not to allow others to
  use your version of this file under the terms of the MPL, indicate your
@@ -42,29 +42,32 @@
  ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet href="chrome://messenger/skin/prefPanels.css" type="text/css"?>
 
 <!DOCTYPE overlay SYSTEM "chrome://messenger/locale/pref-offline.dtd">
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <prefpane id="offline_pane"
-            label="&pref.offline.title;"
+            label="&pref.network.title;"
             script="chrome://messenger/content/pref-offline.js">
 
     <preferences id="offline_preferences">
       <preference id="offline.startup_state"
                   name="offline.startup_state"
                   type="int"/>
       <preference id="offline.send.unsent_messages"
                   name="offline.send.unsent_messages"
                   type="int"/>
       <preference id="offline.download.download_messages"
                   name="offline.download.download_messages"
                   type="int"/>
+      <preference id="mailnews.tcptimeout"
+                  name="mailnews.tcptimeout"
+                  type="int"/>
       <preference id="mail.prompt_purge_threshhold"
                   name="mail.prompt_purge_threshhold"
                   type="bool"
                   onchange="EnableMailPurgeThreshhold(this.value);"/>
       <preference id="mail.purge_threshhold"
                   name="mail.purge_threshhold"
                   type="int"/>
     </preferences>
@@ -109,23 +112,42 @@
           <radio value="1" label="&radioAutoDownload;"
                  accesskey="&radioAutoDownload.accesskey;"/>
           <radio value="2" label="&radioNotDownload;"
                  accesskey="&radioNotDownload.accesskey;"/>
           <radio value="0" label="&radioAskDownload;"
                  accesskey="&radioAskDownload.accesskey;"/>
         </radiogroup>
     </groupbox>
-    
+
+    <groupbox>
+      <caption label="&mailConnections.caption;"/>
+      <hbox align="center">
+        <label id="timeoutLabel"
+               value="&mailnewsTimeout.label;"
+               accesskey="&mailnewsTimeout.accesskey;"
+               control="mailnewsTimeoutSeconds"/>
+        <textbox id="mailnewsTimeoutSeconds"
+                 type="number"
+                 size="4"
+                 preference="mailnews.tcptimeout"
+                 aria-labelledby="timeoutLabel mailnewsTimeoutSeconds timeoutSeconds"/>
+        <label id="timeoutSeconds" value="&mailnewsTimeoutSeconds.label;"/>
+      </hbox>
+    </groupbox>
+
     <groupbox>
       <caption label="&Diskspace;"/>
       <hbox align="center">
         <checkbox id="offlineCompactFolder" label="&offlineCompact.label;" accesskey="&offlineCompact.accesskey;"
           preference="mail.prompt_purge_threshhold"
           aria-labelledby="offlineCompactFolder offlineCompactFolderMin kbLabel"/>
-        <textbox id="offlineCompactFolderMin" size="5" value="100"
+        <textbox id="offlineCompactFolderMin"
+                 type="number"
+                 size="5"
+                 value="100"
                  preference="mail.purge_threshhold"
                  aria-labelledby="offlineCompactFolder offlineCompactFolderMin kbLabel"/>
         <label id="kbLabel" value="&kb.label;"/>
       </hbox>
     </groupbox>
   </prefpane>
 </overlay>