Bug #249838 --> Start hooking up webservices and the smart update notifications for Thunderbird.

mail/app/profile/thunderbird.js

@@ -66,21 +66,36 @@ pref("update.extensions.enabled", true);
 pref("update.extensions.wsdl", "chrome://mozapps/locale/extensions/extensions.properties");
 pref("extensions.getMoreExtensionsURL", "chrome://mozapps/locale/extensions/extensions.properties");
 pref("extensions.getMoreThemesURL", "chrome://mozapps/locale/extensions/extensions.properties");
-// Automatically download and install updates to themes and extensions.
-pref("update.extensions.autoUpdate", false);
 
-pref("update.interval", 604800000); // every 7 days
-pref("update.lastUpdateDate", 0); // UTC offset when last update was performed. 
+pref("update.extensions.autoUpdate", false);    // Automatically download and install 
+                                                // updates to themes and extensions. 
+                                                // Does nothing at present. 
+pref("update.extensions.interval", 604800000);  // Check for updates to Extensions and 
+                                                // Themes every week
+pref("update.extensions.lastUpdateDate", 0);    // UTC offset when last Extension/Theme 
+                                                // update was performed. 
+pref("update.extensions.severity.threshold", 5);// The number of pending Extension/Theme
+                                                // updates you can have before the update
+                                                // notifier goes from low->medium severity.
+pref("update.app.interval", 86400000);          // Check for updates to Firefox every day
+pref("update.app.lastUpdateDate", 0);           // UTC offset when last App update was 
+                                                // performed. 
+pref("update.interval", 3600000);               // Check each of the above intervals 
+                                                // every 60 mins
+pref("update.showSlidingNotification", false);   // Windows-only slide-up taskbar 
+                                                // notification.
 
 // These prefs relate to the number and severity of updates available. This is a 
 // cache that the browser notification mechanism uses to determine if it should show
 // status bar UI if updates are detected and the app is shut down before installing
 // them.
-// 0 = low (extension/theme updates), 1 = medium (app minor version), 2 = high (major version)
+// 0 = low    (extension/theme updates), 
+// 1 = medium (numerous extension/theme updates), 
+// 2 = high   (new version of Firefox/Security patch)
 pref("update.severity", 0); 
 // The number of extension/theme/etc updates available
 pref("update.extensions.count", 0);
-
+pref("xpinstall.whitelist.add", "update.mozilla.org");
 
 /////////////////////////////////////////////////////////////////
 // Overrides of the seamonkey suite mailnews.js prefs

mail/base/content/messenger.css

@@ -95,3 +95,8 @@ dummy.usesMailWidgets {
   cursor: default;
   -moz-user-focus: none;
 }
+
+#statusbar-updates {
+  -moz-binding: url("chrome://mozapps/content/update/updates.xml#updateStatusbarNotification");
+}
+

mail/base/content/messenger.xul

@@ -382,5 +382,6 @@
   <statusbar id="status-bar" class="chromeclass-status">
     <statusbarpanel id="unreadMessageCount"/>
     <statusbarpanel id="totalMessageCount"/>
+    <statusbarpanel id="statusbar-updates"/>
   </statusbar>
 </window>

mail/base/content/msgMail3PaneWindow.js

@@ -773,6 +773,9 @@ function delayedOnLoadMessenger()
 
   var toolbarset = document.getElementById('customToolbars');
   toolbox.toolbarset = toolbarset;
+
+  var updatePanel = document.getElementById("statusbar-updates");
+  updatePanel.init();
 }
 
 function OnUnloadMessenger()

mail/base/skin/mailWindow1.css

@@ -1027,3 +1027,9 @@ treechildren::-moz-tree-cell-text(lc-black, selected) {
 #messagepanebox[focusring="true"] > #messagepane {
   border-color: #000000;
 }
+
+/* ..... smart update statusbar panel ..... */
+
+#statusbar-updates[updateCount="0"]{
+  visibility: collapse; 
+}

mail/components/prefwindow/content/pref-advanced.js

@@ -148,3 +148,12 @@ function editPasswords()
 {
   window.openDialog("chrome://communicator/content/wallet/SignonViewer.xul","_blank","chrome,centerscreen,resizable=yes", "S");
 }
