Use new libical. Don't build libxpical anymore

r=dmose. bug 237302 and 273447

calendar/Makefile.in

@@ -42,7 +42,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE	= calendar
-DIRS = libxpical resources base providers
+DIRS = libical resources base providers
 
 include $(topsrcdir)/config/rules.mk
 

calendar/base/public/calIICSService.idl

@@ -46,8 +46,8 @@ interface calIDateTime;
 
 interface calIIcalProperty;
 
-[ptr] native icalpropertyptr(void);
-[ptr] native icalcomponentptr(void);
+[ptr] native icalpropertyptr(struct icalproperty_impl);
+[ptr] native icalcomponentptr(struct icalcomponent_impl);
 
 /**
  * General notes:

calendar/base/src/calDateTime.cpp

@@ -308,7 +308,7 @@ calDateTime::GetIcalString(nsACString& aResult)
     ToIcalTime(&t);
 
     // note that ics is owned by libical, so we don't need to free
-    char *ics = icaltime_as_ical_string(t);
+    const char *ics = icaltime_as_ical_string(t);
     
     if (ics) {
         aResult.Assign(ics);
@@ -343,7 +343,10 @@ calDateTime::ToIcalTime(icaltimetype *icalt)
 void
 calDateTime::FromIcalTime(icaltimetype *icalt)
 {
-    NS_ASSERTION(icalt->zone == NULL, "Got icaltimetype with a non-null zone!");
+     if (icalt->zone) {
+         NS_ASSERTION(icalt->zone == icaltimezone_get_utc_timezone(),
+                      "Got icaltimetype with a non-null and non-utc zone!");
+     }
 
     mYear = icalt->year;
     mMonth = icalt->month - 1;

calendar/base/src/calICSService.cpp

@@ -99,7 +99,7 @@ calIcalProperty::SetStringValue(const nsACString &str)
 NS_IMETHODIMP
 calIcalProperty::GetPropertyName(nsACString &name)
 {
-    const char *icalstr = icalproperty_get_name(mProperty);
+    const char *icalstr = icalproperty_get_property_name(mProperty);
     if (!icalstr) {
 #ifdef DEBUG
         fprintf(stderr, "Error getting property name: %d (%s)\n",

calendar/libical/src/libical/Makefile.in

@@ -43,9 +43,9 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE           = calical
-LIBRARY_NAME     = calical_s
-MODULE_NAME      = calIcalModule
+MODULE           = ical
+LIBRARY_NAME     = mozical
+MODULE_NAME      = mozIcalModule
 FORCE_STATIC_LIB = 1
 GRE_MODULE       = 1
 

calendar/libical/src/libicalss/Makefile.in

@@ -43,14 +43,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE           = calicalss
-LIBRARY_NAME     = calicalss_s
-MODULE_NAME      = calIcalssModule
+MODULE           = icalss
+LIBRARY_NAME     = mozicalss
+MODULE_NAME      = mozIcalssModule
 FORCE_STATIC_LIB = 1
 GRE_MODULE       = 1
 
+EXPORTS = icalss.h
+
 REQUIRES =			\
-	calical 		\
+	ical			\
 	$(NULL)
 
 CSRCS =				\
@@ -73,7 +75,6 @@ DESIGNDATA = $(srcdir)/../../design-data
 ICALSCRIPTS = $(srcdir)/../../scripts
 
 CFLAGS += -DHAVE_CONFIG_H -I$(srcdir)/../.. -I$(srcdir)/../libical
-EXPORTS = icalss.h
 
 # ORDERING OF HEADERS IS SIGNIFICANT. Don't change this ordering. It
 # is required to make the combined header ical.h properly
@@ -88,17 +89,17 @@ COMBINEDHEADERS =                        \
 	$(srcdir)/icalspanlist.h \
 	$(srcdir)/icalmessage.h
 
-rebuild:
-	echo '#ifdef __cplusplus'         >  $(srcdir)/icalss.h
-	echo 'extern "C" {'               >> $(srcdir)/icalss.h
-	echo '#endif'                     >> $(srcdir)/icalss.h
-	echo '/*'                         >> $(srcdir)/icalss.h
-	echo ' $$''Id''$$'                >> $(srcdir)/icalss.h
-	echo '*/'                         >> $(srcdir)/icalss.h
+icalss.h: $(COMBINEDHEADERS)
+	echo '#ifdef __cplusplus'         >  icalss.h
+	echo 'extern "C" {'               >> icalss.h
+	echo '#endif'                     >> icalss.h
+	echo '/*'                         >> icalss.h
+	echo ' $$''Id''$$'                >> icalss.h
+	echo '*/'                         >> icalss.h
 	cat $(COMBINEDHEADERS)				\
 	| egrep -v "#include.*\"ical"			\
 	| egrep -v "#include.*\"pvl\.h\""		\
-	| egrep -v '\$$(Id|Locker): .+\$$'>> $(srcdir)/icalss.h
-	echo '#ifdef __cplusplus'         >> $(srcdir)/icalss.h
-	echo '};'                         >> $(srcdir)/icalss.h
-	echo '#endif'                     >> $(srcdir)/icalss.h
+	| egrep -v '\$$(Id|Locker): .+\$$'>> icalss.h
+	echo '#ifdef __cplusplus'         >> icalss.h
+	echo '};'                         >> icalss.h
+	echo '#endif'                     >> icalss.h