Bug 340949: WCAP provider part of the build. Switched off by default. r=dmose

calendar/base/public/calIErrors.idl

@@ -92,5 +92,12 @@ interface calIErrors : nsISupports
   const unsigned long ICS_USAGE = ICS_ERROR_BASE + 8;
   const unsigned long ICS_UNIMPLEMENTED = ICS_ERROR_BASE + 9;
   const unsigned long ICS_UNKNOWN = ICS_ERROR_BASE + 10;
+  
+  /**
+   * WCAP specific errors, defined in
+   * calendar/providers/wcap/public/calIWcapErrors.idl
+   * Range claimed is [ERROR_BASE + 0x200, ERROR_BASE + 0x300)
+   */
+  const unsigned long WCAP_ERROR_BASE = ERROR_BASE + 0x200;
 };
 

calendar/lightning/content/lightning.js

@@ -72,3 +72,4 @@ pref("calendar.week.d6saturdaysoff", true);
 //pref("calendar.timezone.local", "");
 
 pref("calendar.prototypes.wcap", false);
+pref("calendar.wcap.enabled", false);

calendar/lightning/jar.mn

@@ -80,6 +80,7 @@ calendar-en-US.jar:
   locale/en-US/calendar/calendarCreation.dtd   (/calendar/locales/en-US/chrome/calendar/calendarCreation.dtd)
   locale/en-US/calendar/selectAddresses.dtd    (/calendar/locales/en-US/chrome/calendar/selectAddresses.dtd)
   locale/en-US/calendar/calendar.properties    (/calendar/locales/en-US/chrome/calendar/calendar.properties)
+  locale/en-US/calendar/wcap.properties        (/calendar/locales/en-US/chrome/calendar/wcap.properties)
   locale/en-US/calendar/dateFormat.properties  (/calendar/locales/en-US/chrome/calendar/dateFormat.properties)
   locale/en-US/calendar/menuOverlay.dtd        (/calendar/locales/en-US/chrome/calendar/menuOverlay.dtd)
   locale/en-US/calendar/preferences/alarms.dtd (/calendar/locales/en-US/chrome/calendar/preferences/alarms.dtd)

calendar/locales/en-US/chrome/calendar/calendar.dtd

@@ -506,6 +506,7 @@
 <!ENTITY calendarproperties.color.label    "Color:">
 <!ENTITY calendarproperties.webdav.label   "WebDAV">
 <!ENTITY calendarproperties.caldav.label   "CalDAV">
+<!ENTITY calendarproperties.wcap.label     "Sun Java System Calendar Server (WCAP)">
 <!ENTITY calendarproperties.format.label   "Format:">
 <!ENTITY calendarproperties.location.label "Location:">
 <!ENTITY calendarproperties.name.label     "Name:">

calendar/locales/jar.mn

@@ -20,6 +20,7 @@ calendar-@AB_CD@.jar:
     locale/@AB_CD@/calendar/calendar.dtd         (%chrome/calendar/calendar.dtd)
     locale/@AB_CD@/calendar/calendarCreation.dtd (%chrome/calendar/calendarCreation.dtd)
     locale/@AB_CD@/calendar/calendar.properties  (%chrome/calendar/calendar.properties)
+    locale/@AB_CD@/calendar/wcap.properties      (%chrome/calendar/wcap.properties)
     locale/@AB_CD@/calendar/dateFormat.properties  (%chrome/calendar/dateFormat.properties)
     locale/@AB_CD@/calendar/email.properties     (%chrome/calendar/email.properties)
     locale/@AB_CD@/calendar/global.dtd           (%chrome/calendar/global.dtd)

calendar/providers/Makefile.in

@@ -45,6 +45,6 @@ include $(DEPTH)/config/autoconf.mk
 MODULE = calprovs
 MODULE_NAME = calProviderModule
 
-DIRS = memory storage composite caldav ics
+DIRS = memory storage composite caldav ics wcap
 
 include $(topsrcdir)/config/rules.mk

calendar/resources/content/calendarCreation.js

@@ -35,6 +35,19 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+function initLocationPage()
+{
+    var bShowWcap = false;
+    try {
+        bShowWcap = getPrefSafe("calendar.prototypes.wcap", false);
+    }
+    catch (exc) {} // calendar.prototypes.wcap currently not present in Sunbird
+    bShowWcap = (bShowWcap || getPrefSafe("calendar.wcap.enabled", false));
+    document.getElementById("wcap-radio").setAttribute(
+        "collapsed", bShowWcap ? "false" : "true");
+    checkRequired();
+}
+
 function checkRequired() {
     var canAdvance = true;
     var curPage = document.getElementById('calendar-wizard').currentPage;

calendar/resources/content/calendarCreation.xul

@@ -73,7 +73,7 @@
    <wizardpage pageid="locationPage" 
                next="customizePage"
                label="&wizard.label;"
-               onpageshow="checkRequired();"
+               onpageshow="initLocationPage();"
                description="&wizard.description;">
         <description>&locationpage.description;</description>
         <grid>
@@ -87,6 +87,7 @@
                     <radiogroup id="calendar-format">
                         <radio value="ics" label="&calendarproperties.webdav.label;" selected="true" />
                         <radio value="caldav" label="&calendarproperties.caldav.label;"/>
+                        <radio id="wcap-radio" value="wcap" label="&calendarproperties.wcap.label;"/>
                     </radiogroup>
                 </row>
                 <row align="center">

calendar/sunbird/app/profile/sunbird.js

@@ -190,3 +190,4 @@ pref("browser.preferences.animateFadeIn", true);
 pref("browser.preferences.animateFadeIn", false);
 #endif
 
+pref("calendar.wcap.enabled", false);