+
+function checkForUpdates()
+{
+  var updates = Components.classes["@mozilla.org/updates/update-service;1"]
+                          .getService(Components.interfaces.nsIUpdateService);
+  updates.checkForUpdates([], 0, Components.interfaces.nsIUpdateItem.TYPE_ANY, 
+                          Components.interfaces.nsIUpdateService.SOURCE_EVENT_USER,
+                          window);
+}

mail/components/prefwindow/content/pref-advanced.xul

@@ -39,7 +39,12 @@
 
 <?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 
-<!DOCTYPE page SYSTEM "chrome://messenger/locale/pref-advanced.dtd" >
+<!DOCTYPE page [
+  <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd">
+  <!ENTITY % advancedDTD SYSTEM "chrome://messenger/locale/pref-advanced.dtd">
+  %brandDTD;
+  %advancedDTD;
+]>
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       xmlns:nc="http://home.netscape.com/NC-rdf#"
@@ -64,6 +69,9 @@
                        // general settings
                        "showCondensedAddresses", "markAsRead", "markAsReadDelay", "showFolderPaneColumns",
                                               
+                       // smart update
+                       "enableSmartUpdate", "enableExtensionUpdate",
+                                              
                        // connection
                        "networkProxyType",
                        "networkProxyHTTP", "networkProxyHTTP_Port", 
@@ -93,6 +101,37 @@
       </vbox>      
     </expander>  
 
+    <!-- Message Display Extras  -->
+    <expander id="generalSettings" label="&generalSettings.label;" open="true" persist="open" clearhidden="true">
+      <hbox align="center" pack="start">
+        <checkbox id="showCondensedAddresses" label="&showCondensedAddresses.label;" prefstring="mail.showCondensedAddresses"/>
+      </hbox> 
+      <hbox align="center" pack="start">
+        <checkbox id="markAsRead" label="&markAsRead.label;" prefstring="mailnews.mark_message_read.delay"/>
+        <textbox  id="markAsReadDelay" size="2" preftype="int" prefstring="mailnews.mark_message_read.delay.interval"/>
+        <label value="&markAsReadEnd.label;"/>
+      </hbox>
+      <hbox align="center" pack="start">
+        <checkbox id="showFolderPaneColumns" label="&showFolderColumns.label;" prefstring="mail.showFolderPaneColumns"/>
+      </hbox> 
+    </expander>
+
+    <expander id="softwareupdate" label="&softwareupdate.label;" 
+              open="true" persist="open" clearhidden="true" align="left">
+      <label>&softwareupdateinfo.label;</label>
+      <vbox class="indent" align="left">
+        <checkbox id="enableSmartUpdate"
+                  label="&enableSmartUpdate.label;" accesskey="&enableSmartUpdate.accesskey;"
+                  prefstring="update.app.enabled"/>
+        <checkbox id="enableExtensionUpdate"
+                  label="&enableExtensionUpdate.label;" accesskey="&enableExtensionUpdate.accesskey;"
+                  prefstring="update.extensions.enabled"/>      
+        <separator class="thin"/>
+        <button label="&checkNow.label;" accesskey="&checkNow.accesskey;"
+                oncommand="checkForUpdates();"/>
+      </vbox>
+    </expander>
+
     <!-- Password management -->
     <expander id="passwordManagement" label="&signonHeader.label;" open="true" persist="open" clearhidden="true">
       <hbox id="passwordManager" align="center" pack="end">
@@ -123,21 +162,6 @@
       </hbox>
     </expander>
 
-    <!-- Message Display Extras  -->
-    <expander id="generalSettings" label="&generalSettings.label;" open="true" persist="open" clearhidden="true">
-      <hbox align="center" pack="start">
-        <checkbox id="showCondensedAddresses" label="&showCondensedAddresses.label;" prefstring="mail.showCondensedAddresses"/>
-      </hbox> 
-      <hbox align="center" pack="start">
-        <checkbox id="markAsRead" label="&markAsRead.label;" prefstring="mailnews.mark_message_read.delay"/>
-        <textbox  id="markAsReadDelay" size="2" preftype="int" prefstring="mailnews.mark_message_read.delay.interval"/>
-        <label value="&markAsReadEnd.label;"/>
-      </hbox>
-      <hbox align="center" pack="start">
-        <checkbox id="showFolderPaneColumns" label="&showFolderColumns.label;" prefstring="mail.showFolderPaneColumns"/>
-      </hbox> 
-    </expander>
-
     <!-- Return Receipts -->
     <expander id="returnReceipts" label="&receiptSettings.label;" persist="open" clearhidden="true">
 

mail/components/prefwindow/locale/pref-advanced.dtd

@@ -75,3 +75,16 @@
 <!ENTITY autoTypeRadio.accesskey       "a">
 <!ENTITY reload.label                  "Reload">
 <!ENTITY reload.accesskey              "l">
+
+<!-- Software Update -->
+<!ENTITY softwareupdate.label             "Software Update">
+<!ENTITY softwareupdateinfo.label         "Periodically check for updates to:">
+<!ENTITY enableSmartUpdate.label          "&brandShortName;">
+<!ENTITY enableSmartUpdate.accesskey      "F">
+<!ENTITY enableExtensionUpdate.label      "My Extensions">
+<!ENTITY enableExtensionUpdate.accesskey  "y">
+<!ENTITY enableAutoInstall.label          "Automatically download and install updates to Extensions.">
+<!ENTITY enableAutoInstall.accesskey      "d">
+<!ENTITY checkNow.label                   "Check Now">
+<!ENTITY checkNow.accesskey               "N">
+

mail/config/mozconfig

@@ -15,6 +15,6 @@ ac_add_options --disable-oji
 ac_add_options --disable-necko-disk-cache
 ac_add_options --enable-single-profile
 ac_add_options --disable-profilesharing
-ac_add_options --enable-extensions=wallet,spellcheck,xmlextras
+ac_add_options --enable-extensions=wallet,spellcheck,xmlextras,webservices
 ac_add_options --enable-necko-protocols=http,file,jar,viewsource,res,data
 ac_add_options --enable-image-decoders=default,-xbm

mail/installer/windows/basemail-win

@@ -254,6 +254,7 @@ bin\components\nsExtensionManager.js
 bin\components\nsBackgroundUpdateService.js
 bin\components\extensions.xpt
 bin\components\update.xpt
+bin\components\websrvcs.xpt
             
 ; psm2
 ; Optional - only if you need HTTPS support

toolkit/themes/qute/mozapps/jar.mn

@@ -32,7 +32,8 @@ classic.jar:
   skin/classic/mozapps/shared/viewFader.png                         (shared/viewFader.png)
   skin/classic/mozapps/update/icon32.png                            (update/icon32.png)
   skin/classic/mozapps/update/update.css                            (update/update.css)
-  skin/classic/mozapps/update/warning.gif                           (update/warning.gif)
+  skin/classic/mozapps/update/update.png                            (update/update.png)
+  skin/classic/mozapps/update/extensionalert.png                    (update/extensionalert.png)
   skin/classic/mozapps/xpinstall/xpinstallConfirm.css               (xpinstall/xpinstallConfirm.css)
   skin/classic/mozapps/xpinstall/xpinstallIcon.png                  (xpinstall/xpinstallIcon.png)
   skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png           (xpinstall/xpinstallItemGeneric.png)

toolkit/themes/qute/mozapps/update/update.css

@@ -56,7 +56,7 @@ updateitem {
 
 /* Update Wizard */
 #alert {
-  list-style-image: url("chrome://mozapps/skin/update/warning.gif"); 
+  list-style-image: url("chrome://mozapps/skin/update/update.png"); 
 }
 
 /* Inline Update Notifications */
@@ -65,15 +65,26 @@ updateitem {
 }
 
 .updateIcon {
+  list-style-image: url("chrome://mozapps/skin/update/extensionalert.png"); 
+  -moz-image-region: rect(0px 16px 16px 0px);
   width: 16px;
   height: 16px;
 }
 .updateIcon[severity="0"] {
-  background-color: #00FF00;
+  -moz-image-region: rect(0px 16px 16px 0px);
 }
 .updateIcon[severity="1"] {
-  background-color: #0000FF;
+  -moz-image-region: rect(0px 32px 16px 16px);
 }
 .updateIcon[severity="2"] {
-  background-color: #FF0000;
+  -moz-image-region: rect(0px 48px 16px 32px);
+}
+
+#incompatibleAlert {
+  background-color: InfoBackground;
+  color: InfoText;
+  border: 1px outset InfoBackground;
+  margin-left: 3px;
+  margin-right: 3px;
+  padding: 5px;
 }