Remove libical from this tree, it resides in e-d-s now.

svn path=/trunk/; revision=23417

254 files changed, 0 insertions, 76796 deletions

diff --git a/libical/src/.cvsignore b/libical/src/.cvsignore
deleted file mode 100644
index dc4caac801..0000000000
--- a/libical/src/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile.in
-Makefile
-.deps
-.libs
-*.lo
-*.la
diff --git a/libical/src/Makefile.am b/libical/src/Makefile.am
deleted file mode 100644
index 5e5cd331db..0000000000
--- a/libical/src/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-if WITH_PYTHON
-PYTHON_DIR = python
-else
-PYTHON_DIR = 
-endif
-
-if WITH_JAVA
-JAVA_DIR = java
-else
-JAVA_DIR = 
-endif
-
-if WITH_CAP
-LIBICALCAP_DIR = libicalcap
-else
-LIBICALCAP_DIR = 
-endif
-
-SUBDIRS = libical libicalss $(LIBICALCAP_DIR) libicalvcal $(PYTHON_DIR) $(JAVA_DIR) test
diff --git a/libical/src/Net-ICal-Libical/MANIFEST b/libical/src/Net-ICal-Libical/MANIFEST
deleted file mode 100644
index 1a6880e8b4..0000000000
--- a/libical/src/Net-ICal-Libical/MANIFEST
+++ /dev/null
@@ -1,16 +0,0 @@
-MANIFEST
-Makefile.PL
-lib/Net/ICal/Libical.pm
-netical.i
-netical_wrap.c
-netical_wrap.doc
-test-data/2446.mime
-test-data/error
-test-data/mail-examples
-test-data/no-error
-test-data/rfc2445.ics
-test-data/rfc2446.ics
-test-data/single-with-error
-test/example.pl
-test/libical.pl
-test/swig.pl
diff --git a/libical/src/Net-ICal-Libical/Makefile.PL b/libical/src/Net-ICal-Libical/Makefile.PL
deleted file mode 100644
index f46c61bc02..0000000000
--- a/libical/src/Net-ICal-Libical/Makefile.PL
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/perl
-# -*- Mode: perl -*-
-
-use ExtUtils::MakeMaker;
-WriteMakefile(
-	      'MAKEFILE'=> 'Makefile',
-	      'VERSION_FROM' => 'lib/Net/ICal/Libical.pm',
-	      'NAME'    => 'Net::ICal::Libical',  
-	      'INC'     => '-I../libical -I ../libicalss',
-	      'LIBS'    => ['-L../libical/.libs -L../libicalss/.libs -lical -licalss -lm'],
-	      'OBJECT'  => 'netical_wrap.o',  # Object files
-              dist => {
-                       COMPRESS     =>'gzip',
-                       SUFFIX       =>'gz'
-                      },
-
-	     );
-
-sub MY::top_targets
-{
-  my $self = shift;
-
-  my $old = $self->MM::top_targets;
-
-  return "all::  netical_wrap.o\n$old";
-
-}
-
-sub MY::postamble
-{
-
-  return <<EOM;
-
-netical_wrap.c: netical.i
-	swig -perl5 -package Net::ICal::Libical netical.i
-
-wrap:
-	swig -perl5 -package Net::ICal::Libical netical.i
-
-
-EOM
-}
diff --git a/libical/src/Net-ICal-Libical/README b/libical/src/Net-ICal-Libical/README
deleted file mode 100644
index b4b4b9c8b9..0000000000
--- a/libical/src/Net-ICal-Libical/README
+++ /dev/null
@@ -1,7 +0,0 @@
-
-Net::ICal::Libical: A perl binding to libical. 
-
-This code is PRE-ALPHA. Some of the test routines work, but the code
-is not really useful. It is looking for an author, so if you'd like to
-have this binding working, please volunteer to work on it. Contact
-Eric Busboom, eric@softwarestudio.org
diff --git a/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical.pm b/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical.pm
deleted file mode 100644
index a9b15f3855..0000000000
--- a/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical.pm
+++ /dev/null
@@ -1,386 +0,0 @@
-#!/usr/bin/perl
-# -*- Mode: perl -*-
-#======================================================================
-# FILE: Libical.pm
-# CREATOR: eric 
-#
-# DESCRIPTION:
-#   
-#
-#  $Id$
-#  $Locker$
-#
-# (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-#
-# This package is free software and is provided "as is" without express
-# or implied warranty.  It may be used, redistributed and/or modified
-# under the same terms as perl itself. ( Either the Artistic License or the
-# GPL. ) 
-#
-#======================================================================
-
-# This part of this file was automatically generated by SWIG
-
-require Net::ICal::Libical::Component;
-require Net::ICal::Libical::Property;
-require Net::ICal::Libical::Time;
-require Net::ICal::Libical::Duration;
-
-package Net::ICal::Libical;
-require Exporter;
-require DynaLoader;
-@ISA = qw(Exporter DynaLoader);
-package Net::ICal::Libical;
-bootstrap Net::ICal::Libical;
-var_Net__ICal__Libical_init();
-@EXPORT = qw( );
-
-$VERSION = "0.01";
-
-1;
-
-
-
-
-sub validate_component {
-  my $comp_str = shift;
- 
-
-  my $c = Net::ICal::Libical::icalparser_parse_string($comp_str); 
-  my $out;
-
-  die "Failed to parse component" if !$c;
-
-  my $r = Net::ICal::Libical::icalrestriction_check($c);
-  
-  $out = Net::ICal::Libical::icalcomponent_as_ical_string($c);
-
-  Net::ICal::Libical::icalcomponent_free($c);
-
-  return $out;
-
-}
-
-
-sub generate_occurrences {
-  my $rule = shift;
-  my $start = shift;
-  my $count = shift;
-
-  my @out;
-
-  my $array = Net::ICal::Libical::icallangbind_new_array(25);
-
-  Net::ICal::Libical::icalrecur_expand_recurrence($rule,$start,
-						$count,$array);
-		   
-  for($i = 0; $i<$count; $i++){
-    my $t = Net::ICal::Libical::icallangbind_access_array($array,$i);
-    if($t != 0) {
-      push(@out,$t);
-    }
-
-  }
-
-  Net::ICal::Libical::icallangbind_free_array($array);
-
-  return @out;
-}
-
-
-# The remaining code is just the interface declarations for a complete
-# perl binding to libical. Currently, it is looking for an author....
-
-
-           
-
-
-1;
-
-__END__
-
-#""" Represent iCalendar DATE, TIME and DATE-TIME ""
-
-package Net::ICal::Libical::Time;
-@ISA = (Property);
-
-sub new {}
-
-#"""Updates value and value_type based on the (internal) self.tt."""
-sub _update_value { }
-
-# " Return true if this is a valid time "
-sub valid { }
-
-# """ Return or set time in seconds past POSIX epoch"""
-sub utc_seconds {}
-
-# """ Return or set boolean indicating if time is in UTC """ 
-sub is_utc {}
-
-# Get/Set booll indicating is time is a date
-sub is_date(self,v=None):
-
-#"" Return or set the timezone string for this time """
-sub timezone {}
-
-#"" Get or set the seconds component of this time """
-sub second {}
-sub minute {}
-sub hour {}
-sub day {}
-sub month {}
-sub year {}
-
-# How dow you over load +,- in perl?
-
-# Add duration to time = time
-sub __add__{}
-
-# Subtract time from time = duration
-# Subtract duration from time = time
-sub __sub__(self,o):
-
-
-package Net::ICal::Libical::Duration(Property):
-@ISA = (Property);
-
-sub new {}
-sub _update_value {}
-#"Return true if this is a valid duration"
-sub valid {}
-# """Return or set duration in seconds"""
-sub seconds {}
-
-
-#"""Represent a span of time"""
-
-package Net::ICal::Libical::Period;
-@ISA = (Property);
-
-sub new{}
-
-sub _end_is_duration {}
-sub _end_is_time {}
-sub _update_value {}
-
-#"Return true if this is a valid period"
-sub valid {}
-
-#Return or set start time of the period. The start time may be
-#expressed as an RFC2445 format string or an instance of Time.
-#The return value is an instance of Time
-sub start {}
-
-#Return or set end time of the period. The end time may be
-#expressed as an RFC2445 format string or an instance of Time.
-#The return value is an instance of Time.
-
-#If the Period has a duration set, but not an end time, this
-#method will caluculate the end time from the duration. 
-sub end {}
-
-#Return or set the duration of the period. The duration may be
-#expressed as an RFC2445 format string or an instance of Duration.
-#The return value is an instance of Duration.
-#If the period has an end time set, but not a duration, this
-#method will calculate the duration from the end time.  
-sub duration{}
-
-# Get set the timezone for the period. Basically returns self->dict{TZID}
-sub timezone(self,v=None):
-
-
-# Represents the value and all parameters of an attendee
-package Net::ICal::Libical::Attendee(Property):
-@ISA = (Property);
-
-sub new{}
-
-# Methods for accessing enumerated parameters
-sub cn {}
-sub cutype {}
-sub dir {}
-sub delegated_from {}
-sub delegated_to {}
-sub language {}
-sub member {}
-sub partstat {}
-sub role {}
-sub rsvp {}
-sub sent_by {}
-
-
-package Net::ICal::Libical::Organizer;
-@ISA = (Property)
-# Methods for accessing enumerated parameters
-sub cn{}
-sub dir{}
-sub language {}
-sub sent_by {}
-
-package Net::ICal::Libical::Recurrence_Id;
-@ISA= (Property)
-
-package Net::ICal::Libical::Attach;
-@ISA= (Property)
-        
-package Net::ICal::Libical::Event;
-@ISA= (Component)
-
-sub component_type {}
-
-#"Returns a copy of the object."
-sub clone {}
-
-#Sets or returns the value of the DTEND property.
-#Usage:
-#dtend(time_obj)             # Set the value using a Time object
-#dtend('19970101T123000Z')   # Set the value as an iCalendar string
-#dtend(982362522)            # Set the value using seconds (time_t)
-#dtend()                     # Return a Time
-#
-#If the dtend value is being set and duration() has a value, the
-#duration property will be removed.
-sub dtend{}
-
-#Sets or returns the value of the duration property.
-#Usage:
-#duration(dur_obj)       # Set the value using a Duration object
-#duration("P3DT12H")     # Set value as an iCalendar string
-#duration(3600)          # Set duration using seconds
-#duration()              # Return a duration
-#
-#If the duration value is being set and dtend() has a value, the dtend
-#property will be removed.
-sub duration{}
- 
-#Sets attendees or returns a list of Attendee objects.
-sub attendees {}
-
-#Sets or gets the value of the ORGANIZER property.
-#Usage:
-#organizer(orgObj)              # Set value using an organizer object
-#organizer('MAILTO:jd@not.com') # Set value using a CAL-ADDRESS string
-#organizer()                    # Return a CAL-ADDRESS string
-sub organizer{}
-
-#"Sets or gets the SUMMARY value of the Event."
-sub summary{}
-
-#Sets or gets the UID of the Event.
-sub uid{}
-
-#Sets or gets the value for the RECURRENCE-ID property.
-#Usage:
-#Recurrence_id(recIdObj)             # Set using a Recurrence_Id object
-#Recurrence_id("19700801T133000")    # Set using an iCalendar string
-#Recurrence_id(8349873494)           # Set using seconds from epoch
-#Recurrence_id()                     # Return a Time
-sub recurrence_id{}
-
-#Sets or gets the SEQUENCE value of the Event.
-#Usage:
-#sequence(1)     # Set the value using an integer
-#sequence('2')   # Set the value using a string containing an integer
-#sequence()      # Return an integer       
-sub sequence{}
-  
-#Sets or returns the value of the LAST-MODIFIED property.
-#Usage:
-#lastmodified(time_obj)          # Set the value using a Time object
-#lastmodified('19970101T123000Z')# Set using an iCalendar string
-#lastmodified(982362522)         # Set using seconds 
-#lastmodified()                  # Return a Time
-sub lastmodified{}
-
-
-
-#Sets or returns the value of the CREATED property.
-#Usage:
-#created(time_obj)           # Set the value using a Time object
-#created('19970101T123000Z') # Set using an iCalendar string
-#created(982362522)          # Set using seconds 
-#created()                   # Return a Time
-sub created {}
-
-
-sub related_to{}
-sub comment{}
-
-"Sets or returns the value of the DESCRIPTION property."
-
-sub description {}
-
-#Sets categories or returns a list of Attendee objects.
-sub categories {}
-
-sub attach{}
-
-#Represents a set of event occurrences. This
-#package controls a component's RRULE, EXRULE, RDATE and EXDATE
-#properties and can produce from them a set of occurrences. 
-package Net::ICal::Libical::RecurrenceSet: 
-
-
-#Include a date or rule to the set. 
-#Use date= or pass in a
-#Time instance to include a date. Included dates will add an
-#RDATE property or will remove an EXDATE property of the same
-#date.
-#Use rule= or pass in a string to include a rule. Included
-#rules with either add a RRULE property or remove an EXRULE
-#property.
-
-sub include{}
-
-#Exclude date or rule to the set. 
-#Use date= or pass in a Time instance to exclude a
-#date. Excluded dates will add an EXDATE property or will remove
-#an RDATE property of the same date.
-#Use rule= or pass in a string to exclude a rule. Excluded
-#rules with either add an EXRULE property or remove an RRULE
-#property.
-sub exclude{}
-
-#Return 'count' occurrences as a tuple of Time instances.
-sub occurrences{}
-
-package Net::ICal::Libical::Store;
-sub new{}
-sub path{}
-sub mark{}
-sub commit{} 
-sub addComponent{}
-sub removeComponent{}
-sub countComponents{}
-sub select{}
-sub clearSelect{}
-sub fetch{}
-sub fetchMatchK{}
-sub modify{}
-sub currentComponent{}
-sub firstComponent{}
-sub nextComponent{}
-
-
-package Net::ICal::Libical::FileStore;
-@ISA = (Store)
-sub new{}
-sub path{}
-sub mark{}
-sub commit{} 
-sub addComponent{}
-sub removeComponent{}
-sub countComponents{}
-sub select{}
-sub clearSelect{}
-sub fetch{}
-sub fetchMatchK{}
-sub modify{}
-sub currentComponent{}
-sub firstComponent{}
-sub nextComponent{}
-
-
-1;
diff --git a/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Component.pm b/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Component.pm
deleted file mode 100644
index c25297c111..0000000000
--- a/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Component.pm
+++ /dev/null
@@ -1,175 +0,0 @@
-#!/usr/bin/perl
-# -*- Mode: perl -*-
-#======================================================================
-# FILE: Component.pm
-# CREATOR: eric 1 Mar 01
-#
-# DESCRIPTION:
-#   
-#
-#  $Id$
-#  $Locker$
-#
-# (C) COPYRIGHT 2000, Eric Busboom, eric@softwarestudio.org
-#
-# This package is free software and is provided "as is" without express
-# or implied warranty.  It may be used, redistributed and/or modified
-# under the same terms as perl itself. ( Either the Artistic License or the
-# GPL. ) 
-#
-#
-#======================================================================
-
-
-
-package Net::ICal::Libical::Component;
-use Net::ICal::Libical;
-
-use strict;
-
-sub new{
-  my $class = shift;
-  my $ical_str = shift; # Ical data in string form
-  my $self = {};
-
-  $self->{'comp_p'} = Net::ICal::Libical::icalparser_parse_string($ical_str);
-
-  die "Can't parse string into component" if !$self->{'comp_p'};
-
-  bless $self, $class;
-}
-
-sub new_from_ref {
-  my $class = shift;
-  my $r = shift;
-  my $self = {};
-
-  $self->{'comp_p'} = $r;
-
-  bless $self, $class;
-}
-
-# Destroy must call icalcomponent_free() if icalcomponent_get_parent()
-# returns NULL
-sub DESTROY {
-  my $self = shift;
-  
-  my $c = $self->{'comp_p'};
-  
-  if($c && !Net::ICal::Libical::icalcomponent_get_parent($c)){
-    Net::ICal::Libical::icalcomponent_free($c);
-  }
-  
-}
-
-# Return an array of all properties of the given type
-sub properties{
-
-  my $self = shift;
-  my $prop_name = shift;
-  
-  my @props;
-  
-  if(!$prop_name){
-    $prop_name = 'ANY';
-  }
-
-  # To loop over properties
-  # $comp_p = $self->{'comp_p'}
-  # $p = icallangbind_get_first_property($comp_p,$prop_name)
-  # $p = icallangbind_get_next_property($comp_p,$prop_name)
-
-  my $c = $self->{'comp_p'};
-  my $p; 
-
-  for($p = Net::ICal::Libical::icallangbind_get_first_property($c,$prop_name);
-     $p;
-     $p = Net::ICal::Libical::icallangbind_get_next_property($c,$prop_name)){
-    
-    my $d_string = Net::ICal::Libical::icallangbind_property_eval_string($p,"=>");
-    my %dict = %{eval($d_string)};
-    
-    $dict{'ref'} = $p;
-
-  # Now, look at $dict{'value_type'} or $dict{'name'} to construct a 
-  # derived class of Property. I'll do this later. 
-
-    my $prop;
-
-    if($dict{'value_type'} eq 'DATE' or $dict{'value_type'} eq 'DATE-TIME'){
-      $prop = new Net::ICal::Libical::Time(\%dict);
-    } elsif($dict{'value_type'} eq 'DURATION' ) {
-      $prop = new Net::ICal::Libical::Duration(\%dict);
-    } else  {
-      $prop = new Net::ICal::Libical::Property(\%dict);
-    }
-
-    push(@props,$prop);
-
-  }
-
-
-  return @props;
-  
-}
-
-  
-sub add_property {
-  
-  # if there is a 'ref' key in the prop's dict, then it is owned by
-  # an icalcomponent, so dont add it again. But, you may check that
-  # it is owned by this component with:
-  # icalproperty_get_parent(p->{'ref'}') != $self->{'comp_p'}
-  
-  # If there is no 'ref' key, then create one with $p->{'ref'} =
-  # icalproperty_new_from_string($p->as_ical_string)
-  
-}
-
-sub remove_property { 
-
-# If $p->{'ref'} is set, then remove the property with
-# icalcomponent_remove_property() }
-}
-
-# Return an array of all components of the given type
-sub components {
-
-  my $self = shift;
-  my $comp_name = shift;
-  
-  my @comps;
-  
-  if(!$comp_name){
-    $comp_name = 'ANY';
-  }
-
-  my $c = $self->{'comp_p'};
-  my $p; 
-
-  for($p = Net::ICal::Libical::icallangbind_get_first_component($c,$comp_name);
-     $p;
-     $p = Net::ICal::Libical::icallangbind_get_next_component($c,$comp_name)){
-    
-    push(@comps, Net::ICal::Libical::Component->new_from_ref($p));
-
-  }
-
-  return @comps;
-  
-}
-
-
-sub add_component {}
-
-sub remove_component {}
-
-sub as_ical_string {
-  my $self = shift;
-
-  return Net::ICal::Libical::icalcomponent_as_ical_string($self->{'comp_p'})
-}
-
-
-
-1;
diff --git a/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Duration.pm b/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Duration.pm
deleted file mode 100644
index 13ec9c437e..0000000000
--- a/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Duration.pm
+++ /dev/null
@@ -1,160 +0,0 @@
-#=============================================================================
-#
-# This package is free software and is provided "as is" without express
-# or implied warranty. It may be used, redistributed and/or modified
-# under the same terms as perl itself. (Either the Artistic License or
-# the GPL.)
-#
-#=============================================================================
-
-=head1 NAME
-
-Net::ICal::Duration -- represent a length of time
-
-=head1 SYNOPSIS
-
-  use Net::ICal;
-  $d = Net::ICal::Duration->new("P3DT6H15M10S");
-  $d = Net::ICal::Duration->new(3600); # 1 hour in seconds
-
-=head1 DESCRIPTION
-
-I<Duration> Represents a length of time, such a 3 days, 30 seconds or
-7 weeks. You would use this for representing an abstract block of
-time; "I want to have a 1-hour meeting sometime." If you want a
-calendar- and timezone-specific block of time, see Net::ICal::Period.
-
-=cut
-
-#=============================================================================
-
-package Net::ICal::Libical::Duration;
-use Net::ICal::Libical::Property;
-use strict;
-use Carp;
-@Net::ICal::Libical::Duration::ISA = qw ( Net::ICal::Libical::Property );
-
-=head1 METHODS
-
-=head2 new
-
-Create a new I<Duration> from:
-
-=over 4
-
-=item * A string in RFC2445 duration format
-
-=item * An integer representing a number of seconds
-
-=cut
-
-sub new {
-  my $package = shift;
-  my $arg = shift;
-  my $self;
-
-  if (ref($arg) == 'HASH'){
-    # Construct from dictionary 
-    $self = Net::ICal::Libical::Property::new($package,$arg);
-    my $val=Net::ICal::Libical::icalproperty_get_value_as_string($self->{'ref'});
-    $self->{'dur'} = Net::ICal::Libical::icaldurationtype_from_string($val);
-    
-   return $self;
-
-  } elsif ($arg =~ /^[-+]?\d+$/){
-    # Seconds
-    $self = Net::ICal::Libical::Property::new($package,'DURATION');
-    $self->{'dur'} = Net::ICal::Libical::icaldurationtype_new_from_int($arg);
-  } elsif ($arg) {
-    # iCalendar string 
-    $self = Net::ICal::Libical::Property::new($package,'DURATION');
-    $self->{'dur'} = Net::ICal::Libical::icaldurationtype_new_from_string($arg);
-  } else {
-    die;
-  }
-  
-  $self->_update_value();
-  return $self;
-
-}
-
-sub _update_value {
-  my $self = shift;
-
-  die "Can't find internal icalduration reference" if !$self->{'dur'};
-
-  $self->value(Net::ICal::Libical::icaldurationtype_as_ical_string($self->{'dur'}));
-
-}
-=head2 clone()
-
-Return a new copy of the duration.
-
-=cut
-
-sub clone {
-  die "Not Implemented";
-  
-}
-
-
-=head2 is_valid()
-
-Determine if this is a valid duration (given criteria TBD). 
-
-=cut
-
-sub is_valid { 
-
-  die "Not Implemented;"
-
-}
-
-=head2 seconds()
-
-Set or Get the length of the duration as seconds. 
-
-=cut
-
-sub seconds {
-  my $self = shift;
-  my $seconds = shift;
-
-  if($seconds){
-    $self->{'dur'} =  
-    Net::ICal::Libical::icaldurationtype_from_int($seconds);
-    $self->_update_value();
-  }
-
-  return Net::ICal::Libical::icaldurationtype_as_int($self->{'dur'});
-
-}
-
-=head2 add($duration)
-
-Return a new duration that is the sum of this and $duration. Does not
-modify this object.
-
-=cut
-
-sub add {
-  my ($self, $duration) = @_;
-
-  return new Duration($self->seconds() + $duration->seconds());
-}
-
-
-=head2 subtract($duration)
-
-Return a new duration that is the difference between this and
-$duration. Does not modify this object.
-
-=cut
-
-sub subtract {
-  my ($self, $duration) = @_;
-
-  return new Duration($self->seconds() - $duration->seconds());
-}
-
-1;
diff --git a/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Period.pm b/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Period.pm
deleted file mode 100644
index ecf29f3370..0000000000
--- a/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Period.pm
+++ /dev/null
@@ -1,359 +0,0 @@
-#!/usr/bin/perl -w
-# -*- Mode: perl -*-
-#======================================================================
-#
-# This package is free software and is provided "as is" without express
-# or implied warranty.  It may be used, redistributed and/or modified
-# under the same terms as perl itself. ( Either the Artistic License or the
-# GPL. ) 
-#
-# $Id$
-#
-# (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-#
-# $Log
-#======================================================================
-
-
-=pod
-=head1 NAME
-
-Net::ICal::Period -- represent a period of time
-
-=head1 SYNOPSIS
-
-  use Net::ICal;
-  $p = new Net::ICal::Period("19970101T120000","19970101T123000");
-  $p = new Net::ICal::Period("19970101T120000","PT3W2D40S");
-  $p = new Net::ICal::Period(time(),3600);
-  $p =   new Net::ICal::Period(
-		      new Net::ICal::Time("19970101T120000",
-					  "America/Los_Angeles"),
-		      new Net::ICal::Duration("2h"));
-
-=head1 DESCRIPTION
-
-Use this to make an object representing a block of time on a
-real schedule. You can either say, "This event starts at 12
-and ends at 2" or "This event starts at 12 and lasts 2 hours."
-
-These two ways of specifying events can be treated differently
-in schedules. If you say, "The meeting is from 12 to 2, but I 
-have to leave at 2," you are implying that the start date and
-end date are fixed. If you say, "I have a 2-hour drive to
-Chicago, and I need to leave at 4," you are saying that it will
-take 2 hours no matter when you leave, and that moving the start
-time will slide the end time correspondingly. 
-
-=head1 BASIC METHODS
-
-=cut
-
-
-#=========================================================================
-
-package Net::ICal::Period;
-use strict;
-use Net::ICal::Time;
-use Net::ICal::Duration;
-
-use UNIVERSAL qw(isa);
-
-#-------------------------------------------------------------------------
-
-=pod
-=head2 new($time, $time|$duration)
-
-Creates a new period object given to parameters: The first must be a
-I<Time> object or valid argument to Net::ICal::Time::new.
-
-The second can be either: 
-
-=pod
-
-=over 4
-
-=item * a I<Time> object
-
-=item * a valid argument to Net::ICal::Time::new. 
-
-=item * a I<Duration> object
-
-=item * a valid argument to Net::ICal::Duration::new. 
-
-=back 
-
-Either give a start time and an end time, or a start time and a duration.
-
-=cut
-
-sub new{
-  my $package = shift;
-  my $arg1 = shift;
-  my $arg2 = shift;
-  my $self = {};
-
-  # Is the string in RFC2445 Format?
-  if(!$arg2 and $arg1 =~ /\//){
-    my $tmp = $arg1;
-    ($arg1,$arg2) = split(/\//,$tmp);
-  }
-
-
-  if( ref($arg1) eq 'Net::ICal::Time'){
-    $self->{START} = $arg1->clone();
-  } else  {
-    $self->{START} = new Net::ICal::Time($arg1);
-  } 
-    
-
-  if(isa($arg2,'Net::ICal::Time')){ 
-    $self->{END} = $arg2->clone();
-  } elsif (isa($arg2,'Net::ICal::Duration')) {
-    $self->{DURATION} = $arg2->clone();
-  } elsif ($arg2 =~ /^P/) {
-    $self->{DURATION} = new Net::ICal::Duration($arg2);
-  } else {
-    # Hope that it is a time string
-    $self->{END} = new Net::ICal::Time($arg2);
-  }
-
-  return bless($self,$package);
-}
-
-#--------------------------------------------------------------------------
-=pod
-=head2 clone()
-
-Create a copy of this component
-
-=cut
-# XXX implement this
-sub clone {
-    return "Not implemented";
-}
-
-#----------------------------------------------------------------------------
-=pod
-=head2 is_valid()
-
-Return true if:
-  There is an end time and:
-     Both start and end times have no timezone ( Floating time) or
-     Both start and end time have (possibly different) timezones or
-     Both start and end times are in UTC and
-     The end time is after the start time. 
-
-  There is a duration and the duration is positive  
-
-=cut
-
-# XXX implement this
-
-sub is_valid {
-    return "Not implemented";
-}
-
-#---------------------------------------------------------------------------
-=pod
-=head2 start([$time])
-
-Accessor for the start time of the event as a I<Time> object.
-Can also take a valid time string or an integer (number of
-seconds since the epoch) as a parameter. If a second parameter
-is given, it'll set this Duration's start time. 
-
-=cut
-
-sub start{
-  my $self = shift;
-  my $t = shift;
-
-  if($t){
-    if(isa($t,'Net::ICal::Time')){ 
-      $self->{START} = $t->clone();
-    } else {
-      $self->{START} = new Net::ICal::Time($t);
-    }
-  }
-
-  return $self->{START};
-} 
-
-#-----------------------------------------------------------------
-=pod
-=head2 end([$time])
-
-Accessor for the end time. Takes a I<Time> object, a valid time string,
-or an integer and returns a time object. This routine is coupled to 
-the I<duration> accessor. See I<duration> below for more imformation. 
-
-=cut
-
-sub end{
-
-  my $self = shift;
-  my $t = shift;
-  my $end;
-
-  if($t){
-    if(isa($t,'Net::ICal::Time')){
-      $end = $t->clone();
-    } else {
-      $end = new Net::ICal::Time($t);
-    }
-    
-    # If duration exists, use the time to compute a new duration
-    if ($self->{DURATION}){
-      $self->{DURATION} = $end->subtract($self->{START}); 
-    } else {
-      $self->{END} = $end;
-    }    
-  }
-
-  # Return end time, possibly computing it from DURATION
-  if($self->{DURATION}){
-    return $self->{START}->add($self->{DURATION});
-  } else {
-    return $self->{END};
-  }
-
-} 
-
-#----------------------------------------------------------------------
-=pod
-=head2 duration([$duration])
-
-Accessor for the duration of the event. Takes a I<duration> object and
-returns a I<Duration> object. 
-
-Since the end time and the duration both specify the end time, the
-object will store one and access to the other will be computed. So,
-
-if you create:
-
-   $p = new Net::ICal::Period("19970101T120000","19970101T123000")
-
-And then execute:
-
-   $p->duration(45*60);
-
-The period object will adjust the end time to be 45 minutes after
-the start time. It will not replace the end time with a
-duration. This is required so that a CUA can take an incoming
-component from a server, modify it, and send it back out in the same
-basic form.
-
-=cut
-
-sub duration{
-  my $self = shift;
-  my $d = shift;
-  my $dur;
-
-  if($d){
-    if(isa($d,'Net::ICal::Duration')){ 
-      $dur = $d->clone();
-    } else {
-      $dur = new Net::ICal::Duration($d);
-    }
-    
-    # If end exists, use the duration to compute a new end
-    # otherwise, set the duration. 
-    if ($self->{END}){
-      $self->{END} = $self->{START}->add($dur); 
-    } else {
-      $self->{DURATION} = $dur;
-    }    
-  }
-
-  # Return duration, possibly computing it from END
-  if($self->{END}){
-    return $self->{END}->subtract($self->{START});
-  } else {
-    return $self->{DURATION};
-  }
-
-}
-
-#------------------------------------------------------------------------
-=pod
-
-=head2 as_ical()
-
-Return a string that holds the RFC2445 text form of this duration
-
-=cut
-sub as_ical {
-  my $self = shift;
-  my $out;
-
-  $out = $self->{START}->as_ical() ."/";
-
-  if($self->{DURATION}){
-    $out .= $self->{DURATION}->as_ical() 
-  } else {
-    $out .= $self->{END}->as_ical() 
-  }
- 
-  return $out;
- 
-}
-
-
-#------------------------------------------------------------------------
-=pod
-
-=head2 test()
-
-A set of developers' tests to make sure the module's working properly.
-
-=cut
-
-# Run this with a one-liner:
-#   perl -e "use lib('/home/srl/dev/rk/reefknot/base/'); use Net::ICal::Period; Net::ICal::Period::test();"
-# adjusted for your environment. 
-sub test {
-
-  print("--------- Test Net::ICal::Period --------------\n");
-
-
-  my $p = new Net::ICal::Period("19970101T180000Z/19970102T070000Z");
-  print $p->as_ical()."\n";
-  die if $p->as_ical() ne "19970101T180000Z/19970102T070000Z";
-
-  $p = new Net::ICal::Period("19970101T180000Z/PT5H30M");
-  print $p->as_ical()."\n";
-  die if $p->as_ical() ne "19970101T180000Z/PT5H30M";
-
-  $p->duration("PT5H30M10S");
-  print $p->as_ical()."\n";
-  die if $p->as_ical() ne "19970101T180000Z/PT5H30M10S" ;
-
-  $p->duration(new Net::ICal::Duration("P10DT30M5S"));
-  print $p->as_ical()."\n";
-  die if $p->as_ical() ne "19970101T180000Z/P10DT30M5S" ;
-
-  $p->end("19970101T183000Z");
-  print $p->as_ical()."\n";
-  die if $p->as_ical() ne "19970101T180000Z/PT30M" ;
-
-  $p = new Net::ICal::Period("19970101T180000Z/19970102T070000Z");
-
-  $p->end("19970101T183000Z");
-  print $p->as_ical()."\n";
-  die if $p->as_ical() ne "19970101T180000Z/19970101T183000Z" ;
-
-  $p->duration("P1DT1H10M");
-  print $p->as_ical()."\n";
-  die if $p->as_ical() ne "19970101T180000Z/19970102T191000Z" ;
-
-
-
-}
-
-1;
-
-
-__END__
-
diff --git a/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Property.pm b/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Property.pm
deleted file mode 100644
index 0aef347c43..0000000000
--- a/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Property.pm
+++ /dev/null
@@ -1,173 +0,0 @@
-#!/usr/bin/perl
-# -*- Mode: perl -*-
-#======================================================================
-# FILE: Property.pm
-# CREATOR: eric 1 Mar 01
-#
-# DESCRIPTION:
-#   
-#
-#  $Id$
-#  $Locker$
-#
-# (C) COPYRIGHT 2000, Eric Busboom, eric@softwarestudio.org
-#
-# This package is free software and is provided "as is" without express
-# or implied warranty.  It may be used, redistributed and/or modified
-# under the same terms as perl itself. ( Either the Artistic License or the
-# GPL. ) 
-#
-#
-#======================================================================
-
-use Net::ICal::Libical::Property;
-
-
-package Net::ICal::Libical::Property;
-use strict;
-
-
-sub new { 
-
-  my $class = shift;
-  my $arg = shift;
-  my $self = {};
-  my $kind;
-
-  if(ref($arg) == 'HASH'){
-  
-    $self->{'ref'} = $arg->{'ref'};
-
-  } else {
-        $kind = Net::ICal::Libical::icalproperty_string_to_kind($arg);
-	$self->{'ref'} = Net::ICal::Libical::icalproperty_new($kind);
-  }
-
-  die "Did not get icalproperty ref in Net::ICal::Libical::Property::new " if !$self->{'ref'};
-  
-  bless $self, $class;
-}
-
-
-sub DESTROY {
-  my $self = shift;
-
-  my $r = $self->{'ref'};
-
-  if($r && !Net::ICal::Libical::icalproperty_get_parent($r)){
-    Net::ICal::Libical::icalproperty_free($self->{'ref'});
-  }
-}
-
-sub name {
-  my $self = shift;
-  my $str;
-
-  die if !$self->{'ref'};
-
-  $str = Net::ICal::Libical::icalproperty_as_ical_string($self->{'ref'});
-	
-  $str =~ /^([A-Z\-]+)\n/;
-
-  return $1;
-
-}
-
-#Get/Set the internal reference to the libical icalproperty """
-sub prop_ref {
-  my $self = shift;
-  my $p_r = shift;
-
-  if($p_r){
-    $self->{'ref'} = $p_r;
-  }
-
-  return $self->{'ref'};
-  
-}
-
-
-#Get/set the RFC2445 representation of the value. Dict value 'value'
-sub value {
-  my $self = shift;
-  my $v = shift;
-  my $kind = shift;
-
-  my $vt;
-  if($v){
-            
-    if ($kind) {
-      $self->{'VALUE'} = $kind;
-      $vt = $kind;
-    }
-    elsif ($self->{'VALUE'}) { 
-      $vt = $self->{'VALUE'};
-    }
-    else {
-      $vt = 'NO'; # Use the kind of the existing value
-    }      
-     
-
-    Net::ICal::Libical::icalproperty_set_value_from_string($self->{'ref'},$v,$vt);
-      
-  }
-      
-  return Net::ICal::Libical::icalproperty_get_value_as_string($self->{'ref'});
-
-}
-
-
-# Get a named parameter
-sub get_parameter{
-  my $self  = shift;
-  my $key = shift;
-
-  die "get_parameter: missing parameter name" if !$key;
-
-  $key = uc($key);
-  my $ref = $self->{'ref'};
-
-  my $str = Net::ICal::Libical::icalproperty_get_parameter_as_string($ref,$key);
-
-  if($str eq 'NULL') {
-    return undef;
-  }
-
-  return $str  
-
-}
-
-
-# Set the value of the named parameter
-sub set_parameter{
-  my $self  = shift;
-  my $key = shift;
-  my $value = shift;
-
-  die "set_parameter: missing parameter name" if !$key;
-  die "set_parameter: missing parameter value" if !$value;
-
-  $key = uc($key);
-  my $ref = $self->{'ref'};
-
-  my $str = Net::ICal::Libical::icalproperty_set_parameter_from_string($ref,$key,$value);
-
-
-  return $self->get_parameter($self);
-
-}
-
-
-sub as_ical_string {
-  my $self = shift;
-  my $str = Net::ICal::Libical::icalproperty_as_ical_string($self->{'ref'});
-
-  $str =~ s/\r//g;
-  $str =~ s/\n\s?//g;
-
-  return $str;
-}
-
-
-
-1;
diff --git a/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Time.pm b/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Time.pm
deleted file mode 100644
index 76969ac60d..0000000000
--- a/libical/src/Net-ICal-Libical/lib/Net/ICal/Libical/Time.pm
+++ /dev/null
@@ -1,468 +0,0 @@
-#!/usr/bin/perl -w
-# -*- Mode: perl -*-
-#======================================================================
-#
-# This package is free software and is provided "as is" without express
-# or implied warranty.  It may be used, redistributed and/or modified
-# under the same terms as perl itself. ( Either the Artistic License or the
-# GPL. ) 
-#
-#
-#======================================================================
-
-
-
-=pod
-
-=head1 NAME
-
-Net::ICal::Time -- represent a time and date
-
-=head1 SYNOPSIS
-
-  $t = new Net::ICal::Time("19970101T120000Z");
-  $t = new Net::ICal::Time("19970101T120000","America/Los_Angeles");
-  $t = new Net::ICal::Time(time(),"America/Los_Angeles");
-
-  $t2 = $t->add(Net::Ical::Duration("1D"));
-
-  $duration = $t->subtract(Net::ICal::Time("19970101T110000Z"))
-
-  # Add 5 minutes
-  $t->min($t->min()+5);
-
-  # Add 5 minutes
-  $t->sec($t->sec()+300);
-
-  # Compare
-  if($t->compare($t2) > 0) {}
-
-=head1 DESCRIPTION
-
-I<Time> represents a time, but can also hold the time zone for the
-time and indicate if the time should be treated as a date. The time
-can be constructed from a variey of formats.
-
-=head1 METHODS
-
-=cut
-
-package Net::ICal::Libical::Time;
-use Net::ICal::Libical::Duration;
-use Net::ICal::Libical::Property;
-use Time::Local;
-use POSIX;
-use Carp qw(confess cluck);
-use strict;
-use UNIVERSAL qw(isa);
-
-@Net::ICal::Libical::Time::ISA = qw(Net::ICal::Libical::Property);
-
-=pod
-
-=head2 new
-
-Creates a new time object given one of:
-
-=over 4
-
-=item * ISO format string
-
-=item * Some other format string, maybe whatever a Date module understands
-
-=item * Integer representing seconds past the POSIX epoch
-
-=back
-
-The optional second argument is the timezone in Olsen place name format, 
-which looks like "America/Los_Angeles"; it can be used to get the standard 
-offset from UTC, the dates the location goes to and from Daylight Savings 
-Time, and the magnitude of the Daylight Savings time offset. 
-
-=cut
-
-sub new{
-  my $package = shift;
-  my $arg = shift;
-
-  my $self;
-
-  if (ref($arg) == 'HASH'){
-    # Construct from dictionary 
-    $self = Net::ICal::Libical::Property::new($package,$arg);
-    my $val=Net::ICal::Libical::icalproperty_get_value_as_string($self->{'ref'});
-    $self->{'tt'} = Net::ICal::Libical::icaltime_from_string($val);
-    
-   return $self;
-
-  } else {
-
-    if ($#_ = 1){
-      # iCalendar string 
-      $self = Net::ICal::Libical::Property::new($package,'DTSTART');
-      $self->{'tt'} = Net::ICal::Libical::icaltime_new_from_string($arg);
-    } else {
-      # Broken out time 
-      die;
-    }
-
-    $self->_update_value();
-    return $self;
-  }
-
-}
-
-
-sub _update_value {
-  my $self = shift;
-
-  if(!$self->{'tt'}){
-    die "Can't find reference to icaltimetype";
-  }
-
-  $self->value(Net::ICal::Libical::icaltime_as_ical_string($self->{'tt'}));
-
-}
-  
-=pod
-
-=head2 clone()
-
-Create a new copy of this time. 
-
-=cut
-
-# clone a Time object. 
-sub clone {
-  my $self = shift;
-
-  bless( {%$self},ref($self));
-
-  $self->{'ref'} = Net::ICal::Libical::icalproperty_new_clone($self->{'ref'});
-
-}
-
-
-
-=pod
-
-=head2 is_valid()
-
-TBD
-
-=cut
-
-sub is_valid{
-  my $self = shift;
-
-  return Net::ICal::Libical::icaltime_is_null_time($self->{'tt'});
-  
-}
-
-
-
-=pod
-
-=head2 is_date([true|false])
-
-Accessor to the is_date flag. If true, the flag indicates that the
-hour, minute and second fields are set to zero and not used in
-comparisons.
-
-=cut
-
-
-sub is_date {
-  my $self = shift;
-  if(@_){
-
-    # Convert to true or false
-    Net::ICal::Libical::icaltimetype_is_date_set($self->{'tt'},
-						 !(!($_[0]))); 
-  } 
-
-  return Net::ICal::Libical::icaltimetype_is_date_get($self->{'tt'});
-
-}
-
-
-=pod
-
-=head2 is_utc([true|false])
-
-Is_utc indicates if the time should be interpreted in the UTC timezone. 
-
-=cut
-
-sub is_utc {
-  my $self = shift;
-  if(@_){
-
-    # Convert to true or false
-    Net::ICal::Libical::icaltimetype_is_utc_set($self->{'tt'},
-						 !(!($_[0]))); 
-  } 
-
-  return Net::ICal::Libical::icaltimetype_is_utc_get($self->{'tt'});
-
-}
-=pod
-
-=head2 timezone
-
-Accessor to the timezone. Takes & Returns an Olsen place name
-("America/Los_Angeles", etc. ) , an Abbreviation, 'UTC', or 'float' if
-no zone was specified.
-
-=cut
-
-sub timezone {
-  my $self = shift;
-  my $tz = shift;
-
-  if($tz){
-    $self->set_parameter('TZID',$tz);
-  }
-
-  return $self->get_parameter('TZID');
-
-}
-
-
-
-=pod
-
-=head2 normalize()
-
-Adjust any out-of range values so that they are in-range. For
-instance, 12:65:00 would become 13:05:00.
-
-=cut
-
-sub normalize{
-  my $self = shift;
-  
-  $self->{'tt'} = Net::ICal::Libical::icaltime_normalize($self->{'tt'});
-  $self->value(Net::ICal::Libical::icaltime_as_ical_string($self->{'tt'}));
-
-}
-
-
-=pod
-
-=head2 hour([$hour])
-
-Accessor to the hour.  Out of range values are normalized. 
-
-=cut
-
-=pod
-=head2 minute([$min])
-
-Accessor to the minute. Out of range values are normalized.
-
-=cut
-
-=pod
-=head2 second([$dsecond])
-
-Accessor to the second. Out of range values are normalized. For
-instance, setting the second to -1 will decrement the minute and set
-the second to 59, while setting the second to 3600 will increment the
-hour.
-
-=cut
-
-=pod
-
-=head2 year([$year])
-
-Accessor to the year. Out of range values are normalized. 
-
-=cut
-
-=pod
-
-=head2 month([$month])
-
-Accessor to the month.  Out of range values are normalized. 
-
-=cut
-
-
-=pod
-
-=head2 day([$day])
-
-Accessor to the month day.  Out of range values are normalized. 
-
-=cut
-
-sub _do_accessor {
-no strict;
-  my $self = shift;
-  my $type = shift;
-  my $value = shift;
-  
-  $type = lc($type);
-
-  if($value){
-    my $set = "Net::ICal::Libical::icaltimetype_${type}_set";
-
-    &$set($self->{'tt'},$value);
-    $self->normalize();
-    $self->_update_value();
-
-  }
-
-  my $get = "Net::ICal::Libical::icaltimetype_${type}_get";
-
-  return &$get($self->{'tt'});
-}
-
-
-sub second {my $s = shift; my $v = shift; return $s->_do_accessor('SECOND',$v);}
-sub minute {my $s = shift; my $v = shift;return $s->_do_accessor('MINUTE',$v);}
-sub hour {my $s = shift;  my $v = shift; return $s->_do_accessor('HOUR',$v);}
-sub day {my $s = shift; my $v = shift; return $s->_do_accessor('DAY',$v);}
-sub month {my $s = shift; my $v = shift; return $s->_do_accessor('MONTH',$v);}
-sub year {my $s = shift;  my $v = shift; return $s->_do_accessor('YEAR',$v);}
-
-
-=pod
-
-=head2 add($duration)
-
-Takes a I<Duration> and returns a I<Time> that is the sum of the time
-and the duration. Does not modify this time.
-
-=cut
-sub add {
-  my $self = shift;
-  my $dur = shift;
-
-  cluck "Net::ICal::Time::add argument 1 requires a Net::ICal::Duration" if !isa($dur,'Net::ICal::Duration');
-
-  my $c = $self->clone();
-
-  $c->second($dur->as_int());
-
-  $c->normalize();
-
-  return $c;
-
-}
-
-=pod
-
-=head2 subtract($time)
-
-Subtract out a time of type I<Time> and return a I<Duration>. Does not
-modify this time.
-
-=cut
-sub subtract {
-  my $self = shift;
-  my $t = shift;
-
-  cluck "Net::ICal::Time::subtract argrument 1 requires a Net::ICal::Time" if !isa($t,'Net::ICal::Time');
-
-  my $tint1 = $self->as_int();
-  my $tint2 = $t->as_int();
-
-  return new Net::ICal::Duration($tint1 - $tint2);
-
-}
-
-=pod
-
-=head2 move_to_zone($zone);
-
-Change the time to what it would be in the named timezone. 
-The zone can be an Olsen placename or "UTC".
-
-=cut
-
-# XXX this needs implementing. 
-sub move_to_zone {
-  confess "Not Implemented\n";
-} 
-
-
-
-=pod
-
-=head2 as_int()
-
-Convert the time to an integer that represents seconds past the POSIX
-epoch
-
-=cut
-sub as_int {
-  my $self = shift;
-
-  return Net::ICal::Libical::icaltime_as_timet($self->{'tt'});
-}
-
-=pod
-
-=head2 as_localtime()
-
-Convert to list format, as per localtime()
-
-=cut
-sub as_localtime {
-  my $self = shift;
-
-  return localtime($self->as_int());
-
-}
-
-=pod
-
-=head2 as_gmtime()
-
-Convert to list format, as per gmtime()
-
-=cut
-sub as_gmtime {
-  my $self = shift;
-
-  return gmtime($self->as_int());
-
-}
-
-=pod
-
-=head2 compare($time)
-
-Compare a time to this one and return -1 if the argument is earlier
-than this one, 1 if it is later, and 0 if it is the same. The routine
-does the comparision after converting the time to UTC. It converts
-floating times using the system notion of the timezone.
-
-=cut
-sub compare {
-  my $self = shift;
-  my $a = $self->as_int();
-
-  my $arg = shift;
-
-  if(!isa($arg,'Net::ICal::Time')){
-    $arg = new Net::ICal::Time($arg);
-  }
-
-  my $b = $arg->as_int();
-
-  if($a < $b){
-    return -1;
-  } elsif ($a > $b) {
-    return 1;
-  } else {
-    return 0;
-  }
-  
-}
-
-1; 
-
diff --git a/libical/src/Net-ICal-Libical/netical.i b/libical/src/Net-ICal-Libical/netical.i
deleted file mode 100644
index 9d380dcec1..0000000000
--- a/libical/src/Net-ICal-Libical/netical.i
+++ /dev/null
@@ -1,317 +0,0 @@
-/* -*- Mode: C -*-*/
-/*======================================================================
-  FILE: ical.i
-
-  (C) COPYRIGHT 1999 Eric Busboom
-  http://www.softwarestudio.org
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and
-  limitations under the License.
-
-  The original author is Eric Busboom
-
-  Contributions from:
-  Graham Davison (g.m.davison@computer.org)
-
-  ======================================================================*/  
-
-%module Net__ICal__Libical
-
-%{
-#include "ical.h"
-
-#include <sys/types.h> /* for size_t */
-#include <time.h>
-
-%}
-
-
-
-typedef void icalcomponent;
-typedef void icalproperty;
-
-icalcomponent* icalparser_parse_string(char* str);
-
-
-icalcomponent* icalcomponent_new(icalcomponent_kind kind);
-icalcomponent* icalcomponent_new_clone(icalcomponent* component);
-icalcomponent* icalcomponent_new_from_string(char* str);
-
-char* icalcomponent_as_ical_string(icalcomponent* component);
-
-void icalcomponent_free(icalcomponent* component);
-int icalcomponent_count_errors(icalcomponent* component);
-void icalcomponent_strip_errors(icalcomponent* component);
-void icalcomponent_convert_errors(icalcomponent* component);
-
-icalproperty* icalcomponent_get_current_property(icalcomponent* component);
-
-icalproperty* icalcomponent_get_first_property(icalcomponent* component,
-					      icalproperty_kind kind);
-icalproperty* icalcomponent_get_next_property(icalcomponent* component,
-					      icalproperty_kind kind);
-
-icalcomponent* icalcomponent_get_current_component (icalcomponent* component);
-
-icalcomponent* icalcomponent_get_first_component(icalcomponent* component,
-					      icalcomponent_kind kind);
-icalcomponent* icalcomponent_get_next_component(icalcomponent* component,
-					      icalcomponent_kind kind);
-
-void icalcomponent_add_property(icalcomponent* component,
-				icalproperty* property);
-
-void icalcomponent_remove_property(icalcomponent* component,
-				   icalproperty* property);
-
-
-icalcomponent* icalcomponent_get_parent(icalcomponent* component);
-
-icalcomponent_kind icalcomponent_isa(icalcomponent* component);
-
-int icalrestriction_check(icalcomponent* comp);
-
-
-/* actually returns icalproperty_kind */
-int icalproperty_string_to_kind(const char* string); 
-
-/* actually takes icalproperty_kind */
-icalproperty* icalproperty_new(int kind);
-
-icalproperty* icalproperty_new_from_string(char* str);
-
-char* icalproperty_as_ical_string(icalproperty *prop);
-
-void icalproperty_set_parameter_from_string(icalproperty* prop,
-                                          const char* name, const char* value);
-void icalproperty_set_value_from_string(icalproperty* prop,const char* value, const char * kind);
-
-const char* icalproperty_get_value_as_string(icalproperty* prop);
-const char* icalproperty_get_parameter_as_string(icalproperty* prop,
-                                                 const char* name);
-
-
-icalcomponent* icalproperty_get_parent(icalproperty* property);
-
-typedef enum icalerrorenum {
-    
-    ICAL_BADARG_ERROR,
-    ICAL_NEWFAILED_ERROR,
-    ICAL_MALFORMEDDATA_ERROR, 
-    ICAL_PARSE_ERROR,
-    ICAL_INTERNAL_ERROR, /* Like assert --internal consist. prob */
-    ICAL_FILE_ERROR,
-    ICAL_ALLOCATION_ERROR,
-    ICAL_USAGE_ERROR,
-    ICAL_NO_ERROR,
-    ICAL_UNKNOWN_ERROR /* Used for problems in input to icalerror_strerror()*/
-
-} icalerrorenum;
-
-/* Make an individual error fatal or non-fatal. */
-typedef enum icalererorstate { 
-    ICAL_ERROR_FATAL,     /* Not fata */
-    ICAL_ERROR_NONFATAL,  /* Fatal */
-    ICAL_ERROR_DEFAULT,   /* Use the value of icalerror_errors_are_fatal*/
-    ICAL_ERROR_UNKNOWN    /* Asked state for an unknown error type */
-} icalerrorstate ;
-
-void icalerror_set_error_state( icalerrorenum error, icalerrorstate);
-icalerrorstate icalerror_get_error_state( icalerrorenum error);
-
-
-const char* icalenum_property_kind_to_string(icalproperty_kind kind);
-icalproperty_kind icalenum_string_to_property_kind(const char* string);
-
-const char* icalenum_value_kind_to_string(icalvalue_kind kind);
-/*icalvalue_kind icalenum_value_kind_by_prop(icalproperty_kind kind);*/
-
-const char* icalenum_parameter_kind_to_string(icalparameter_kind kind);
-icalparameter_kind icalenum_string_to_parameter_kind(const char* string);
-
-const char* icalenum_component_kind_to_string(icalcomponent_kind kind);
-icalcomponent_kind icalenum_string_to_component_kind(const char* string);
-
-icalvalue_kind icalenum_property_kind_to_value_kind(icalproperty_kind kind);
-
-
-int* icallangbind_new_array(int size);
-void icallangbind_free_array(int* array);
-int icallangbind_access_array(int* array, int index);
-int icalrecur_expand_recurrence(char* rule, int start, 
-				int count, int* array);
-
-
-/* Iterate through properties and components using strings for the kind */
-icalproperty* icallangbind_get_first_property(icalcomponent *c,
-                                              const char* prop);
-
-icalproperty* icallangbind_get_next_property(icalcomponent *c,
-                                              const char* prop);
-
-icalcomponent* icallangbind_get_first_component(icalcomponent *c,
-                                              const char* comp);
-
-icalcomponent* icallangbind_get_next_component(icalcomponent *c,
-                                              const char* comp);
-
-
-/* Return a string that can be evaluated in perl or python to
-   generated a hash that holds the property's name, value and
-   parameters. Sep is the hash seperation string, "=>" for perl and
-   ":" for python */
-const char* icallangbind_property_eval_string(icalproperty* prop, char* sep);
-
-/***********************************************************************
- Time routines 
-***********************************************************************/
-
-
-struct icaltimetype
-{
-	int year;
-	int month;
-	int day;
-	int hour;
-	int minute;
-	int second;
-
-	int is_utc; /* 1-> time is in UTC timezone */
-
-	int is_date; /* 1 -> interpret this as date. */
-   
-	const char* zone; /*Ptr to Olsen placename. Libical does not own mem*/
-};	
-
-
-/* Convert seconds past UNIX epoch to a timetype*/
-struct icaltimetype icaltime_from_timet(int v, int is_date);
-
-/* Return the time as seconds past the UNIX epoch */
-/* Normally, this returns a time_t, but SWIG tries to turn that type
-   into a pointer */
-int icaltime_as_timet(struct icaltimetype);
-
-/* Return a string represention of the time, in RFC2445 format. The
-   string is owned by libical */
-char* icaltime_as_ical_string(struct icaltimetype tt);
-
-/* create a time from an ISO format string */
-struct icaltimetype icaltime_from_string(const char* str);
-
-/* Routines for handling timezones */
-/* Return the offset of the named zone as seconds. tt is a time
-   indicating the date for which you want the offset */
-int icaltime_utc_offset(struct icaltimetype tt, const char* tzid);
-
-/* convert tt, of timezone tzid, into a utc time. Does nothing if the
-   time is already UTC.  */
-struct icaltimetype icaltime_as_utc(struct icaltimetype tt,
-				    const char* tzid);
-
-/* convert tt, a time in UTC, into a time in timezone tzid */
-struct icaltimetype icaltime_as_zone(struct icaltimetype tt,
-				     const char* tzid);
-
-/* Return a null time, which indicates no time has been set. This time represent the beginning of the epoch */
-struct icaltimetype icaltime_null_time(void);
-
-/* Return true of the time is null. */
-int icaltime_is_null_time(struct icaltimetype t);
-
-/* Returns false if the time is clearly invalid, but is not null. This
-   is usually the result of creating a new time type buy not clearing
-   it, or setting one of the flags to an illegal value. */
-int icaltime_is_valid_time(struct icaltimetype t);
-
-/* Reset all of the time components to be in their normal ranges. For
-   instance, given a time with minutes=70, the minutes will be reduces
-   to 10, and the hour incremented. This allows the caller to do
-   arithmetic on times without worrying about overflow or
-   underflow. */
-struct icaltimetype icaltime_normalize(struct icaltimetype t);
-
-/* Return the day of the year of the given time */
-short icaltime_day_of_year(struct icaltimetype t);
-
-/* Create a new time, given a day of year and a year. */
-struct icaltimetype icaltime_from_day_of_year(short doy,  short year);
-
-/* Return the day of the week of the given time. Sunday is 0 */
-short icaltime_day_of_week(struct icaltimetype t);
-
-/* Return the day of the year for the Sunday of the week that the
-   given time is within. */
-short icaltime_start_doy_of_week(struct icaltimetype t);
-
-/* Return a string with the time represented in the same format as ctime(). THe string is owned by libical */
-char* icaltime_as_ctime(struct icaltimetype);
-
-/* Return the week number for the week the given time is within */
-short icaltime_week_number(struct icaltimetype t);
-
-/* Return -1, 0, or 1 to indicate that a<b, a==b or a>b */
-int icaltime_compare(struct icaltimetype a,struct icaltimetype b);
-
-/* like icaltime_compare, but only use the date parts. */
-int icaltime_compare_date_only(struct icaltimetype a, struct icaltimetype b);
-
-/* Return the number of days in the given month */
-short icaltime_days_in_month(short month,short year);
-
-
-/***********************************************************************
-  Duration Routines 
-***********************************************************************/
-
-
-struct icaldurationtype
-{
-	int is_neg;
-	unsigned int days;
-	unsigned int weeks;
-	unsigned int hours;
-	unsigned int minutes;
-	unsigned int seconds;
-};
-
-struct icaldurationtype icaldurationtype_from_int(int t);
-struct icaldurationtype icaldurationtype_from_string(const char*);
-int icaldurationtype_as_int(struct icaldurationtype duration);
-char* icaldurationtype_as_ical_string(struct icaldurationtype d);
-struct icaldurationtype icaldurationtype_null_duration();
-int icaldurationtype_is_null_duration(struct icaldurationtype d);
-
-struct icaltimetype  icaltime_add(struct icaltimetype t,
-				  struct icaldurationtype  d);
-
-struct icaldurationtype  icaltime_subtract(struct icaltimetype t1,
-					   struct icaltimetype t2);
-
-
-/***********************************************************************
-  Period Routines 
-***********************************************************************/
-
-
-struct icalperiodtype 
-{
-	struct icaltimetype start;
-	struct icaltimetype end;
-	struct icaldurationtype duration;
-};
-
-struct icalperiodtype icalperiodtype_from_string (const char* str);
-
-const char* icalperiodtype_as_ical_string(struct icalperiodtype p);
-struct icalperiodtype icalperiodtype_null_period();
-int icalperiodtype_is_null_period(struct icalperiodtype p);
-int icalperiodtype_is_valid_period(struct icalperiodtype p);
-
diff --git a/libical/src/Net-ICal-Libical/netical_wrap.c b/libical/src/Net-ICal-Libical/netical_wrap.c
deleted file mode 100644
index 32eee6f80b..0000000000
--- a/libical/src/Net-ICal-Libical/netical_wrap.c
+++ /dev/null
@@ -1,3054 +0,0 @@
-/*
- * FILE : netical_wrap.c
- * 
- * This file was automatically generated by :
- * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Patch 5)
- * 
- * Portions Copyright (c) 1995-1998
- * The University of Utah and The Regents of the University of California.
- * Permission is granted to distribute this file in any manner provided
- * this notice remains intact.
- * 
- * Do not make changes to this file--changes will be lost!
- *
- */
-
-
-#define SWIGCODE
-/* Implementation : PERL 5 */
-
-#define SWIGPERL
-#define SWIGPERL5
-#ifdef __cplusplus
-#include <math.h>
-#include <stdlib.h>
-extern "C" {
-#endif
-#include "EXTERN.h"
-#include "perl.h"
-#include "XSUB.h"
-#undef free
-#undef malloc
-#include <string.h>
-#ifdef __cplusplus
-}
-#endif
-/* Definitions for compiling Perl extensions on a variety of machines */
-
-#if defined(WIN32) || defined(__WIN32__)
-#   if defined(_MSC_VER)
-#	define SWIGEXPORT(a,b) __declspec(dllexport) a b
-#   else
-#	if defined(__BORLANDC__)
-#	    define SWIGEXPORT(a,b) a _export b
-#	else
-#	    define SWIGEXPORT(a,b) a b
-#	endif
-#   endif
-#else
-#   define SWIGEXPORT(a,b) a b
-#endif
-
-#ifdef PERL_OBJECT
-#define MAGIC_PPERL  CPerl *pPerl = (CPerl *) this;
-#define MAGIC_CAST   (int (CPerl::*)(SV *, MAGIC *))
-#define SWIGCLASS_STATIC 
-#else
-#define MAGIC_PPERL
-#define MAGIC_CAST
-#define SWIGCLASS_STATIC static
-#endif
-
-
-/*****************************************************************************
- * $Header$
- *
- * perl5ptr.swg
- *
- * This file contains supporting code for the SWIG run-time type checking
- * mechanism.  The following functions are available :
- *
- * SWIG_RegisterMapping(char *origtype, char *newtype, void *(*cast)(void *));
- *
- *      Registers a new type-mapping with the type-checker.  origtype is the
- *      original datatype and newtype is an equivalent type.  cast is optional
- *      pointer to a function to cast pointer values between types (this
- *      is only used to cast pointers from derived classes to base classes in C++)
- *      
- * SWIG_MakePtr(char *buffer, void *ptr, char *typestring);
- *     
- *      Makes a pointer string from a pointer and typestring.  The result is returned
- *      in buffer.
- *
- * char * SWIG_GetPtr(SV *obj, void **ptr, char *type)
- *
- *      Gets a pointer value from a Perl5 scalar value.  If there is a 
- *      type-mismatch, returns a character string to the received type.  
- *      On success, returns NULL.
- *
- *
- * You can remap these functions by making a file called "swigptr.swg" in
- * your the same directory as the interface file you are wrapping.
- *
- * These functions are normally declared static, but this file can be
- * can be used in a multi-module environment by redefining the symbol
- * SWIGSTATIC.
- *
- * $Log$
- * Revision 1.2  2003/10/21 18:28:33  ettore
- * Merge new-ui-branch to the trunk.
- *
- * Revision 1.1.2.1  2003/09/23 19:43:57  ettore
- * Sync with trunk, and fixicate a bit so it still works.
- *
- * Revision 1.1  2003/09/11 22:04:08  hansp
- * Import new libical from mainline HEAD and make appropriate changes to
- * Evolution.
- *
- * Revision 1.6  2001/04/02 18:17:40  ebusboom
- * Get perl extension compiling again.
- *
- * Revision 1.1  1996/12/26 22:17:29  beazley
- * Initial revision
- *
- *****************************************************************************/
-
-#include <stdlib.h>
-
-#ifdef SWIG_GLOBAL
-#ifdef __cplusplus
-#define SWIGSTATIC extern "C"
-#else
-#define SWIGSTATIC
-#endif
-#endif
-
-#ifndef SWIGSTATIC
-#define SWIGSTATIC static
-#endif
-
-/* These are internal variables.   Should be static */
-
-typedef struct SwigPtrType {
-  char               *name;
-  int                 len;
-  void               *(*cast)(void *);
-  struct SwigPtrType *next;
-} SwigPtrType;
-
-/* Pointer cache structure */
-
-typedef struct {
-  int                 stat;               /* Status (valid) bit             */
-  SwigPtrType        *tp;                 /* Pointer to type structure      */
-  char                name[256];          /* Given datatype name            */
-  char                mapped[256];        /* Equivalent name                */
-} SwigCacheType;
-
-static int SwigPtrMax  = 64;           /* Max entries that can be currently held */
-static int SwigPtrN    = 0;            /* Current number of entries              */
-static int SwigPtrSort = 0;            /* Status flag indicating sort            */
-static SwigPtrType *SwigPtrTable = 0;  /* Table containing pointer equivalences  */
-static int SwigStart[256];             /* Table containing starting positions    */
-
-/* Cached values */
-
-#define SWIG_CACHESIZE  8
-#define SWIG_CACHEMASK  0x7
-static SwigCacheType SwigCache[SWIG_CACHESIZE];  
-static int SwigCacheIndex = 0;
-static int SwigLastCache = 0;
-
-/* Sort comparison function */
-static int swigsort(const void *data1, const void *data2) {
-	SwigPtrType *d1 = (SwigPtrType *) data1;
-	SwigPtrType *d2 = (SwigPtrType *) data2;
-	return strcmp(d1->name,d2->name);
-}
-
-/* Binary Search function */
-static int swigcmp(const void *key, const void *data) {
-  char *k = (char *) key;
-  SwigPtrType *d = (SwigPtrType *) data;
-  return strncmp(k,d->name,d->len);
-}
-
-/* Register a new datatype with the type-checker */
-
-#ifndef PERL_OBJECT
-SWIGSTATIC 
-void SWIG_RegisterMapping(char *origtype, char *newtype, void *(*cast)(void *)) {
-#else
-SWIGSTATIC
-#define SWIG_RegisterMapping(a,b,c) _SWIG_RegisterMapping(pPerl, a,b,c)
-void _SWIG_RegisterMapping(CPerl *pPerl, char *origtype, char *newtype, void *(*cast)(void *)) {
-#endif
-
-  int i;
-  SwigPtrType *t = 0, *t1;
-
-  if (!SwigPtrTable) {     
-    SwigPtrTable = (SwigPtrType *) malloc(SwigPtrMax*sizeof(SwigPtrType));
-    SwigPtrN = 0;
-  }
-  if (SwigPtrN >= SwigPtrMax) {
-    SwigPtrMax = 2*SwigPtrMax;
-    SwigPtrTable = (SwigPtrType *) realloc(SwigPtrTable,SwigPtrMax*sizeof(SwigPtrType));
-  }
-  for (i = 0; i < SwigPtrN; i++)
-    if (strcmp(SwigPtrTable[i].name,origtype) == 0) {
-      t = &SwigPtrTable[i];
-      break;
-    }
-  if (!t) {
-    t = &SwigPtrTable[SwigPtrN];
-    t->name = origtype;
-    t->len = strlen(t->name);
-    t->cast = 0;
-    t->next = 0;
-    SwigPtrN++;
-  }
-  while (t->next) {
-    if (strcmp(t->name,newtype) == 0) {
-      if (cast) t->cast = cast;
-      return;
-    }
-    t = t->next;
-  }
-  t1 = (SwigPtrType *) malloc(sizeof(SwigPtrType));
-  t1->name = newtype;
-  t1->len = strlen(t1->name);
-  t1->cast = cast;
-  t1->next = 0;
-  t->next = t1;
-  SwigPtrSort = 0;
-}
-
-/* Make a pointer value string */
-
-SWIGSTATIC 
-void SWIG_MakePtr(char *_c, const void *_ptr, char *type) {
-  static char _hex[16] =
-  {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-   'a', 'b', 'c', 'd', 'e', 'f'};
-  unsigned long _p, _s;
-  char _result[20], *_r;    /* Note : a 64-bit hex number = 16 digits */
-  _r = _result;
-  _p = (unsigned long) _ptr;
-  if (_p > 0) {
-    while (_p > 0) {
-      _s = _p & 0xf;
-      *(_r++) = _hex[_s];
-      _p = _p >> 4;
-    }
-    *_r = '_';
-    while (_r >= _result)
-      *(_c++) = *(_r--);
-  } else {
-    strcpy (_c, "NULL");
-  }
-  if (_ptr)
-    strcpy (_c, type);
-}
-
-/* Define for backwards compatibility */
-
-#define _swig_make_hex   SWIG_MakePtr 
-
-/* Function for getting a pointer value */
-
-#ifndef PERL_OBJECT
-SWIGSTATIC 
-char *SWIG_GetPtr(SV *sv, void **ptr, char *_t)
-#else
-SWIGSTATIC
-#define SWIG_GetPtr(a,b,c) _SWIG_GetPtr(pPerl,a,b,c)
-char *_SWIG_GetPtr(CPerl *pPerl, SV *sv, void **ptr, char *_t)
-#endif
-{
-  char temp_type[256];
-  char *name,*_c;
-  int  len,i,start,end;
-  IV   tmp;
-  SwigPtrType *sp,*tp;
-  SwigCacheType *cache;
-
-  /* If magical, apply more magic */
-
-  if (SvGMAGICAL(sv))
-    mg_get(sv);
-
-  /* Check to see if this is an object */
-  if (sv_isobject(sv)) {
-    SV *tsv = (SV*) SvRV(sv);
-    if ((SvTYPE(tsv) == SVt_PVHV)) {
-      MAGIC *mg;
-      if (SvMAGICAL(tsv)) {
-	mg = mg_find(tsv,'P');
-	if (mg) {
-	  SV *rsv = mg->mg_obj;
-	  if (sv_isobject(rsv)) {
-	    tmp = SvIV((SV*)SvRV(rsv));
-	  }
-	}
-      } else {
-	return "Not a valid pointer value";
-      }
-    } else {
-      tmp = SvIV((SV*)SvRV(sv));
-    }
-    if (!_t) {
-      *(ptr) = (void *) tmp;
-      return (char *) 0;
-    }
-  } else if (sv == &sv_undef) {            /* Check for undef */
-    *(ptr) = (void *) 0;
-    return (char *) 0;
-  } else if (SvTYPE(sv) == SVt_RV) {       /* Check for NULL pointer */
-    *(ptr) = (void *) 0;
-    if (!SvROK(sv)) 
-      return (char *) 0;
-    else
-      return "Not a valid pointer value";
-  } else {                                 /* Don't know what it is */
-      *(ptr) = (void *) 0;
-      return "Not a valid pointer value";
-  }
-  if (_t) {
-    /* Now see if the types match */      
-
-    if (!sv_isa(sv,_t)) {
-      _c = HvNAME(SvSTASH(SvRV(sv)));
-      if (!SwigPtrSort) {
-	qsort((void *) SwigPtrTable, SwigPtrN, sizeof(SwigPtrType), swigsort);  
-	for (i = 0; i < 256; i++) {
-	  SwigStart[i] = SwigPtrN;
-	}
-	for (i = SwigPtrN-1; i >= 0; i--) {
-	  SwigStart[SwigPtrTable[i].name[0]] = i;
-	}
-	for (i = 255; i >= 1; i--) {
-	  if (SwigStart[i-1] > SwigStart[i])
-	    SwigStart[i-1] = SwigStart[i];
-	}
-	SwigPtrSort = 1;
-	for (i = 0; i < SWIG_CACHESIZE; i++)  
-	  SwigCache[i].stat = 0;
-      }
-      /* First check cache for matches.  Uses last cache value as starting point */
-      cache = &SwigCache[SwigLastCache];
-      for (i = 0; i < SWIG_CACHESIZE; i++) {
-	if (cache->stat) {
-	  if (strcmp(_t,cache->name) == 0) {
-	    if (strcmp(_c,cache->mapped) == 0) {
-	      cache->stat++;
-	      *ptr = (void *) tmp;
-	      if (cache->tp->cast) *ptr = (*(cache->tp->cast))(*ptr);
-	      return (char *) 0;
-	    }
-	  }
-	}
-	SwigLastCache = (SwigLastCache+1) & SWIG_CACHEMASK;
-	if (!SwigLastCache) cache = SwigCache;
-	else cache++;
-      }
-
-      start = SwigStart[_t[0]];
-      end = SwigStart[_t[0]+1];
-      sp = &SwigPtrTable[start];
-      while (start < end) {
-	if (swigcmp(_t,sp) == 0) break;
-	sp++;
-	start++;
-      }
-      if (start >= end) sp = 0;
-      if (sp) {
-	while (swigcmp(_t,sp) == 0) {
-	  name = sp->name;
-	  len = sp->len;
-	  tp = sp->next;
-	  while(tp) {
-	    if (tp->len >= 255) {
-	      return _c;
-	    }
-	    strcpy(temp_type,tp->name);
-	    strncat(temp_type,_t+len,255-tp->len);
-	    if (sv_isa(sv,temp_type)) {
-	      /* Get pointer value */
-	      *ptr = (void *) tmp;
-	      if (tp->cast) *ptr = (*(tp->cast))(*ptr);
-
-	      strcpy(SwigCache[SwigCacheIndex].mapped,_c);
-	      strcpy(SwigCache[SwigCacheIndex].name,_t);
-	      SwigCache[SwigCacheIndex].stat = 1;
-	      SwigCache[SwigCacheIndex].tp = tp;
-	      SwigCacheIndex = SwigCacheIndex & SWIG_CACHEMASK;
-	      return (char *) 0;
-	    }
-	    tp = tp->next;
-	  } 
-	  /* Hmmm. Didn't find it this time */
- 	  sp++;
-	}
-      }
-      /* Didn't find any sort of match for this data.  
-	 Get the pointer value and return the received type */
-      *ptr = (void *) tmp;
-      return _c;
-    } else {
-      /* Found a match on the first try.  Return pointer value */
-      *ptr = (void *) tmp;
-      return (char *) 0;
-    }
-  } 
-  *ptr = (void *) tmp;
-  return (char *) 0;
-}
-
-/* Compatibility mode */
-
-#define _swig_get_hex  SWIG_GetPtr
-/* Magic variable code */
-#ifndef PERL_OBJECT
-#define swig_create_magic(s,a,b,c) _swig_create_magic(s,a,b,c)
-static void _swig_create_magic(SV *sv, char *name, int (*set)(SV *, MAGIC *), int (*get)(SV *,MAGIC *)) {
-#else
-#define swig_create_magic(s,a,b,c) _swig_create_magic(pPerl,s,a,b,c)
-static void _swig_create_magic(CPerl *pPerl, SV *sv, char *name, int (CPerl::*set)(SV *, MAGIC *), int (CPerl::*get)(SV *, MAGIC *)) {
-#endif
-  MAGIC *mg;
-  sv_magic(sv,sv,'U',name,strlen(name));
-  mg = mg_find(sv,'U');
-  mg->mg_virtual = (MGVTBL *) malloc(sizeof(MGVTBL));
-  mg->mg_virtual->svt_get = get;
-  mg->mg_virtual->svt_set = set;
-  mg->mg_virtual->svt_len = 0;
-  mg->mg_virtual->svt_clear = 0;
-  mg->mg_virtual->svt_free = 0;
-}
-
-#define SWIG_init    boot_Net__ICal__Libical
-
-#define SWIG_name   "Net::ICal::Libical::boot_Net__ICal__Libical"
-#define SWIG_varinit "Net::ICal::Libical::var_Net__ICal__Libical_init();"
-#ifdef __cplusplus
-extern "C"
-#endif
-#ifndef PERL_OBJECT
-SWIGEXPORT(void,boot_Net__ICal__Libical)(CV* cv);
-#else
-SWIGEXPORT(void,boot_Net__ICal__Libical)(CPerl *, CV *cv);
-#endif
-
-#include "ical.h"
-
-#include <sys/types.h> /* for size_t */
-#include <time.h>
-
-#ifndef PERL_OBJECT
-#define swig_setiv(a,b) _swig_setiv(a,b)
-static void _swig_setiv(char *name, long value) { 
-#else
-#define swig_setiv(a,b) _swig_setiv(pPerl,a,b)
-static void _swig_setiv(CPerl *pPerl, char *name, long value) { 
-#endif
-     SV *sv; 
-     sv = perl_get_sv(name,TRUE | 0x2);
-     sv_setiv(sv, (IV) value);
-     SvREADONLY_on(sv);
-}
-
-#ifndef PERL_OBJECT
-#define swig_setpv(a,b) _swig_setpv(a,b)
-static void _swig_setpv(char *name, char *value) { 
-#else
-#define swig_setpv(a,b) _swig_setpv(pPerl,a,b)
-static void _swig_setpv(CPerl *pPerl, char *name, char *value) { 
-#endif
-     SV *sv; 
-     sv = perl_get_sv(name,TRUE | 0x2);
-     sv_setpv(sv, value);
-     SvREADONLY_on(sv);
-}
-
-#ifdef PERL_OBJECT
-#define MAGIC_CLASS _wrap_Net__ICal__Libical_var::
-class _wrap_Net__ICal__Libical_var : public CPerl {
-public:
-#else
-#define MAGIC_CLASS
-#endif
-SWIGCLASS_STATIC int swig_magic_readonly(SV *sv, MAGIC *mg) {
-    MAGIC_PPERL
-    sv = sv; mg = mg;
-    croak("Value is read-only.");
-    return 0;
-}
-
-
-#ifdef PERL_OBJECT
-};
-#endif
-
-XS(_wrap_icalparser_parse_string) {
-
-    icalcomponent * _result;
-    char * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalparser_parse_string(str);");
-    _arg0 = (char *) SvPV(ST(0),na);
-    _result = (icalcomponent *)icalparser_parse_string(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"icalcomponentPtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalcomponent_new) {
-
-    icalcomponent * _result;
-    icalcomponent_kind * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalcomponent_new(kind);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"icalcomponent_kindPtr")) {
-        croak("Type error in argument 1 of icalcomponent_new. Expected icalcomponent_kindPtr.");
-        XSRETURN(1);
-    }
-    _result = (icalcomponent *)icalcomponent_new(*_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"icalcomponentPtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalcomponent_new_clone) {
-
-    icalcomponent * _result;
-    icalcomponent * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalcomponent_new_clone(component);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icalcomponent_new_clone. Expected icalcomponentPtr.");
-        XSRETURN(1);
-    }
-    _result = (icalcomponent *)icalcomponent_new_clone(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"icalcomponentPtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalcomponent_new_from_string) {
-
-    icalcomponent * _result;
-    char * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalcomponent_new_from_string(str);");
-    _arg0 = (char *) SvPV(ST(0),na);
-    _result = (icalcomponent *)icalcomponent_new_from_string(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"icalcomponentPtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalcomponent_as_ical_string) {
-
-    char * _result;
-    icalcomponent * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalcomponent_as_ical_string(component);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icalcomponent_as_ical_string. Expected icalcomponentPtr.");
-        XSRETURN(1);
-    }
-    _result = (char *)icalcomponent_as_ical_string(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setpv((SV*)ST(argvi++),(char *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalcomponent_free) {
-
-    icalcomponent * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalcomponent_free(component);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icalcomponent_free. Expected icalcomponentPtr.");
-        XSRETURN(1);
-    }
-    icalcomponent_free(_arg0);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalcomponent_count_errors) {
-
-    int  _result;
-    icalcomponent * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalcomponent_count_errors(component);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icalcomponent_count_errors. Expected icalcomponentPtr.");
-        XSRETURN(1);
-    }
-    _result = (int )icalcomponent_count_errors(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalcomponent_strip_errors) {
-
-    icalcomponent * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalcomponent_strip_errors(component);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icalcomponent_strip_errors. Expected icalcomponentPtr.");
-        XSRETURN(1);
-    }
-    icalcomponent_strip_errors(_arg0);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalcomponent_convert_errors) {
-
-    icalcomponent * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalcomponent_convert_errors(component);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icalcomponent_convert_errors. Expected icalcomponentPtr.");
-        XSRETURN(1);
-    }
-    icalcomponent_convert_errors(_arg0);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalcomponent_get_current_property) {
-
-    icalproperty * _result;
-    icalcomponent * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalcomponent_get_current_property(component);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icalcomponent_get_current_property. Expected icalcomponentPtr.");
-        XSRETURN(1);
-    }
-    _result = (icalproperty *)icalcomponent_get_current_property(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"icalpropertyPtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalcomponent_get_first_property) {
-
-    icalproperty * _result;
-    icalcomponent * _arg0;
-    icalproperty_kind * _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icalcomponent_get_first_property(component,kind);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icalcomponent_get_first_property. Expected icalcomponentPtr.");
-        XSRETURN(1);
-    }
-    if (SWIG_GetPtr(ST(1),(void **) &_arg1,"icalproperty_kindPtr")) {
-        croak("Type error in argument 2 of icalcomponent_get_first_property. Expected icalproperty_kindPtr.");
-        XSRETURN(1);
-    }
-    _result = (icalproperty *)icalcomponent_get_first_property(_arg0,*_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"icalpropertyPtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalcomponent_get_next_property) {
-
-    icalproperty * _result;
-    icalcomponent * _arg0;
-    icalproperty_kind * _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icalcomponent_get_next_property(component,kind);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icalcomponent_get_next_property. Expected icalcomponentPtr.");
-        XSRETURN(1);
-    }
-    if (SWIG_GetPtr(ST(1),(void **) &_arg1,"icalproperty_kindPtr")) {
-        croak("Type error in argument 2 of icalcomponent_get_next_property. Expected icalproperty_kindPtr.");
-        XSRETURN(1);
-    }
-    _result = (icalproperty *)icalcomponent_get_next_property(_arg0,*_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"icalpropertyPtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalcomponent_get_current_component) {
-
-    icalcomponent * _result;
-    icalcomponent * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalcomponent_get_current_component(component);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icalcomponent_get_current_component. Expected icalcomponentPtr.");
-        XSRETURN(1);
-    }
-    _result = (icalcomponent *)icalcomponent_get_current_component(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"icalcomponentPtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalcomponent_get_first_component) {
-
-    icalcomponent * _result;
-    icalcomponent * _arg0;
-    icalcomponent_kind * _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icalcomponent_get_first_component(component,kind);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icalcomponent_get_first_component. Expected icalcomponentPtr.");
-        XSRETURN(1);
-    }
-    if (SWIG_GetPtr(ST(1),(void **) &_arg1,"icalcomponent_kindPtr")) {
-        croak("Type error in argument 2 of icalcomponent_get_first_component. Expected icalcomponent_kindPtr.");
-        XSRETURN(1);
-    }
-    _result = (icalcomponent *)icalcomponent_get_first_component(_arg0,*_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"icalcomponentPtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalcomponent_get_next_component) {
-
-    icalcomponent * _result;
-    icalcomponent * _arg0;
-    icalcomponent_kind * _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icalcomponent_get_next_component(component,kind);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icalcomponent_get_next_component. Expected icalcomponentPtr.");
-        XSRETURN(1);
-    }
-    if (SWIG_GetPtr(ST(1),(void **) &_arg1,"icalcomponent_kindPtr")) {
-        croak("Type error in argument 2 of icalcomponent_get_next_component. Expected icalcomponent_kindPtr.");
-        XSRETURN(1);
-    }
-    _result = (icalcomponent *)icalcomponent_get_next_component(_arg0,*_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"icalcomponentPtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalcomponent_add_property) {
-
-    icalcomponent * _arg0;
-    icalproperty * _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icalcomponent_add_property(component,property);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icalcomponent_add_property. Expected icalcomponentPtr.");
-        XSRETURN(1);
-    }
-    if (SWIG_GetPtr(ST(1),(void **) &_arg1,(char *) 0 )) {
-        croak("Type error in argument 2 of icalcomponent_add_property. Expected icalpropertyPtr.");
-        XSRETURN(1);
-    }
-    icalcomponent_add_property(_arg0,_arg1);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalcomponent_remove_property) {
-
-    icalcomponent * _arg0;
-    icalproperty * _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icalcomponent_remove_property(component,property);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icalcomponent_remove_property. Expected icalcomponentPtr.");
-        XSRETURN(1);
-    }
-    if (SWIG_GetPtr(ST(1),(void **) &_arg1,(char *) 0 )) {
-        croak("Type error in argument 2 of icalcomponent_remove_property. Expected icalpropertyPtr.");
-        XSRETURN(1);
-    }
-    icalcomponent_remove_property(_arg0,_arg1);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalcomponent_get_parent) {
-
-    icalcomponent * _result;
-    icalcomponent * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalcomponent_get_parent(component);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icalcomponent_get_parent. Expected icalcomponentPtr.");
-        XSRETURN(1);
-    }
-    _result = (icalcomponent *)icalcomponent_get_parent(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"icalcomponentPtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalcomponent_isa) {
-
-    icalcomponent_kind * _result;
-    icalcomponent * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalcomponent_isa(component);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icalcomponent_isa. Expected icalcomponentPtr.");
-        XSRETURN(1);
-    }
-    _result = (icalcomponent_kind *) malloc(sizeof(icalcomponent_kind ));
-    *(_result) = icalcomponent_isa(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"icalcomponent_kindPtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalrestriction_check) {
-
-    int  _result;
-    icalcomponent * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalrestriction_check(comp);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icalrestriction_check. Expected icalcomponentPtr.");
-        XSRETURN(1);
-    }
-    _result = (int )icalrestriction_check(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalproperty_string_to_kind) {
-
-    int  _result;
-    char * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalproperty_string_to_kind(string);");
-    _arg0 = (char *) SvPV(ST(0),na);
-    _result = (int )icalproperty_string_to_kind(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalproperty_new) {
-
-    icalproperty * _result;
-    int  _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalproperty_new(kind);");
-    _arg0 = (int )SvIV(ST(0));
-    _result = (icalproperty *)icalproperty_new(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"icalpropertyPtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalproperty_new_from_string) {
-
-    icalproperty * _result;
-    char * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalproperty_new_from_string(str);");
-    _arg0 = (char *) SvPV(ST(0),na);
-    _result = (icalproperty *)icalproperty_new_from_string(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"icalpropertyPtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalproperty_as_ical_string) {
-
-    char * _result;
-    icalproperty * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalproperty_as_ical_string(prop);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icalproperty_as_ical_string. Expected icalpropertyPtr.");
-        XSRETURN(1);
-    }
-    _result = (char *)icalproperty_as_ical_string(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setpv((SV*)ST(argvi++),(char *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalproperty_set_parameter_from_string) {
-
-    icalproperty * _arg0;
-    char * _arg1;
-    char * _arg2;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 3) || (items > 3)) 
-        croak("Usage: icalproperty_set_parameter_from_string(prop,name,value);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icalproperty_set_parameter_from_string. Expected icalpropertyPtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (char *) SvPV(ST(1),na);
-    _arg2 = (char *) SvPV(ST(2),na);
-    icalproperty_set_parameter_from_string(_arg0,_arg1,_arg2);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalproperty_set_value_from_string) {
-
-    icalproperty * _arg0;
-    char * _arg1;
-    char * _arg2;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 3) || (items > 3)) 
-        croak("Usage: icalproperty_set_value_from_string(prop,value,kind);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icalproperty_set_value_from_string. Expected icalpropertyPtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (char *) SvPV(ST(1),na);
-    _arg2 = (char *) SvPV(ST(2),na);
-    icalproperty_set_value_from_string(_arg0,_arg1,_arg2);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalproperty_get_value_as_string) {
-
-    char * _result;
-    icalproperty * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalproperty_get_value_as_string(prop);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icalproperty_get_value_as_string. Expected icalpropertyPtr.");
-        XSRETURN(1);
-    }
-    _result = (char *)icalproperty_get_value_as_string(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setpv((SV*)ST(argvi++),(char *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalproperty_get_parameter_as_string) {
-
-    char * _result;
-    icalproperty * _arg0;
-    char * _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icalproperty_get_parameter_as_string(prop,name);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icalproperty_get_parameter_as_string. Expected icalpropertyPtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (char *) SvPV(ST(1),na);
-    _result = (char *)icalproperty_get_parameter_as_string(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setpv((SV*)ST(argvi++),(char *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalproperty_get_parent) {
-
-    icalcomponent * _result;
-    icalproperty * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalproperty_get_parent(property);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icalproperty_get_parent. Expected icalpropertyPtr.");
-        XSRETURN(1);
-    }
-    _result = (icalcomponent *)icalproperty_get_parent(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"icalcomponentPtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalerror_set_error_state) {
-
-    icalerrorenum  _arg0;
-    icalerrorstate  _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icalerror_set_error_state(error,icalerrorstate );");
-    _arg0 = (icalerrorenum )SvIV(ST(0));
-    _arg1 = (icalerrorstate )SvIV(ST(1));
-    icalerror_set_error_state(_arg0,_arg1);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalerror_get_error_state) {
-
-    icalerrorstate  _result;
-    icalerrorenum  _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalerror_get_error_state(error);");
-    _arg0 = (icalerrorenum )SvIV(ST(0));
-    _result = (icalerrorstate )icalerror_get_error_state(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalenum_property_kind_to_string) {
-
-    char * _result;
-    icalproperty_kind * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalenum_property_kind_to_string(kind);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"icalproperty_kindPtr")) {
-        croak("Type error in argument 1 of icalenum_property_kind_to_string. Expected icalproperty_kindPtr.");
-        XSRETURN(1);
-    }
-    _result = (char *)icalenum_property_kind_to_string(*_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setpv((SV*)ST(argvi++),(char *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalenum_string_to_property_kind) {
-
-    icalproperty_kind * _result;
-    char * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalenum_string_to_property_kind(string);");
-    _arg0 = (char *) SvPV(ST(0),na);
-    _result = (icalproperty_kind *) malloc(sizeof(icalproperty_kind ));
-    *(_result) = icalenum_string_to_property_kind(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"icalproperty_kindPtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalenum_value_kind_to_string) {
-
-    char * _result;
-    icalvalue_kind * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalenum_value_kind_to_string(kind);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"icalvalue_kindPtr")) {
-        croak("Type error in argument 1 of icalenum_value_kind_to_string. Expected icalvalue_kindPtr.");
-        XSRETURN(1);
-    }
-    _result = (char *)icalenum_value_kind_to_string(*_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setpv((SV*)ST(argvi++),(char *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalenum_parameter_kind_to_string) {
-
-    char * _result;
-    icalparameter_kind * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalenum_parameter_kind_to_string(kind);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"icalparameter_kindPtr")) {
-        croak("Type error in argument 1 of icalenum_parameter_kind_to_string. Expected icalparameter_kindPtr.");
-        XSRETURN(1);
-    }
-    _result = (char *)icalenum_parameter_kind_to_string(*_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setpv((SV*)ST(argvi++),(char *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalenum_string_to_parameter_kind) {
-
-    icalparameter_kind * _result;
-    char * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalenum_string_to_parameter_kind(string);");
-    _arg0 = (char *) SvPV(ST(0),na);
-    _result = (icalparameter_kind *) malloc(sizeof(icalparameter_kind ));
-    *(_result) = icalenum_string_to_parameter_kind(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"icalparameter_kindPtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalenum_component_kind_to_string) {
-
-    char * _result;
-    icalcomponent_kind * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalenum_component_kind_to_string(kind);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"icalcomponent_kindPtr")) {
-        croak("Type error in argument 1 of icalenum_component_kind_to_string. Expected icalcomponent_kindPtr.");
-        XSRETURN(1);
-    }
-    _result = (char *)icalenum_component_kind_to_string(*_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setpv((SV*)ST(argvi++),(char *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalenum_string_to_component_kind) {
-
-    icalcomponent_kind * _result;
-    char * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalenum_string_to_component_kind(string);");
-    _arg0 = (char *) SvPV(ST(0),na);
-    _result = (icalcomponent_kind *) malloc(sizeof(icalcomponent_kind ));
-    *(_result) = icalenum_string_to_component_kind(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"icalcomponent_kindPtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalenum_property_kind_to_value_kind) {
-
-    icalvalue_kind * _result;
-    icalproperty_kind * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalenum_property_kind_to_value_kind(kind);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"icalproperty_kindPtr")) {
-        croak("Type error in argument 1 of icalenum_property_kind_to_value_kind. Expected icalproperty_kindPtr.");
-        XSRETURN(1);
-    }
-    _result = (icalvalue_kind *) malloc(sizeof(icalvalue_kind ));
-    *(_result) = icalenum_property_kind_to_value_kind(*_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"icalvalue_kindPtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icallangbind_new_array) {
-
-    int * _result;
-    int  _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icallangbind_new_array(size);");
-    _arg0 = (int )SvIV(ST(0));
-    _result = (int *)icallangbind_new_array(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"intPtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icallangbind_free_array) {
-
-    int * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icallangbind_free_array(array);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"intPtr")) {
-        croak("Type error in argument 1 of icallangbind_free_array. Expected intPtr.");
-        XSRETURN(1);
-    }
-    icallangbind_free_array(_arg0);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icallangbind_access_array) {
-
-    int  _result;
-    int * _arg0;
-    int  _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icallangbind_access_array(array,index);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"intPtr")) {
-        croak("Type error in argument 1 of icallangbind_access_array. Expected intPtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (int )SvIV(ST(1));
-    _result = (int )icallangbind_access_array(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalrecur_expand_recurrence) {
-
-    int  _result;
-    char * _arg0;
-    int  _arg1;
-    int  _arg2;
-    int * _arg3;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 4) || (items > 4)) 
-        croak("Usage: icalrecur_expand_recurrence(rule,start,count,array);");
-    _arg0 = (char *) SvPV(ST(0),na);
-    _arg1 = (int )SvIV(ST(1));
-    _arg2 = (int )SvIV(ST(2));
-    if (SWIG_GetPtr(ST(3),(void **) &_arg3,"intPtr")) {
-        croak("Type error in argument 4 of icalrecur_expand_recurrence. Expected intPtr.");
-        XSRETURN(1);
-    }
-    _result = (int )icalrecur_expand_recurrence(_arg0,_arg1,_arg2,_arg3);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icallangbind_get_first_property) {
-
-    icalproperty * _result;
-    icalcomponent * _arg0;
-    char * _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icallangbind_get_first_property(c,prop);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icallangbind_get_first_property. Expected icalcomponentPtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (char *) SvPV(ST(1),na);
-    _result = (icalproperty *)icallangbind_get_first_property(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"icalpropertyPtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icallangbind_get_next_property) {
-
-    icalproperty * _result;
-    icalcomponent * _arg0;
-    char * _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icallangbind_get_next_property(c,prop);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icallangbind_get_next_property. Expected icalcomponentPtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (char *) SvPV(ST(1),na);
-    _result = (icalproperty *)icallangbind_get_next_property(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"icalpropertyPtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icallangbind_get_first_component) {
-
-    icalcomponent * _result;
-    icalcomponent * _arg0;
-    char * _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icallangbind_get_first_component(c,comp);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icallangbind_get_first_component. Expected icalcomponentPtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (char *) SvPV(ST(1),na);
-    _result = (icalcomponent *)icallangbind_get_first_component(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"icalcomponentPtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icallangbind_get_next_component) {
-
-    icalcomponent * _result;
-    icalcomponent * _arg0;
-    char * _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icallangbind_get_next_component(c,comp);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icallangbind_get_next_component. Expected icalcomponentPtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (char *) SvPV(ST(1),na);
-    _result = (icalcomponent *)icallangbind_get_next_component(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"icalcomponentPtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icallangbind_property_eval_string) {
-
-    char * _result;
-    icalproperty * _arg0;
-    char * _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icallangbind_property_eval_string(prop,sep);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,(char *) 0 )) {
-        croak("Type error in argument 1 of icallangbind_property_eval_string. Expected icalpropertyPtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (char *) SvPV(ST(1),na);
-    _result = (char *)icallangbind_property_eval_string(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setpv((SV*)ST(argvi++),(char *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaltime_from_timet) {
-
-    struct icaltimetype * _result;
-    int  _arg0;
-    int  _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icaltime_from_timet(v,is_date);");
-    _arg0 = (int )SvIV(ST(0));
-    _arg1 = (int )SvIV(ST(1));
-    _result = (struct icaltimetype *) malloc(sizeof(struct icaltimetype ));
-    *(_result) = icaltime_from_timet(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"struct icaltimetypePtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaltime_as_timet) {
-
-    int  _result;
-    struct icaltimetype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaltime_as_timet(struct icaltimetype *);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltime_as_timet. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _result = (int )icaltime_as_timet(*_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaltime_as_ical_string) {
-
-    char * _result;
-    struct icaltimetype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaltime_as_ical_string(tt);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltime_as_ical_string. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _result = (char *)icaltime_as_ical_string(*_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setpv((SV*)ST(argvi++),(char *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaltime_from_string) {
-
-    struct icaltimetype * _result;
-    char * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaltime_from_string(str);");
-    _arg0 = (char *) SvPV(ST(0),na);
-    _result = (struct icaltimetype *) malloc(sizeof(struct icaltimetype ));
-    *(_result) = icaltime_from_string(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"struct icaltimetypePtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaltime_utc_offset) {
-
-    int  _result;
-    struct icaltimetype * _arg0;
-    char * _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icaltime_utc_offset(tt,tzid);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltime_utc_offset. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (char *) SvPV(ST(1),na);
-    _result = (int )icaltime_utc_offset(*_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaltime_as_utc) {
-
-    struct icaltimetype * _result;
-    struct icaltimetype * _arg0;
-    char * _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icaltime_as_utc(tt,tzid);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltime_as_utc. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (char *) SvPV(ST(1),na);
-    _result = (struct icaltimetype *) malloc(sizeof(struct icaltimetype ));
-    *(_result) = icaltime_as_utc(*_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"struct icaltimetypePtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaltime_as_zone) {
-
-    struct icaltimetype * _result;
-    struct icaltimetype * _arg0;
-    char * _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icaltime_as_zone(tt,tzid);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltime_as_zone. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (char *) SvPV(ST(1),na);
-    _result = (struct icaltimetype *) malloc(sizeof(struct icaltimetype ));
-    *(_result) = icaltime_as_zone(*_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"struct icaltimetypePtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaltime_null_time) {
-
-    struct icaltimetype * _result;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 0) || (items > 0)) 
-        croak("Usage: icaltime_null_time();");
-    _result = (struct icaltimetype *) malloc(sizeof(struct icaltimetype ));
-    *(_result) = icaltime_null_time();
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"struct icaltimetypePtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaltime_is_null_time) {
-
-    int  _result;
-    struct icaltimetype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaltime_is_null_time(t);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltime_is_null_time. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _result = (int )icaltime_is_null_time(*_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaltime_is_valid_time) {
-
-    int  _result;
-    struct icaltimetype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaltime_is_valid_time(t);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltime_is_valid_time. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _result = (int )icaltime_is_valid_time(*_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaltime_normalize) {
-
-    struct icaltimetype * _result;
-    struct icaltimetype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaltime_normalize(t);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltime_normalize. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _result = (struct icaltimetype *) malloc(sizeof(struct icaltimetype ));
-    *(_result) = icaltime_normalize(*_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"struct icaltimetypePtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaltime_day_of_year) {
-
-    short  _result;
-    struct icaltimetype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaltime_day_of_year(t);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltime_day_of_year. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _result = (short )icaltime_day_of_year(*_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaltime_from_day_of_year) {
-
-    struct icaltimetype * _result;
-    short  _arg0;
-    short  _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icaltime_from_day_of_year(doy,year);");
-    _arg0 = (short )SvIV(ST(0));
-    _arg1 = (short )SvIV(ST(1));
-    _result = (struct icaltimetype *) malloc(sizeof(struct icaltimetype ));
-    *(_result) = icaltime_from_day_of_year(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"struct icaltimetypePtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaltime_day_of_week) {
-
-    short  _result;
-    struct icaltimetype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaltime_day_of_week(t);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltime_day_of_week. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _result = (short )icaltime_day_of_week(*_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaltime_start_doy_of_week) {
-
-    short  _result;
-    struct icaltimetype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaltime_start_doy_of_week(t);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltime_start_doy_of_week. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _result = (short )icaltime_start_doy_of_week(*_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaltime_as_ctime) {
-
-    char * _result;
-    struct icaltimetype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaltime_as_ctime(struct icaltimetype *);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltime_as_ctime. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _result = (char *)icaltime_as_ctime(*_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setpv((SV*)ST(argvi++),(char *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaltime_week_number) {
-
-    short  _result;
-    struct icaltimetype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaltime_week_number(t);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltime_week_number. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _result = (short )icaltime_week_number(*_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaltime_compare) {
-
-    int  _result;
-    struct icaltimetype * _arg0;
-    struct icaltimetype * _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icaltime_compare(a,b);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltime_compare. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    if (SWIG_GetPtr(ST(1),(void **) &_arg1,"struct icaltimetypePtr")) {
-        croak("Type error in argument 2 of icaltime_compare. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _result = (int )icaltime_compare(*_arg0,*_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaltime_compare_date_only) {
-
-    int  _result;
-    struct icaltimetype * _arg0;
-    struct icaltimetype * _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icaltime_compare_date_only(a,b);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltime_compare_date_only. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    if (SWIG_GetPtr(ST(1),(void **) &_arg1,"struct icaltimetypePtr")) {
-        croak("Type error in argument 2 of icaltime_compare_date_only. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _result = (int )icaltime_compare_date_only(*_arg0,*_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaltime_days_in_month) {
-
-    short  _result;
-    short  _arg0;
-    short  _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icaltime_days_in_month(month,year);");
-    _arg0 = (short )SvIV(ST(0));
-    _arg1 = (short )SvIV(ST(1));
-    _result = (short )icaltime_days_in_month(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaldurationtype_from_int) {
-
-    struct icaldurationtype * _result;
-    int  _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaldurationtype_from_int(t);");
-    _arg0 = (int )SvIV(ST(0));
-    _result = (struct icaldurationtype *) malloc(sizeof(struct icaldurationtype ));
-    *(_result) = icaldurationtype_from_int(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"struct icaldurationtypePtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaldurationtype_from_string) {
-
-    struct icaldurationtype * _result;
-    char * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaldurationtype_from_string(char *);");
-    _arg0 = (char *) SvPV(ST(0),na);
-    _result = (struct icaldurationtype *) malloc(sizeof(struct icaldurationtype ));
-    *(_result) = icaldurationtype_from_string(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"struct icaldurationtypePtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaldurationtype_as_int) {
-
-    int  _result;
-    struct icaldurationtype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaldurationtype_as_int(duration);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaldurationtypePtr")) {
-        croak("Type error in argument 1 of icaldurationtype_as_int. Expected struct icaldurationtypePtr.");
-        XSRETURN(1);
-    }
-    _result = (int )icaldurationtype_as_int(*_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaldurationtype_as_ical_string) {
-
-    char * _result;
-    struct icaldurationtype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaldurationtype_as_ical_string(d);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaldurationtypePtr")) {
-        croak("Type error in argument 1 of icaldurationtype_as_ical_string. Expected struct icaldurationtypePtr.");
-        XSRETURN(1);
-    }
-    _result = (char *)icaldurationtype_as_ical_string(*_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setpv((SV*)ST(argvi++),(char *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaldurationtype_null_duration) {
-
-    struct icaldurationtype * _result;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 0) || (items > 0)) 
-        croak("Usage: icaldurationtype_null_duration();");
-    _result = (struct icaldurationtype *) malloc(sizeof(struct icaldurationtype ));
-    *(_result) = icaldurationtype_null_duration();
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"struct icaldurationtypePtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaldurationtype_is_null_duration) {
-
-    int  _result;
-    struct icaldurationtype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaldurationtype_is_null_duration(d);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaldurationtypePtr")) {
-        croak("Type error in argument 1 of icaldurationtype_is_null_duration. Expected struct icaldurationtypePtr.");
-        XSRETURN(1);
-    }
-    _result = (int )icaldurationtype_is_null_duration(*_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaltime_add) {
-
-    struct icaltimetype * _result;
-    struct icaltimetype * _arg0;
-    struct icaldurationtype * _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icaltime_add(t,d);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltime_add. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    if (SWIG_GetPtr(ST(1),(void **) &_arg1,"struct icaldurationtypePtr")) {
-        croak("Type error in argument 2 of icaltime_add. Expected struct icaldurationtypePtr.");
-        XSRETURN(1);
-    }
-    _result = (struct icaltimetype *) malloc(sizeof(struct icaltimetype ));
-    *(_result) = icaltime_add(*_arg0,*_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"struct icaltimetypePtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icaltime_subtract) {
-
-    struct icaldurationtype * _result;
-    struct icaltimetype * _arg0;
-    struct icaltimetype * _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icaltime_subtract(t1,t2);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltime_subtract. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    if (SWIG_GetPtr(ST(1),(void **) &_arg1,"struct icaltimetypePtr")) {
-        croak("Type error in argument 2 of icaltime_subtract. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _result = (struct icaldurationtype *) malloc(sizeof(struct icaldurationtype ));
-    *(_result) = icaltime_subtract(*_arg0,*_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"struct icaldurationtypePtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalperiodtype_from_string) {
-
-    struct icalperiodtype * _result;
-    char * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalperiodtype_from_string(str);");
-    _arg0 = (char *) SvPV(ST(0),na);
-    _result = (struct icalperiodtype *) malloc(sizeof(struct icalperiodtype ));
-    *(_result) = icalperiodtype_from_string(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"struct icalperiodtypePtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalperiodtype_as_ical_string) {
-
-    char * _result;
-    struct icalperiodtype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalperiodtype_as_ical_string(p);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icalperiodtypePtr")) {
-        croak("Type error in argument 1 of icalperiodtype_as_ical_string. Expected struct icalperiodtypePtr.");
-        XSRETURN(1);
-    }
-    _result = (char *)icalperiodtype_as_ical_string(*_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setpv((SV*)ST(argvi++),(char *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalperiodtype_null_period) {
-
-    struct icalperiodtype * _result;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 0) || (items > 0)) 
-        croak("Usage: icalperiodtype_null_period();");
-    _result = (struct icalperiodtype *) malloc(sizeof(struct icalperiodtype ));
-    *(_result) = icalperiodtype_null_period();
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"struct icalperiodtypePtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalperiodtype_is_null_period) {
-
-    int  _result;
-    struct icalperiodtype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalperiodtype_is_null_period(p);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icalperiodtypePtr")) {
-        croak("Type error in argument 1 of icalperiodtype_is_null_period. Expected struct icalperiodtypePtr.");
-        XSRETURN(1);
-    }
-    _result = (int )icalperiodtype_is_null_period(*_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_icalperiodtype_is_valid_period) {
-
-    int  _result;
-    struct icalperiodtype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalperiodtype_is_valid_period(p);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icalperiodtypePtr")) {
-        croak("Type error in argument 1 of icalperiodtype_is_valid_period. Expected struct icalperiodtypePtr.");
-        XSRETURN(1);
-    }
-    _result = (int )icalperiodtype_is_valid_period(*_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaltimetype_year_set(_swigobj,_swigval) (_swigobj->year = _swigval,_swigval)
-XS(_wrap_icaltimetype_year_set) {
-
-    int  _result;
-    struct icaltimetype * _arg0;
-    int  _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icaltimetype_year_set(struct icaltimetype *,int );");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltimetype_year_set. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (int )SvIV(ST(1));
-    _result = (int )icaltimetype_year_set(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaltimetype_year_get(_swigobj) ((int ) _swigobj->year)
-XS(_wrap_icaltimetype_year_get) {
-
-    int  _result;
-    struct icaltimetype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaltimetype_year_get(struct icaltimetype *);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltimetype_year_get. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _result = (int )icaltimetype_year_get(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaltimetype_month_set(_swigobj,_swigval) (_swigobj->month = _swigval,_swigval)
-XS(_wrap_icaltimetype_month_set) {
-
-    int  _result;
-    struct icaltimetype * _arg0;
-    int  _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icaltimetype_month_set(struct icaltimetype *,int );");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltimetype_month_set. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (int )SvIV(ST(1));
-    _result = (int )icaltimetype_month_set(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaltimetype_month_get(_swigobj) ((int ) _swigobj->month)
-XS(_wrap_icaltimetype_month_get) {
-
-    int  _result;
-    struct icaltimetype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaltimetype_month_get(struct icaltimetype *);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltimetype_month_get. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _result = (int )icaltimetype_month_get(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaltimetype_day_set(_swigobj,_swigval) (_swigobj->day = _swigval,_swigval)
-XS(_wrap_icaltimetype_day_set) {
-
-    int  _result;
-    struct icaltimetype * _arg0;
-    int  _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icaltimetype_day_set(struct icaltimetype *,int );");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltimetype_day_set. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (int )SvIV(ST(1));
-    _result = (int )icaltimetype_day_set(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaltimetype_day_get(_swigobj) ((int ) _swigobj->day)
-XS(_wrap_icaltimetype_day_get) {
-
-    int  _result;
-    struct icaltimetype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaltimetype_day_get(struct icaltimetype *);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltimetype_day_get. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _result = (int )icaltimetype_day_get(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaltimetype_hour_set(_swigobj,_swigval) (_swigobj->hour = _swigval,_swigval)
-XS(_wrap_icaltimetype_hour_set) {
-
-    int  _result;
-    struct icaltimetype * _arg0;
-    int  _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icaltimetype_hour_set(struct icaltimetype *,int );");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltimetype_hour_set. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (int )SvIV(ST(1));
-    _result = (int )icaltimetype_hour_set(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaltimetype_hour_get(_swigobj) ((int ) _swigobj->hour)
-XS(_wrap_icaltimetype_hour_get) {
-
-    int  _result;
-    struct icaltimetype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaltimetype_hour_get(struct icaltimetype *);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltimetype_hour_get. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _result = (int )icaltimetype_hour_get(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaltimetype_minute_set(_swigobj,_swigval) (_swigobj->minute = _swigval,_swigval)
-XS(_wrap_icaltimetype_minute_set) {
-
-    int  _result;
-    struct icaltimetype * _arg0;
-    int  _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icaltimetype_minute_set(struct icaltimetype *,int );");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltimetype_minute_set. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (int )SvIV(ST(1));
-    _result = (int )icaltimetype_minute_set(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaltimetype_minute_get(_swigobj) ((int ) _swigobj->minute)
-XS(_wrap_icaltimetype_minute_get) {
-
-    int  _result;
-    struct icaltimetype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaltimetype_minute_get(struct icaltimetype *);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltimetype_minute_get. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _result = (int )icaltimetype_minute_get(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaltimetype_second_set(_swigobj,_swigval) (_swigobj->second = _swigval,_swigval)
-XS(_wrap_icaltimetype_second_set) {
-
-    int  _result;
-    struct icaltimetype * _arg0;
-    int  _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icaltimetype_second_set(struct icaltimetype *,int );");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltimetype_second_set. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (int )SvIV(ST(1));
-    _result = (int )icaltimetype_second_set(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaltimetype_second_get(_swigobj) ((int ) _swigobj->second)
-XS(_wrap_icaltimetype_second_get) {
-
-    int  _result;
-    struct icaltimetype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaltimetype_second_get(struct icaltimetype *);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltimetype_second_get. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _result = (int )icaltimetype_second_get(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaltimetype_is_utc_set(_swigobj,_swigval) (_swigobj->is_utc = _swigval,_swigval)
-XS(_wrap_icaltimetype_is_utc_set) {
-
-    int  _result;
-    struct icaltimetype * _arg0;
-    int  _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icaltimetype_is_utc_set(struct icaltimetype *,int );");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltimetype_is_utc_set. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (int )SvIV(ST(1));
-    _result = (int )icaltimetype_is_utc_set(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaltimetype_is_utc_get(_swigobj) ((int ) _swigobj->is_utc)
-XS(_wrap_icaltimetype_is_utc_get) {
-
-    int  _result;
-    struct icaltimetype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaltimetype_is_utc_get(struct icaltimetype *);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltimetype_is_utc_get. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _result = (int )icaltimetype_is_utc_get(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaltimetype_is_date_set(_swigobj,_swigval) (_swigobj->is_date = _swigval,_swigval)
-XS(_wrap_icaltimetype_is_date_set) {
-
-    int  _result;
-    struct icaltimetype * _arg0;
-    int  _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icaltimetype_is_date_set(struct icaltimetype *,int );");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltimetype_is_date_set. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (int )SvIV(ST(1));
-    _result = (int )icaltimetype_is_date_set(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaltimetype_is_date_get(_swigobj) ((int ) _swigobj->is_date)
-XS(_wrap_icaltimetype_is_date_get) {
-
-    int  _result;
-    struct icaltimetype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaltimetype_is_date_get(struct icaltimetype *);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaltimetypePtr")) {
-        croak("Type error in argument 1 of icaltimetype_is_date_get. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _result = (int )icaltimetype_is_date_get(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaldurationtype_is_neg_set(_swigobj,_swigval) (_swigobj->is_neg = _swigval,_swigval)
-XS(_wrap_icaldurationtype_is_neg_set) {
-
-    int  _result;
-    struct icaldurationtype * _arg0;
-    int  _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icaldurationtype_is_neg_set(struct icaldurationtype *,int );");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaldurationtypePtr")) {
-        croak("Type error in argument 1 of icaldurationtype_is_neg_set. Expected struct icaldurationtypePtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (int )SvIV(ST(1));
-    _result = (int )icaldurationtype_is_neg_set(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaldurationtype_is_neg_get(_swigobj) ((int ) _swigobj->is_neg)
-XS(_wrap_icaldurationtype_is_neg_get) {
-
-    int  _result;
-    struct icaldurationtype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaldurationtype_is_neg_get(struct icaldurationtype *);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaldurationtypePtr")) {
-        croak("Type error in argument 1 of icaldurationtype_is_neg_get. Expected struct icaldurationtypePtr.");
-        XSRETURN(1);
-    }
-    _result = (int )icaldurationtype_is_neg_get(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaldurationtype_days_set(_swigobj,_swigval) (_swigobj->days = _swigval,_swigval)
-XS(_wrap_icaldurationtype_days_set) {
-
-    unsigned int  _result;
-    struct icaldurationtype * _arg0;
-    unsigned int  _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icaldurationtype_days_set(struct icaldurationtype *,unsigned int );");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaldurationtypePtr")) {
-        croak("Type error in argument 1 of icaldurationtype_days_set. Expected struct icaldurationtypePtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (unsigned int )SvIV(ST(1));
-    _result = (unsigned int )icaldurationtype_days_set(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaldurationtype_days_get(_swigobj) ((unsigned int ) _swigobj->days)
-XS(_wrap_icaldurationtype_days_get) {
-
-    unsigned int  _result;
-    struct icaldurationtype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaldurationtype_days_get(struct icaldurationtype *);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaldurationtypePtr")) {
-        croak("Type error in argument 1 of icaldurationtype_days_get. Expected struct icaldurationtypePtr.");
-        XSRETURN(1);
-    }
-    _result = (unsigned int )icaldurationtype_days_get(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaldurationtype_weeks_set(_swigobj,_swigval) (_swigobj->weeks = _swigval,_swigval)
-XS(_wrap_icaldurationtype_weeks_set) {
-
-    unsigned int  _result;
-    struct icaldurationtype * _arg0;
-    unsigned int  _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icaldurationtype_weeks_set(struct icaldurationtype *,unsigned int );");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaldurationtypePtr")) {
-        croak("Type error in argument 1 of icaldurationtype_weeks_set. Expected struct icaldurationtypePtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (unsigned int )SvIV(ST(1));
-    _result = (unsigned int )icaldurationtype_weeks_set(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaldurationtype_weeks_get(_swigobj) ((unsigned int ) _swigobj->weeks)
-XS(_wrap_icaldurationtype_weeks_get) {
-
-    unsigned int  _result;
-    struct icaldurationtype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaldurationtype_weeks_get(struct icaldurationtype *);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaldurationtypePtr")) {
-        croak("Type error in argument 1 of icaldurationtype_weeks_get. Expected struct icaldurationtypePtr.");
-        XSRETURN(1);
-    }
-    _result = (unsigned int )icaldurationtype_weeks_get(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaldurationtype_hours_set(_swigobj,_swigval) (_swigobj->hours = _swigval,_swigval)
-XS(_wrap_icaldurationtype_hours_set) {
-
-    unsigned int  _result;
-    struct icaldurationtype * _arg0;
-    unsigned int  _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icaldurationtype_hours_set(struct icaldurationtype *,unsigned int );");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaldurationtypePtr")) {
-        croak("Type error in argument 1 of icaldurationtype_hours_set. Expected struct icaldurationtypePtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (unsigned int )SvIV(ST(1));
-    _result = (unsigned int )icaldurationtype_hours_set(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaldurationtype_hours_get(_swigobj) ((unsigned int ) _swigobj->hours)
-XS(_wrap_icaldurationtype_hours_get) {
-
-    unsigned int  _result;
-    struct icaldurationtype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaldurationtype_hours_get(struct icaldurationtype *);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaldurationtypePtr")) {
-        croak("Type error in argument 1 of icaldurationtype_hours_get. Expected struct icaldurationtypePtr.");
-        XSRETURN(1);
-    }
-    _result = (unsigned int )icaldurationtype_hours_get(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaldurationtype_minutes_set(_swigobj,_swigval) (_swigobj->minutes = _swigval,_swigval)
-XS(_wrap_icaldurationtype_minutes_set) {
-
-    unsigned int  _result;
-    struct icaldurationtype * _arg0;
-    unsigned int  _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icaldurationtype_minutes_set(struct icaldurationtype *,unsigned int );");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaldurationtypePtr")) {
-        croak("Type error in argument 1 of icaldurationtype_minutes_set. Expected struct icaldurationtypePtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (unsigned int )SvIV(ST(1));
-    _result = (unsigned int )icaldurationtype_minutes_set(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaldurationtype_minutes_get(_swigobj) ((unsigned int ) _swigobj->minutes)
-XS(_wrap_icaldurationtype_minutes_get) {
-
-    unsigned int  _result;
-    struct icaldurationtype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaldurationtype_minutes_get(struct icaldurationtype *);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaldurationtypePtr")) {
-        croak("Type error in argument 1 of icaldurationtype_minutes_get. Expected struct icaldurationtypePtr.");
-        XSRETURN(1);
-    }
-    _result = (unsigned int )icaldurationtype_minutes_get(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaldurationtype_seconds_set(_swigobj,_swigval) (_swigobj->seconds = _swigval,_swigval)
-XS(_wrap_icaldurationtype_seconds_set) {
-
-    unsigned int  _result;
-    struct icaldurationtype * _arg0;
-    unsigned int  _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icaldurationtype_seconds_set(struct icaldurationtype *,unsigned int );");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaldurationtypePtr")) {
-        croak("Type error in argument 1 of icaldurationtype_seconds_set. Expected struct icaldurationtypePtr.");
-        XSRETURN(1);
-    }
-    _arg1 = (unsigned int )SvIV(ST(1));
-    _result = (unsigned int )icaldurationtype_seconds_set(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icaldurationtype_seconds_get(_swigobj) ((unsigned int ) _swigobj->seconds)
-XS(_wrap_icaldurationtype_seconds_get) {
-
-    unsigned int  _result;
-    struct icaldurationtype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icaldurationtype_seconds_get(struct icaldurationtype *);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icaldurationtypePtr")) {
-        croak("Type error in argument 1 of icaldurationtype_seconds_get. Expected struct icaldurationtypePtr.");
-        XSRETURN(1);
-    }
-    _result = (unsigned int )icaldurationtype_seconds_get(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setiv(ST(argvi++),(IV) _result);
-    XSRETURN(argvi);
-}
-
-#define icalperiodtype_start_set(_swigobj,_swigval) (_swigobj->start = *(_swigval),_swigval)
-XS(_wrap_icalperiodtype_start_set) {
-
-    struct icaltimetype * _result;
-    struct icalperiodtype * _arg0;
-    struct icaltimetype * _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icalperiodtype_start_set(struct icalperiodtype *,struct icaltimetype *);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icalperiodtypePtr")) {
-        croak("Type error in argument 1 of icalperiodtype_start_set. Expected struct icalperiodtypePtr.");
-        XSRETURN(1);
-    }
-    if (SWIG_GetPtr(ST(1),(void **) &_arg1,"struct icaltimetypePtr")) {
-        croak("Type error in argument 2 of icalperiodtype_start_set. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _result = (struct icaltimetype *)icalperiodtype_start_set(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"struct icaltimetypePtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-#define icalperiodtype_start_get(_swigobj) (&_swigobj->start)
-XS(_wrap_icalperiodtype_start_get) {
-
-    struct icaltimetype * _result;
-    struct icalperiodtype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalperiodtype_start_get(struct icalperiodtype *);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icalperiodtypePtr")) {
-        croak("Type error in argument 1 of icalperiodtype_start_get. Expected struct icalperiodtypePtr.");
-        XSRETURN(1);
-    }
-    _result = (struct icaltimetype *)icalperiodtype_start_get(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"struct icaltimetypePtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-#define icalperiodtype_end_set(_swigobj,_swigval) (_swigobj->end = *(_swigval),_swigval)
-XS(_wrap_icalperiodtype_end_set) {
-
-    struct icaltimetype * _result;
-    struct icalperiodtype * _arg0;
-    struct icaltimetype * _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icalperiodtype_end_set(struct icalperiodtype *,struct icaltimetype *);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icalperiodtypePtr")) {
-        croak("Type error in argument 1 of icalperiodtype_end_set. Expected struct icalperiodtypePtr.");
-        XSRETURN(1);
-    }
-    if (SWIG_GetPtr(ST(1),(void **) &_arg1,"struct icaltimetypePtr")) {
-        croak("Type error in argument 2 of icalperiodtype_end_set. Expected struct icaltimetypePtr.");
-        XSRETURN(1);
-    }
-    _result = (struct icaltimetype *)icalperiodtype_end_set(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"struct icaltimetypePtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-#define icalperiodtype_end_get(_swigobj) (&_swigobj->end)
-XS(_wrap_icalperiodtype_end_get) {
-
-    struct icaltimetype * _result;
-    struct icalperiodtype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalperiodtype_end_get(struct icalperiodtype *);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icalperiodtypePtr")) {
-        croak("Type error in argument 1 of icalperiodtype_end_get. Expected struct icalperiodtypePtr.");
-        XSRETURN(1);
-    }
-    _result = (struct icaltimetype *)icalperiodtype_end_get(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"struct icaltimetypePtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-#define icalperiodtype_duration_set(_swigobj,_swigval) (_swigobj->duration = *(_swigval),_swigval)
-XS(_wrap_icalperiodtype_duration_set) {
-
-    struct icaldurationtype * _result;
-    struct icalperiodtype * _arg0;
-    struct icaldurationtype * _arg1;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 2) || (items > 2)) 
-        croak("Usage: icalperiodtype_duration_set(struct icalperiodtype *,struct icaldurationtype *);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icalperiodtypePtr")) {
-        croak("Type error in argument 1 of icalperiodtype_duration_set. Expected struct icalperiodtypePtr.");
-        XSRETURN(1);
-    }
-    if (SWIG_GetPtr(ST(1),(void **) &_arg1,"struct icaldurationtypePtr")) {
-        croak("Type error in argument 2 of icalperiodtype_duration_set. Expected struct icaldurationtypePtr.");
-        XSRETURN(1);
-    }
-    _result = (struct icaldurationtype *)icalperiodtype_duration_set(_arg0,_arg1);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"struct icaldurationtypePtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-#define icalperiodtype_duration_get(_swigobj) (&_swigobj->duration)
-XS(_wrap_icalperiodtype_duration_get) {
-
-    struct icaldurationtype * _result;
-    struct icalperiodtype * _arg0;
-    int argvi = 0;
-    dXSARGS ;
-
-    cv = cv;
-    if ((items < 1) || (items > 1)) 
-        croak("Usage: icalperiodtype_duration_get(struct icalperiodtype *);");
-    if (SWIG_GetPtr(ST(0),(void **) &_arg0,"struct icalperiodtypePtr")) {
-        croak("Type error in argument 1 of icalperiodtype_duration_get. Expected struct icalperiodtypePtr.");
-        XSRETURN(1);
-    }
-    _result = (struct icaldurationtype *)icalperiodtype_duration_get(_arg0);
-    ST(argvi) = sv_newmortal();
-    sv_setref_pv(ST(argvi++),"struct icaldurationtypePtr", (void *) _result);
-    XSRETURN(argvi);
-}
-
-XS(_wrap_perl5_Net__ICal__Libical_var_init) {
-    dXSARGS;
-    SV *sv;
-    cv = cv; items = items;
-    swig_setiv("ICAL_BADARG_ERROR", (long) ICAL_BADARG_ERROR);
-    swig_setiv("ICAL_NEWFAILED_ERROR", (long) ICAL_NEWFAILED_ERROR);
-    swig_setiv("ICAL_MALFORMEDDATA_ERROR", (long) ICAL_MALFORMEDDATA_ERROR);
-    swig_setiv("ICAL_PARSE_ERROR", (long) ICAL_PARSE_ERROR);
-    swig_setiv("ICAL_INTERNAL_ERROR", (long) ICAL_INTERNAL_ERROR);
-    swig_setiv("ICAL_FILE_ERROR", (long) ICAL_FILE_ERROR);
-    swig_setiv("ICAL_ALLOCATION_ERROR", (long) ICAL_ALLOCATION_ERROR);
-    swig_setiv("ICAL_USAGE_ERROR", (long) ICAL_USAGE_ERROR);
-    swig_setiv("ICAL_NO_ERROR", (long) ICAL_NO_ERROR);
-    swig_setiv("ICAL_UNKNOWN_ERROR", (long) ICAL_UNKNOWN_ERROR);
-    swig_setiv("ICAL_ERROR_FATAL", (long) ICAL_ERROR_FATAL);
-    swig_setiv("ICAL_ERROR_NONFATAL", (long) ICAL_ERROR_NONFATAL);
-    swig_setiv("ICAL_ERROR_DEFAULT", (long) ICAL_ERROR_DEFAULT);
-    swig_setiv("ICAL_ERROR_UNKNOWN", (long) ICAL_ERROR_UNKNOWN);
-    swig_setpv("icaltimetype_zone", "icaltimetype::zone");
-    XSRETURN(1);
-}
-#ifdef __cplusplus
-extern "C"
-#endif
-XS(boot_Net__ICal__Libical) {
-	 dXSARGS;
-	 char *file = __FILE__;
-	 cv = cv; items = items;
-	 newXS("Net::ICal::Libical::var_Net__ICal__Libical_init", _wrap_perl5_Net__ICal__Libical_var_init, file);
-	 newXS("Net::ICal::Libical::icalparser_parse_string", _wrap_icalparser_parse_string, file);
-	 newXS("Net::ICal::Libical::icalcomponent_new", _wrap_icalcomponent_new, file);
-	 newXS("Net::ICal::Libical::icalcomponent_new_clone", _wrap_icalcomponent_new_clone, file);
-	 newXS("Net::ICal::Libical::icalcomponent_new_from_string", _wrap_icalcomponent_new_from_string, file);
-	 newXS("Net::ICal::Libical::icalcomponent_as_ical_string", _wrap_icalcomponent_as_ical_string, file);
-	 newXS("Net::ICal::Libical::icalcomponent_free", _wrap_icalcomponent_free, file);
-	 newXS("Net::ICal::Libical::icalcomponent_count_errors", _wrap_icalcomponent_count_errors, file);
-	 newXS("Net::ICal::Libical::icalcomponent_strip_errors", _wrap_icalcomponent_strip_errors, file);
-	 newXS("Net::ICal::Libical::icalcomponent_convert_errors", _wrap_icalcomponent_convert_errors, file);
-	 newXS("Net::ICal::Libical::icalcomponent_get_current_property", _wrap_icalcomponent_get_current_property, file);
-	 newXS("Net::ICal::Libical::icalcomponent_get_first_property", _wrap_icalcomponent_get_first_property, file);
-	 newXS("Net::ICal::Libical::icalcomponent_get_next_property", _wrap_icalcomponent_get_next_property, file);
-	 newXS("Net::ICal::Libical::icalcomponent_get_current_component", _wrap_icalcomponent_get_current_component, file);
-	 newXS("Net::ICal::Libical::icalcomponent_get_first_component", _wrap_icalcomponent_get_first_component, file);
-	 newXS("Net::ICal::Libical::icalcomponent_get_next_component", _wrap_icalcomponent_get_next_component, file);
-	 newXS("Net::ICal::Libical::icalcomponent_add_property", _wrap_icalcomponent_add_property, file);
-	 newXS("Net::ICal::Libical::icalcomponent_remove_property", _wrap_icalcomponent_remove_property, file);
-	 newXS("Net::ICal::Libical::icalcomponent_get_parent", _wrap_icalcomponent_get_parent, file);
-	 newXS("Net::ICal::Libical::icalcomponent_isa", _wrap_icalcomponent_isa, file);
-	 newXS("Net::ICal::Libical::icalrestriction_check", _wrap_icalrestriction_check, file);
-	 newXS("Net::ICal::Libical::icalproperty_string_to_kind", _wrap_icalproperty_string_to_kind, file);
-	 newXS("Net::ICal::Libical::icalproperty_new", _wrap_icalproperty_new, file);
-	 newXS("Net::ICal::Libical::icalproperty_new_from_string", _wrap_icalproperty_new_from_string, file);
-	 newXS("Net::ICal::Libical::icalproperty_as_ical_string", _wrap_icalproperty_as_ical_string, file);
-	 newXS("Net::ICal::Libical::icalproperty_set_parameter_from_string", _wrap_icalproperty_set_parameter_from_string, file);
-	 newXS("Net::ICal::Libical::icalproperty_set_value_from_string", _wrap_icalproperty_set_value_from_string, file);
-	 newXS("Net::ICal::Libical::icalproperty_get_value_as_string", _wrap_icalproperty_get_value_as_string, file);
-	 newXS("Net::ICal::Libical::icalproperty_get_parameter_as_string", _wrap_icalproperty_get_parameter_as_string, file);
-	 newXS("Net::ICal::Libical::icalproperty_get_parent", _wrap_icalproperty_get_parent, file);
-	 newXS("Net::ICal::Libical::icalerror_set_error_state", _wrap_icalerror_set_error_state, file);
-	 newXS("Net::ICal::Libical::icalerror_get_error_state", _wrap_icalerror_get_error_state, file);
-	 newXS("Net::ICal::Libical::icalenum_property_kind_to_string", _wrap_icalenum_property_kind_to_string, file);
-	 newXS("Net::ICal::Libical::icalenum_string_to_property_kind", _wrap_icalenum_string_to_property_kind, file);
-	 newXS("Net::ICal::Libical::icalenum_value_kind_to_string", _wrap_icalenum_value_kind_to_string, file);
-	 newXS("Net::ICal::Libical::icalenum_parameter_kind_to_string", _wrap_icalenum_parameter_kind_to_string, file);
-	 newXS("Net::ICal::Libical::icalenum_string_to_parameter_kind", _wrap_icalenum_string_to_parameter_kind, file);
-	 newXS("Net::ICal::Libical::icalenum_component_kind_to_string", _wrap_icalenum_component_kind_to_string, file);
-	 newXS("Net::ICal::Libical::icalenum_string_to_component_kind", _wrap_icalenum_string_to_component_kind, file);
-	 newXS("Net::ICal::Libical::icalenum_property_kind_to_value_kind", _wrap_icalenum_property_kind_to_value_kind, file);
-	 newXS("Net::ICal::Libical::icallangbind_new_array", _wrap_icallangbind_new_array, file);
-	 newXS("Net::ICal::Libical::icallangbind_free_array", _wrap_icallangbind_free_array, file);
-	 newXS("Net::ICal::Libical::icallangbind_access_array", _wrap_icallangbind_access_array, file);
-	 newXS("Net::ICal::Libical::icalrecur_expand_recurrence", _wrap_icalrecur_expand_recurrence, file);
-	 newXS("Net::ICal::Libical::icallangbind_get_first_property", _wrap_icallangbind_get_first_property, file);
-	 newXS("Net::ICal::Libical::icallangbind_get_next_property", _wrap_icallangbind_get_next_property, file);
-	 newXS("Net::ICal::Libical::icallangbind_get_first_component", _wrap_icallangbind_get_first_component, file);
-	 newXS("Net::ICal::Libical::icallangbind_get_next_component", _wrap_icallangbind_get_next_component, file);
-	 newXS("Net::ICal::Libical::icallangbind_property_eval_string", _wrap_icallangbind_property_eval_string, file);
-	 newXS("Net::ICal::Libical::icaltime_from_timet", _wrap_icaltime_from_timet, file);
-	 newXS("Net::ICal::Libical::icaltime_as_timet", _wrap_icaltime_as_timet, file);
-	 newXS("Net::ICal::Libical::icaltime_as_ical_string", _wrap_icaltime_as_ical_string, file);
-	 newXS("Net::ICal::Libical::icaltime_from_string", _wrap_icaltime_from_string, file);
-	 newXS("Net::ICal::Libical::icaltime_utc_offset", _wrap_icaltime_utc_offset, file);
-	 newXS("Net::ICal::Libical::icaltime_as_utc", _wrap_icaltime_as_utc, file);
-	 newXS("Net::ICal::Libical::icaltime_as_zone", _wrap_icaltime_as_zone, file);
-	 newXS("Net::ICal::Libical::icaltime_null_time", _wrap_icaltime_null_time, file);
-	 newXS("Net::ICal::Libical::icaltime_is_null_time", _wrap_icaltime_is_null_time, file);
-	 newXS("Net::ICal::Libical::icaltime_is_valid_time", _wrap_icaltime_is_valid_time, file);
-	 newXS("Net::ICal::Libical::icaltime_normalize", _wrap_icaltime_normalize, file);
-	 newXS("Net::ICal::Libical::icaltime_day_of_year", _wrap_icaltime_day_of_year, file);
-	 newXS("Net::ICal::Libical::icaltime_from_day_of_year", _wrap_icaltime_from_day_of_year, file);
-	 newXS("Net::ICal::Libical::icaltime_day_of_week", _wrap_icaltime_day_of_week, file);
-	 newXS("Net::ICal::Libical::icaltime_start_doy_of_week", _wrap_icaltime_start_doy_of_week, file);
-	 newXS("Net::ICal::Libical::icaltime_as_ctime", _wrap_icaltime_as_ctime, file);
-	 newXS("Net::ICal::Libical::icaltime_week_number", _wrap_icaltime_week_number, file);
-	 newXS("Net::ICal::Libical::icaltime_compare", _wrap_icaltime_compare, file);
-	 newXS("Net::ICal::Libical::icaltime_compare_date_only", _wrap_icaltime_compare_date_only, file);
-	 newXS("Net::ICal::Libical::icaltime_days_in_month", _wrap_icaltime_days_in_month, file);
-	 newXS("Net::ICal::Libical::icaldurationtype_from_int", _wrap_icaldurationtype_from_int, file);
-	 newXS("Net::ICal::Libical::icaldurationtype_from_string", _wrap_icaldurationtype_from_string, file);
-	 newXS("Net::ICal::Libical::icaldurationtype_as_int", _wrap_icaldurationtype_as_int, file);
-	 newXS("Net::ICal::Libical::icaldurationtype_as_ical_string", _wrap_icaldurationtype_as_ical_string, file);
-	 newXS("Net::ICal::Libical::icaldurationtype_null_duration", _wrap_icaldurationtype_null_duration, file);
-	 newXS("Net::ICal::Libical::icaldurationtype_is_null_duration", _wrap_icaldurationtype_is_null_duration, file);
-	 newXS("Net::ICal::Libical::icaltime_add", _wrap_icaltime_add, file);
-	 newXS("Net::ICal::Libical::icaltime_subtract", _wrap_icaltime_subtract, file);
-	 newXS("Net::ICal::Libical::icalperiodtype_from_string", _wrap_icalperiodtype_from_string, file);
-	 newXS("Net::ICal::Libical::icalperiodtype_as_ical_string", _wrap_icalperiodtype_as_ical_string, file);
-	 newXS("Net::ICal::Libical::icalperiodtype_null_period", _wrap_icalperiodtype_null_period, file);
-	 newXS("Net::ICal::Libical::icalperiodtype_is_null_period", _wrap_icalperiodtype_is_null_period, file);
-	 newXS("Net::ICal::Libical::icalperiodtype_is_valid_period", _wrap_icalperiodtype_is_valid_period, file);
-	 newXS("Net::ICal::Libical::icaltimetype_year_set", _wrap_icaltimetype_year_set, file);
-	 newXS("Net::ICal::Libical::icaltimetype_year_get", _wrap_icaltimetype_year_get, file);
-	 newXS("Net::ICal::Libical::icaltimetype_month_set", _wrap_icaltimetype_month_set, file);
-	 newXS("Net::ICal::Libical::icaltimetype_month_get", _wrap_icaltimetype_month_get, file);
-	 newXS("Net::ICal::Libical::icaltimetype_day_set", _wrap_icaltimetype_day_set, file);
-	 newXS("Net::ICal::Libical::icaltimetype_day_get", _wrap_icaltimetype_day_get, file);
-	 newXS("Net::ICal::Libical::icaltimetype_hour_set", _wrap_icaltimetype_hour_set, file);
-	 newXS("Net::ICal::Libical::icaltimetype_hour_get", _wrap_icaltimetype_hour_get, file);
-	 newXS("Net::ICal::Libical::icaltimetype_minute_set", _wrap_icaltimetype_minute_set, file);
-	 newXS("Net::ICal::Libical::icaltimetype_minute_get", _wrap_icaltimetype_minute_get, file);
-	 newXS("Net::ICal::Libical::icaltimetype_second_set", _wrap_icaltimetype_second_set, file);
-	 newXS("Net::ICal::Libical::icaltimetype_second_get", _wrap_icaltimetype_second_get, file);
-	 newXS("Net::ICal::Libical::icaltimetype_is_utc_set", _wrap_icaltimetype_is_utc_set, file);
-	 newXS("Net::ICal::Libical::icaltimetype_is_utc_get", _wrap_icaltimetype_is_utc_get, file);
-	 newXS("Net::ICal::Libical::icaltimetype_is_date_set", _wrap_icaltimetype_is_date_set, file);
-	 newXS("Net::ICal::Libical::icaltimetype_is_date_get", _wrap_icaltimetype_is_date_get, file);
-	 newXS("Net::ICal::Libical::icaldurationtype_is_neg_set", _wrap_icaldurationtype_is_neg_set, file);
-	 newXS("Net::ICal::Libical::icaldurationtype_is_neg_get", _wrap_icaldurationtype_is_neg_get, file);
-	 newXS("Net::ICal::Libical::icaldurationtype_days_set", _wrap_icaldurationtype_days_set, file);
-	 newXS("Net::ICal::Libical::icaldurationtype_days_get", _wrap_icaldurationtype_days_get, file);
-	 newXS("Net::ICal::Libical::icaldurationtype_weeks_set", _wrap_icaldurationtype_weeks_set, file);
-	 newXS("Net::ICal::Libical::icaldurationtype_weeks_get", _wrap_icaldurationtype_weeks_get, file);
-	 newXS("Net::ICal::Libical::icaldurationtype_hours_set", _wrap_icaldurationtype_hours_set, file);
-	 newXS("Net::ICal::Libical::icaldurationtype_hours_get", _wrap_icaldurationtype_hours_get, file);
-	 newXS("Net::ICal::Libical::icaldurationtype_minutes_set", _wrap_icaldurationtype_minutes_set, file);
-	 newXS("Net::ICal::Libical::icaldurationtype_minutes_get", _wrap_icaldurationtype_minutes_get, file);
-	 newXS("Net::ICal::Libical::icaldurationtype_seconds_set", _wrap_icaldurationtype_seconds_set, file);
-	 newXS("Net::ICal::Libical::icaldurationtype_seconds_get", _wrap_icaldurationtype_seconds_get, file);
-	 newXS("Net::ICal::Libical::icalperiodtype_start_set", _wrap_icalperiodtype_start_set, file);
-	 newXS("Net::ICal::Libical::icalperiodtype_start_get", _wrap_icalperiodtype_start_get, file);
-	 newXS("Net::ICal::Libical::icalperiodtype_end_set", _wrap_icalperiodtype_end_set, file);
-	 newXS("Net::ICal::Libical::icalperiodtype_end_get", _wrap_icalperiodtype_end_get, file);
-	 newXS("Net::ICal::Libical::icalperiodtype_duration_set", _wrap_icalperiodtype_duration_set, file);
-	 newXS("Net::ICal::Libical::icalperiodtype_duration_get", _wrap_icalperiodtype_duration_get, file);
-/*
- * These are the pointer type-equivalency mappings. 
- * (Used by the SWIG pointer type-checker).
- */
-	 SWIG_RegisterMapping("unsigned short","short",0);
-	 SWIG_RegisterMapping("struct icaldurationtype","icaldurationtype",0);
-	 SWIG_RegisterMapping("icalperiodtype","struct icalperiodtype",0);
-	 SWIG_RegisterMapping("long","unsigned long",0);
-	 SWIG_RegisterMapping("long","signed long",0);
-	 SWIG_RegisterMapping("struct icaltimetype","icaltimetype",0);
-	 SWIG_RegisterMapping("icaldurationtype","struct icaldurationtype",0);
-	 SWIG_RegisterMapping("signed short","short",0);
-	 SWIG_RegisterMapping("struct icalperiodtype","icalperiodtype",0);
-	 SWIG_RegisterMapping("signed int","int",0);
-	 SWIG_RegisterMapping("short","unsigned short",0);
-	 SWIG_RegisterMapping("short","signed short",0);
-	 SWIG_RegisterMapping("unsigned long","long",0);
-	 SWIG_RegisterMapping("int","unsigned int",0);
-	 SWIG_RegisterMapping("int","signed int",0);
-	 SWIG_RegisterMapping("unsigned int","int",0);
-	 SWIG_RegisterMapping("icaltimetype","struct icaltimetype",0);
-	 SWIG_RegisterMapping("signed long","long",0);
-	 ST(0) = &sv_yes;
-	 XSRETURN(1);
-}
diff --git a/libical/src/Net-ICal-Libical/netical_wrap.doc b/libical/src/Net-ICal-Libical/netical_wrap.doc
deleted file mode 100644
index 41616c00da..0000000000
--- a/libical/src/Net-ICal-Libical/netical_wrap.doc
+++ /dev/null
@@ -1,393 +0,0 @@
-netical_wrap.c
-
-[ Module : Net__ICal__Libical, Package : Net::ICal::Libical ]
-
-
-icalparser_parse_string(str);
-        [ returns icalcomponent * ]
-
-icalcomponent_new(kind);
-        [ returns icalcomponent * ]
-
-icalcomponent_new_clone(component);
-        [ returns icalcomponent * ]
-
-icalcomponent_new_from_string(str);
-        [ returns icalcomponent * ]
-
-icalcomponent_as_ical_string(component);
-        [ returns char * ]
-
-icalcomponent_free(component);
-        [ returns void  ]
-
-icalcomponent_count_errors(component);
-        [ returns int  ]
-
-icalcomponent_strip_errors(component);
-        [ returns void  ]
-
-icalcomponent_convert_errors(component);
-        [ returns void  ]
-
-icalcomponent_get_current_property(component);
-        [ returns icalproperty * ]
-
-icalcomponent_get_first_property(component,kind);
-        [ returns icalproperty * ]
-
-icalcomponent_get_next_property(component,kind);
-        [ returns icalproperty * ]
-
-icalcomponent_get_current_component(component);
-        [ returns icalcomponent * ]
-
-icalcomponent_get_first_component(component,kind);
-        [ returns icalcomponent * ]
-
-icalcomponent_get_next_component(component,kind);
-        [ returns icalcomponent * ]
-
-icalcomponent_add_property(component,property);
-        [ returns void  ]
-
-icalcomponent_remove_property(component,property);
-        [ returns void  ]
-
-icalcomponent_get_parent(component);
-        [ returns icalcomponent * ]
-
-icalcomponent_isa(component);
-        [ returns icalcomponent_kind  ]
-
-icalrestriction_check(comp);
-        [ returns int  ]
-
-icalproperty_string_to_kind(string);
-        [ returns int  ]
-
-icalproperty_new(kind);
-        [ returns icalproperty * ]
-
-icalproperty_new_from_string(str);
-        [ returns icalproperty * ]
-
-icalproperty_as_ical_string(prop);
-        [ returns char * ]
-
-icalproperty_set_parameter_from_string(prop,name,value);
-        [ returns void  ]
-
-icalproperty_set_value_from_string(prop,value,kind);
-        [ returns void  ]
-
-icalproperty_get_value_as_string(prop);
-        [ returns char * ]
-
-icalproperty_get_parameter_as_string(prop,name);
-        [ returns char * ]
-
-icalproperty_get_parent(property);
-        [ returns icalcomponent * ]
-
-$ICAL_BADARG_ERROR = ICAL_BADARG_ERROR
-        [ Constant: int  ]
-
-$ICAL_NEWFAILED_ERROR = ICAL_NEWFAILED_ERROR
-        [ Constant: int  ]
-
-$ICAL_MALFORMEDDATA_ERROR = ICAL_MALFORMEDDATA_ERROR
-        [ Constant: int  ]
-
-$ICAL_PARSE_ERROR = ICAL_PARSE_ERROR
-        [ Constant: int  ]
-
-$ICAL_INTERNAL_ERROR = ICAL_INTERNAL_ERROR
-        [ Constant: int  ]
-        Like assert --internal consist. prob 
-
-$ICAL_FILE_ERROR = ICAL_FILE_ERROR
-        [ Constant: int  ]
-
-$ICAL_ALLOCATION_ERROR = ICAL_ALLOCATION_ERROR
-        [ Constant: int  ]
-
-$ICAL_USAGE_ERROR = ICAL_USAGE_ERROR
-        [ Constant: int  ]
-
-$ICAL_NO_ERROR = ICAL_NO_ERROR
-        [ Constant: int  ]
-        Used for problems in input to icalerror_strerror() 
-
-$ICAL_UNKNOWN_ERROR = ICAL_UNKNOWN_ERROR
-        [ Constant: int  ]
-
-$ICAL_ERROR_FATAL = ICAL_ERROR_FATAL
-        [ Constant: int  ]
-        Not fata 
-
-$ICAL_ERROR_NONFATAL = ICAL_ERROR_NONFATAL
-        [ Constant: int  ]
-        Fatal 
-
-$ICAL_ERROR_DEFAULT = ICAL_ERROR_DEFAULT
-        [ Constant: int  ]
-        Use the value of icalerror_errors_are_fatal Asked state for an unknown
-        error type 
-
-$ICAL_ERROR_UNKNOWN = ICAL_ERROR_UNKNOWN
-        [ Constant: int  ]
-
-icalerror_set_error_state(error,icalerrorstate );
-        [ returns void  ]
-
-icalerror_get_error_state(error);
-        [ returns icalerrorstate  ]
-
-icalenum_property_kind_to_string(kind);
-        [ returns char * ]
-
-icalenum_string_to_property_kind(string);
-        [ returns icalproperty_kind  ]
-
-icalenum_value_kind_to_string(kind);
-        [ returns char * ]
-        icalvalue_kind icalenum_value_kind_by_prop(icalproperty_kind kind);
-        
-
-icalenum_parameter_kind_to_string(kind);
-        [ returns char * ]
-
-icalenum_string_to_parameter_kind(string);
-        [ returns icalparameter_kind  ]
-
-icalenum_component_kind_to_string(kind);
-        [ returns char * ]
-
-icalenum_string_to_component_kind(string);
-        [ returns icalcomponent_kind  ]
-
-icalenum_property_kind_to_value_kind(kind);
-        [ returns icalvalue_kind  ]
-
-icallangbind_new_array(size);
-        [ returns int * ]
-
-icallangbind_free_array(array);
-        [ returns void  ]
-
-icallangbind_access_array(array,index);
-        [ returns int  ]
-
-icalrecur_expand_recurrence(rule,start,count,array);
-        [ returns int  ]
-
-icallangbind_get_first_property(c,prop);
-        [ returns icalproperty * ]
-
-icallangbind_get_next_property(c,prop);
-        [ returns icalproperty * ]
-
-icallangbind_get_first_component(c,comp);
-        [ returns icalcomponent * ]
-
-icallangbind_get_next_component(c,comp);
-        [ returns icalcomponent * ]
-
-icallangbind_property_eval_string(prop,sep);
-        [ returns char * ]
-
-1.  class icaltimetype
-======================
-[ created from struct icaltimetype ]
-
-
-icaltimetype_year_set(struct icaltimetype *,int );
-icaltimetype_year_get(struct icaltimetype *);
-        [ Member data: returns int  ]
-
-icaltimetype_month_set(struct icaltimetype *,int );
-icaltimetype_month_get(struct icaltimetype *);
-        [ Member data: returns int  ]
-
-icaltimetype_day_set(struct icaltimetype *,int );
-icaltimetype_day_get(struct icaltimetype *);
-        [ Member data: returns int  ]
-
-icaltimetype_hour_set(struct icaltimetype *,int );
-icaltimetype_hour_get(struct icaltimetype *);
-        [ Member data: returns int  ]
-
-icaltimetype_minute_set(struct icaltimetype *,int );
-icaltimetype_minute_get(struct icaltimetype *);
-        [ Member data: returns int  ]
-
-icaltimetype_second_set(struct icaltimetype *,int );
-icaltimetype_second_get(struct icaltimetype *);
-        [ Member data: returns int  ]
-
-icaltimetype_is_utc_set(struct icaltimetype *,int );
-icaltimetype_is_utc_get(struct icaltimetype *);
-        [ Member data: returns int  ]
-        1-> time is in UTC timezone 
-
-icaltimetype_is_date_set(struct icaltimetype *,int );
-icaltimetype_is_date_get(struct icaltimetype *);
-        [ Member data: returns int  ]
-        1 -> interpret this as date. 
-
-$icaltimetype_zone = icaltimetype::zone
-        [ Constant: char * ]
-        Ptr to Olsen placename. Libical does not own mem 
-
-----------
-
-icaltime_from_timet(v,is_date);
-        [ returns struct icaltimetype  ]
-
-icaltime_as_timet(struct icaltimetype *);
-        [ returns int  ]
-
-icaltime_as_ical_string(tt);
-        [ returns char * ]
-
-icaltime_from_string(str);
-        [ returns struct icaltimetype  ]
-
-icaltime_utc_offset(tt,tzid);
-        [ returns int  ]
-
-icaltime_as_utc(tt,tzid);
-        [ returns struct icaltimetype  ]
-
-icaltime_as_zone(tt,tzid);
-        [ returns struct icaltimetype  ]
-
-icaltime_null_time();
-        [ returns struct icaltimetype  ]
-
-icaltime_is_null_time(t);
-        [ returns int  ]
-
-icaltime_is_valid_time(t);
-        [ returns int  ]
-
-icaltime_normalize(t);
-        [ returns struct icaltimetype  ]
-
-icaltime_day_of_year(t);
-        [ returns short  ]
-
-icaltime_from_day_of_year(doy,year);
-        [ returns struct icaltimetype  ]
-
-icaltime_day_of_week(t);
-        [ returns short  ]
-
-icaltime_start_doy_of_week(t);
-        [ returns short  ]
-
-icaltime_as_ctime(struct icaltimetype *);
-        [ returns char * ]
-
-icaltime_week_number(t);
-        [ returns short  ]
-
-icaltime_compare(a,b);
-        [ returns int  ]
-
-icaltime_compare_date_only(a,b);
-        [ returns int  ]
-
-icaltime_days_in_month(month,year);
-        [ returns short  ]
-
-2.  class icaldurationtype
-==========================
-[ created from struct icaldurationtype ]
-
-
-icaldurationtype_is_neg_set(struct icaldurationtype *,int );
-icaldurationtype_is_neg_get(struct icaldurationtype *);
-        [ Member data: returns int  ]
-
-icaldurationtype_days_set(struct icaldurationtype *,unsigned int );
-icaldurationtype_days_get(struct icaldurationtype *);
-        [ Member data: returns unsigned int  ]
-
-icaldurationtype_weeks_set(struct icaldurationtype *,unsigned int );
-icaldurationtype_weeks_get(struct icaldurationtype *);
-        [ Member data: returns unsigned int  ]
-
-icaldurationtype_hours_set(struct icaldurationtype *,unsigned int );
-icaldurationtype_hours_get(struct icaldurationtype *);
-        [ Member data: returns unsigned int  ]
-
-icaldurationtype_minutes_set(struct icaldurationtype *,unsigned int );
-icaldurationtype_minutes_get(struct icaldurationtype *);
-        [ Member data: returns unsigned int  ]
-
-icaldurationtype_seconds_set(struct icaldurationtype *,unsigned int );
-icaldurationtype_seconds_get(struct icaldurationtype *);
-        [ Member data: returns unsigned int  ]
-
-----------
-
-icaldurationtype_from_int(t);
-        [ returns struct icaldurationtype  ]
-
-icaldurationtype_from_string(char *);
-        [ returns struct icaldurationtype  ]
-
-icaldurationtype_as_int(duration);
-        [ returns int  ]
-
-icaldurationtype_as_ical_string(d);
-        [ returns char * ]
-
-icaldurationtype_null_duration();
-        [ returns struct icaldurationtype  ]
-
-icaldurationtype_is_null_duration(d);
-        [ returns int  ]
-
-icaltime_add(t,d);
-        [ returns struct icaltimetype  ]
-
-icaltime_subtract(t1,t2);
-        [ returns struct icaldurationtype  ]
-
-3.  class icalperiodtype
-========================
-[ created from struct icalperiodtype ]
-
-
-icalperiodtype_start_set(struct icalperiodtype *,struct icaltimetype *);
-icalperiodtype_start_get(struct icalperiodtype *);
-        [ Member data: returns struct icaltimetype * ]
-
-icalperiodtype_end_set(struct icalperiodtype *,struct icaltimetype *);
-icalperiodtype_end_get(struct icalperiodtype *);
-        [ Member data: returns struct icaltimetype * ]
-
-icalperiodtype_duration_set(struct icalperiodtype *,struct icaldurationtype *);
-icalperiodtype_duration_get(struct icalperiodtype *);
-        [ Member data: returns struct icaldurationtype * ]
-
-----------
-
-icalperiodtype_from_string(str);
-        [ returns struct icalperiodtype  ]
-
-icalperiodtype_as_ical_string(p);
-        [ returns char * ]
-
-icalperiodtype_null_period();
-        [ returns struct icalperiodtype  ]
-
-icalperiodtype_is_null_period(p);
-        [ returns int  ]
-
-icalperiodtype_is_valid_period(p);
-        [ returns int  ]
-
diff --git a/libical/src/Net-ICal-Libical/test-data/2446.mime b/libical/src/Net-ICal-Libical/test-data/2446.mime
deleted file mode 100644
index 919bfc423f..0000000000
--- a/libical/src/Net-ICal-Libical/test-data/2446.mime
+++ /dev/null
@@ -1,3426 +0,0 @@
-From eric@busboom.org  Wed Jan 26 21:46:04 2000
-Content-Type: multipart/mixed; boundary="----------=_948951964-26278-0"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951964-26278-0
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951964-26278-0
-Content-Type: text/calendar; method=PUBLISH; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-METHOD
- :PUBLISH
-PRODID
- :-//ACME/DesktopCalendar//EN
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :mailto:a@example.com
-DTSTART
- :19970701T200000Z
-DTSTAMP
- :19970611T190000Z
-SUMMARY
- :ST. PAUL SAINTS -VS- DULUTH-SUPERIOR DUKES
-UID
- :0981234-1234234-23@example.com
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951964-26278-0--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:04 2000
-Content-Type: multipart/mixed; boundary="----------=_948951964-26278-1"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951964-26278-1
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951964-26278-1
-Content-Type: text/calendar; method=PUBLISH; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-METHOD
- :PUBLISH
-VERSION
- :2.0
-PRODID
- :-//ACME/DesktopCalendar//EN
-BEGIN:VEVENT
-ORGANIZER
- :mailto:a@example.com
-DTSTAMP
- :19970612T190000Z
-DTSTART
- :19970701T210000Z
-DTEND
- :19970701T230000Z
-SEQUENCE
- :1
-UID
- :0981234-1234234-23@example.com
-SUMMARY
- :ST. PAUL SAINTS -VS- DULUTH-SUPERIOR DUKES
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951964-26278-1--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:04 2000
-Content-Type: multipart/mixed; boundary="----------=_948951964-26278-2"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951964-26278-2
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951964-26278-2
-Content-Type: text/calendar; method=CANCEL; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-METHOD
- :CANCEL
-VERSION
- :2.0
-PRODID
- :-//ACME/DesktopCalendar//EN
-BEGIN:VEVENT
-ORGANIZER
- :mailto:a@example.com
-COMMENT
- :DUKES forfeit the game
-SEQUENCE
- :2
-UID
- :0981234-1234234-23@example.com
-DTSTAMP
- :19970613T190000Z
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951964-26278-2--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:04 2000
-Content-Type: multipart/mixed; boundary="----------=_948951964-26278-3"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951964-26278-3
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951964-26278-3
-Content-Type: text/calendar; method=PUBLISH; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :PUBLISH
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PROPERTY_PARSE_ERROR
- :Parse error in property name: 'SCALE'
-VERSION
- :2.0
-BEGIN:VTIMEZONE
-TZID
- :America-Chicago
-TZURL
- :http://zones.stds_r_us.net/tz/America-Chicago
-BEGIN:STANDARD
-DTSTART
- :19671029T020000
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=VALUE_PARSE_ERROR
- :Can't parse as RECUR value in RRULE property. Removing entire property: 
- 'FREQ=YEARLY\;BYDAY=-1SU\;BYMONTH=10'
-TZOFFSETFROM
- :-050000
-TZOFFSETTO
- :-060000
-TZNAME
- :CST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART
- :19870405T020000
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=VALUE_PARSE_ERROR
- :Can't parse as RECUR value in RRULE property. Removing entire property: 
- 'FREQ=YEARLY\;BYDAY=1SU\;BYMONTH=4'
-TZOFFSETFROM
- :-060000
-TZOFFSETTO
- :-050000
-TZNAME
- :CDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-ORGANIZER
- :mailto:a@example.com
-ATTACH
- :http://www.dukes.com/
-CATEGORIES
- :SPORTS EVENT
-CATEGORIES
- :ENTERTAINMENT
-CLASS
- :PRIVATE
-DESCRIPTION
- :MIDWAY STADIUM\nBig time game. MUST see.\nExpected duration:2 hours\n
-DTEND
- ;TZID=America-Chicago
- :19970701T180000
-DTSTART
- ;TZID=America-Chicago
- :19970702T160000
-DTSTAMP
- :19970614T190000Z
-STATUS
- :CONFIRMED
-LOCATION
- ;VALUE=America-Chicago
- :http://www.midwaystadium.com/
-PRIORITY
- :2
-RESOURCES
- :SCOREBOARD
-SEQUENCE
- :3
-SUMMARY
- :ST. PAUL SAINTS -VS- DULUTH-SUPERIOR DUKES
-UID
- :0981234-1234234-23@example.com
-RELATED-TO
- :0981234-1234234-14@example.com
-BEGIN:VALARM
-TRIGGER
- :PT2H
-ACTION
- :DISPLAY
-DESCRIPTION
- :You should be leaving for the game now.
-END:VALARM
-BEGIN:VALARM
-TRIGGER
- :PT30M
-ACTION
- :AUDIO
-END:VALARM
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951964-26278-3--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:04 2000
-Content-Type: multipart/mixed; boundary="----------=_948951964-26278-4"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951964-26278-4
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951964-26278-4
-Content-Type: text/calendar; method=PUBLISH; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :PUBLISH
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :mailto:a@example.com
-DTSTAMP
- :19970614T190000Z
-UID
- :0981234-1234234-23@example.com
-DTSTART
- ;VALUE=DATE
- :19970714
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=VALUE_PARSE_ERROR
- :Can't parse as RECUR value in RRULE property. Removing entire property: 
- 'FREQ=YEARLY\;INTERVAL=1'
-SUMMARY
- : Bastille Day
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951964-26278-4--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:04 2000
-Content-Type: multipart/mixed; boundary="----------=_948951964-26278-5"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951964-26278-5
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951964-26278-5
-Content-Type: text/calendar; method=REQUEST; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :REQUEST
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- ;PARTSTAT=ACCEPTED
- ;CN=BIG A
- :Mailto:A@example.com
-ATTENDEE
- ;RSVP=TRUE
- ;CN=B
- :Mailto:B@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-ATTENDEE
- ;RSVP=TRUE
- ;CN=C
- :Mailto:C@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-ATTENDEE
- ;RSVP=TRUE
- ;CN=Hal
- :Mailto:D@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-ATTENDEE
- ;RSVP=FALSE
- :conf_Big@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=ROOM'
-ATTENDEE
- ;ROLE=NON-PARTICIPANT
- ;RSVP=FALSE
- :Mailto:E@example.com
-DTSTAMP
- :19970611T190000Z
-DTSTART
- :19970701T200000Z
-DTEND
- :19970701T200000Z
-SUMMARY
- :Conference
-UID
- :calsrv.example.com-873970198738777@example.com
-SEQUENCE
- :0
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951964-26278-5--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:04 2000
-Content-Type: multipart/mixed; boundary="----------=_948951964-26278-6"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951964-26278-6
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951964-26278-6
-Content-Type: text/calendar; method=REPLY; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :REPLY
-VERSION
- :2.0
-BEGIN:VEVENT
-ATTENDEE
- ;PARTSTAT=ACCEPTED
- :Mailto:B@example.com
-ORGANIZER
- :MAILTO:A@example.com
-UID
- :calsrv.example.com-873970198738777@example.com
-SEQUENCE
- :0
-REQUEST-STATUS
- :2.0\;Success
-DTSTAMP
- :19970612T190000Z
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951964-26278-6--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:05 2000
-Content-Type: multipart/mixed; boundary="----------=_948951964-26278-7"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951964-26278-7
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951964-26278-7
-Content-Type: text/calendar; method=REQUEST; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :REQUEST
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- ;PARTSTAT=ACCEPTED
- :Mailto:A@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:B@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:C@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-ATTENDEE
- ;RSVP=TRUE
- ;CN=Hal
- :Mailto:D@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-ATTENDEE
- ;ROLE=NON-PARTICIPANT
- ;RSVP=FALSE
- ;CUTYPE=ROOM
- :Mailto:Conf@example.com
-ATTENDEE
- ;ROLE=NON-PARTICIPANT
- ;RSVP=FALSE
- :Mailto:E@example.com
-DTSTART
- :19970701T180000Z
-DTEND
- :19970701T190000Z
-SUMMARY
- :Phone Conference
-UID
- :calsrv.example.com-873970198738777@example.com
-SEQUENCE
- :1
-DTSTAMP
- :19970613T190000Z
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951964-26278-7--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:05 2000
-Content-Type: multipart/mixed; boundary="----------=_948951964-26278-8"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951964-26278-8
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951964-26278-8
-Content-Type: text/calendar; method=REQUEST; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :REQUEST
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- ;PARTSTAT=ACCEPTED
- :Mailto:A@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:B@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:C@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-DTSTART
- :19970701T190000Z
-DTEND
- :19970701T200000Z
-SUMMARY
- :Discuss the Merits of the election results
-LOCATION
- :Green Conference Room
-UID
- :calsrv.example.com-873970198738777a@example.com
-SEQUENCE
- :0
-DTSTAMP
- :19970611T190000Z
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951964-26278-8--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:05 2000
-Content-Type: multipart/mixed; boundary="----------=_948951965-26278-9"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951965-26278-9
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951965-26278-9
-Content-Type: text/calendar; method=COUNTER; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :COUNTER
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- ;PARTSTAT=ACCEPTED
- :Mailto:A@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:B@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:C@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-DTSTART
- :19970701T160000Z
-DTEND
- :19970701T190000Z
-DTSTAMP
- :19970612T190000Z
-SUMMARY
- :Discuss the Merits of the election results
-LOCATION
- :Green Conference Room
-COMMENT
- :This time works much better and I think the big conference room is 
- too big
-UID
- :calsrv.example.com-873970198738777a@example.com
-SEQUENCE
- :0
-DTSTAMP
- :19970611T190000Z
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951965-26278-9--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:05 2000
-Content-Type: multipart/mixed; boundary="----------=_948951965-26278-10"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951965-26278-10
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951965-26278-10
-Content-Type: text/calendar; method=REQUEST; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :REQUEST
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- ;PARTSTAT=ACCEPTED
- :Mailto:A@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:B@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:C@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-DTSTAMP
- :19970613T190000Z
-DTSTART
- :19970701T160000Z
-DTEND
- :19970701T190000Z
-SUMMARY
- :Discuss the Merits of the election results - changed to meet B's schedule
-LOCATION
- :Green Conference Room
-UID
- :calsrv.example.com-873970198738777@example.com
-SEQUENCE
- :1
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951965-26278-10--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:05 2000
-Content-Type: multipart/mixed; boundary="----------=_948951965-26278-11"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951965-26278-11
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951965-26278-11
-Content-Type: text/calendar; method=DECLINECOUNTER; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :DECLINECOUNTER
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:B@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-COMMENT
- :Sorry
-COMMENT
- : I cannot change this meeting time
-UID
- :calsrv.example.com-873970198738777@example.com
-SEQUENCE
- :0
-DTSTAMP
- :19970614T190000Z
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951965-26278-11--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:05 2000
-Content-Type: multipart/mixed; boundary="----------=_948951965-26278-12"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951965-26278-12
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951965-26278-12
-Content-Type: text/calendar; method=REPLY; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :REPLY
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :MAILTO:A@Example.com
-ATTENDEE
- ;PARTSTAT=DELEGATED
- ;DELEGATED-TO="Mailto:E@example.com"
- :Mailto:C@example.com
-UID
- :calsrv.example.com-873970198738777@example.com
-SEQUENCE
- :0
-REQUEST-STATUS
- :2.0\;Success
-DTSTAMP
- :19970611T190000Z
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951965-26278-12--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:05 2000
-Content-Type: multipart/mixed; boundary="----------=_948951965-26278-13"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951965-26278-13
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951965-26278-13
-Content-Type: text/calendar; method=REQUEST; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :REQUEST
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;PARTSTAT=DELEGATED
- ;DELEGATED-TO="Mailto:E@example.com"
- :Mailto:C@example.com
-ATTENDEE
- ;RSVP=TRUE
- ;DELEGATED-FROM="Mailto:C@example.com"
- :Mailto:E@example.com
-DTSTART
- :19970701T180000Z
-DTEND
- :19970701T200000Z
-SUMMARY
- :Phone Conference
-UID
- :calsrv.example.com-873970198738777@example.com
-SEQUENCE
- :0
-STATUS
- :CONFIRMED
-DTSTAMP
- :19970611T190000Z
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951965-26278-13--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:05 2000
-Content-Type: multipart/mixed; boundary="----------=_948951965-26278-14"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951965-26278-14
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951965-26278-14
-Content-Type: text/calendar; method=REPLY; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :REPLY
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :MAILTO:A@Example.com
-ATTENDEE
- ;PARTSTAT=ACCEPTED
- ;DELEGATED-FROM="Mailto:C@example.com"
- :Mailto:E@example.com
-ATTENDEE
- ;PARTSTAT=DELEGATED
- ;DELEGATED-TO="Mailto:E@example.com"
- :Mailto:C@example.com
-UID
- :calsrv.example.com-873970198738777@example.com
-SEQUENCE
- :0
-REQUEST-STATUS
- :2.0\;Success
-DTSTAMP
- :19970614T190000Z
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951965-26278-14--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:05 2000
-Content-Type: multipart/mixed; boundary="----------=_948951965-26278-15"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951965-26278-15
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951965-26278-15
-Content-Type: text/calendar; method=REPLY; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :REPLY
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :MAILTO:A@Example.com
-ATTENDEE
- ;PARTSTAT=DELEGATED
- ;DELEGATED-TO="Mailto:E@example.com"
- :Mailto:C@example.com
-ATTENDEE
- ;PARTSTAT=DECLINED
- ;DELEGATED-FROM="Mailto:C@example.com"
- :Mailto:E@example.com
-COMMENT
- :Sorry
-COMMENT
- : I will be out of town at that time.
-UID
- :calsrv.example.com-873970198738777@example.com
-SEQUENCE
- :0
-REQUEST-STATUS
- :2.0\;Success
-DTSTAMP
- :19970614T190000Z
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951965-26278-15--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:05 2000
-Content-Type: multipart/mixed; boundary="----------=_948951965-26278-16"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951965-26278-16
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951965-26278-16
-Content-Type: text/calendar; method=REQUEST; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :REQUEST
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :MAILTO:A@Example.com
-ATTENDEE
- ;PARTSTAT=DECLINED
- ;DELEGATED-FROM="Mailto:C@example.com"
- :Mailto:E@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:C@example.com
-UID
- :calsrv.example.com-873970198738777@example.com
-SEQUENCE
- :0
-SUMMARY
- :Phone Conference
-DTSTART
- :19970701T180000Z
-DTEND
- :19970701T200000Z
-DTSTAMP
- :19970614T200000Z
-COMMENT
- :DELEGATE (ATTENDEE Mailto:E@example.com) DECLINED YOURINVITATION
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951965-26278-16--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:05 2000
-Content-Type: multipart/mixed; boundary="----------=_948951965-26278-17"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951965-26278-17
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951965-26278-17
-Content-Type: text/calendar; method=CANCEL; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :CANCEL
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- :A@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'Mailto'
-ATTENDEE
- :Mailto:B@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-ATTENDEE
- :Mailto:C@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-ATTENDEE
- :Mailto:D@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-COMMENT
- :Mr. B cannot attend. It's raining. Lets cancel.
-UID
- :calsrv.example.com-873970198738777@example.com
-SEQUENCE
- :1
-STATUS
- :CANCELLED
-DTSTAMP
- :19970613T190000Z
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951965-26278-17--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:05 2000
-Content-Type: multipart/mixed; boundary="----------=_948951965-26278-18"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951965-26278-18
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951965-26278-18
-Content-Type: text/calendar; method=CANCEL; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :CANCEL
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- :mailto:B@example.com
-COMMENT
- :You're off the hook for this meeting
-UID
- :calsrv.example.com-873970198738777@example.com
-DTSTAMP
- :19970613T193000Z
-SEQUENCE
- :1
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951965-26278-18--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:05 2000
-Content-Type: multipart/mixed; boundary="----------=_948951965-26278-19"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951965-26278-19
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951965-26278-19
-Content-Type: text/calendar; method=REQUEST; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :REQUEST
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- ;PARTSTAT=ACCEPTED
- :Mailto:A@example.com
-ATTENDEE
- :Mailto:C@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-ATTENDEE
- :Mailto:D@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-ATTENDEE
- :CR_Big@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=ROOM'
-ATTENDEE
- ;ROLE=NON-PARTICIPANT
- ;RSVP=FALSE
- :Mailto:E@example.com
-DTSTAMP
- :19970611T190000Z
-DTSTART
- :19970701T200000Z
-DTEND
- :19970701T203000Z
-SUMMARY
- :Phone Conference
-UID
- :calsrv.example.com-873970198738777@example.com
-SEQUENCE
- :2
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951965-26278-19--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:05 2000
-Content-Type: multipart/mixed; boundary="----------=_948951965-26278-20"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951965-26278-20
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951965-26278-20
-Content-Type: text/calendar; method=REQUEST; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :REQUEST
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :Mailto:B@example.com
-ATTENDEE
- ;ROLE=CHAIR
- :Mailto:B@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'STATUS=ACCEPTED'
-ATTENDEE
- :Mailto:C@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-ATTENDEE
- :Mailto:D@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-DTSTAMP
- :19970611T190000Z
-DTSTART
- :19970701T200000Z
-DTEND
- :19970701T203000Z
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=VALUE_PARSE_ERROR
- :Can't parse as RECUR value in RRULE property. Removing entire property: 
- 'FREQ=WEEKLY'
-SUMMARY
- :Phone Conference
-UID
- :123456@example.com
-SEQUENCE
- :1
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951965-26278-20--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:05 2000
-Content-Type: multipart/mixed; boundary="----------=_948951965-26278-21"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951965-26278-21
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951965-26278-21
-Content-Type: text/calendar; method=PUBLISH; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-VERSION
- :2.0
-METHOD
- :PUBLISH
-BEGIN:VFREEBUSY
-DTSTAMP
- :19980101T124100Z
-ORGANIZER
- :MAILTO:A@Example.com
-DTSTART
- :19980101T124200Z
-DTEND
- :19980107T124200Z
-FREEBUSY
- :19980101T180000Z/19980101T190000Z
-FREEBUSY
- :19980103T020000Z/19980103T050000Z
-FREEBUSY
- :19980107T020000Z/19980107T050000Z
-FREEBUSY
- :19980113T000000Z/19980113T010000Z
-FREEBUSY
- :19980115T190000Z/19980115T200000Z
-FREEBUSY
- :19980115T220000Z/19980115T230000Z
-FREEBUSY
- :19980116T013000Z/19980116T043000Z
-END:VFREEBUSY
-END:VCALENDAR
-
-------------=_948951965-26278-21--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:05 2000
-Content-Type: multipart/mixed; boundary="----------=_948951965-26278-22"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951965-26278-22
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951965-26278-22
-Content-Type: text/calendar; method=REQUEST; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :REQUEST
-VERSION
- :2.0
-BEGIN:VFREEBUSY
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- :Mailto:A@example.com
-ATTENDEE
- :Mailto:B@example.com
-ATTENDEE
- :Mailto:C@example.com
-DTSTAMP
- :19970613T190000Z
-DTSTART
- :19970701T080000Z
-DTEND
- :19970701T200000
-UID
- :calsrv.example.com-873970198738777@example.com
-END:VFREEBUSY
-END:VCALENDAR
-
-------------=_948951965-26278-22--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:05 2000
-Content-Type: multipart/mixed; boundary="----------=_948951965-26278-23"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951965-26278-23
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951965-26278-23
-Content-Type: text/calendar; method=REPLY; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :REPLY
-VERSION
- :2.0
-BEGIN:VFREEBUSY
-ORGANIZER
- :MAILTO:A@example.com
-ATTENDEE
- :Mailto:B@example.com
-DTSTART
- :19970701T080000Z
-DTEND
- :19970701T200000Z
-UID
- :calsrv.example.com-873970198738777@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=VALUE_PARSE_ERROR
- :Can't parse as PERIOD value in FREEBUSY property. Removing entire 
- property: '19970701T090000Z/PT1H'
-DTSTAMP
- :19970613T190030Z
-END:VFREEBUSY
-END:VCALENDAR
-
-------------=_948951965-26278-23--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:05 2000
-Content-Type: multipart/mixed; boundary="----------=_948951965-26278-24"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951965-26278-24
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951965-26278-24
-Content-Type: text/calendar; method=REQUEST; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :REQUEST
-VERSION
- :2.0
-BEGIN:VTIMEZONE
-TZID
- :America-SanJose
-TZURL
- :http://zones.stds_r_us.net/tz/America-SanJose
-BEGIN:STANDARD
-DTSTART
- :19671029T020000
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=VALUE_PARSE_ERROR
- :Can't parse as RECUR value in RRULE property. Removing entire property: 
- 'FREQ=YEARLY\;BYDAY=-1SU\;BYMONTH=10'
-TZOFFSETFROM
- :-070000
-TZOFFSETTO
- :-080000
-TZNAME
- :PST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART
- :19870405T020000
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=VALUE_PARSE_ERROR
- :Can't parse as RECUR value in RRULE property. Removing entire property: 
- 'FREQ=YEARLY\;BYDAY=1SU\;BYMONTH=4'
-TZOFFSETFROM
- :-080000
-TZOFFSETTO
- :-070000
-TZNAME
- :PDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- ;PARTSTAT=ACCEPTED
- :A@example.COM
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-ATTENDEE
- ;RSVP=TRUE
- :B@example.fr
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-ATTENDEE
- ;RSVP=TRUE
- :c@example.jp
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-DTSTAMP
- :19970613T190030Z
-DTSTART
- ;TZID=America-SanJose
- :19970701T140000
-DTEND
- ;TZID=America-SanJose
- :19970701T150000
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=VALUE_PARSE_ERROR
- :Can't parse as RECUR value in RRULE property. Removing entire property: 
- 'FREQ=WEEKLY\;INTERVAL=20\;WKST=SU\;BYDAY=TU'
-RDATE
- ;TZID=America-SanJose
- :19970910T140000
-EXDATE
- ;TZID=America-SanJose
- :19970909T140000
-EXDATE
- ;TZID=America-SanJose
- :19971028T140000
-SUMMARY
- :Weekly Phone Conference
-UID
- :calsrv.example.com-873970198738777@example.com
-SEQUENCE
- :0
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951965-26278-24--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:05 2000
-Content-Type: multipart/mixed; boundary="----------=_948951965-26278-25"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951965-26278-25
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951965-26278-25
-Content-Type: text/calendar; method=REQUEST; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-METHOD
- :REQUEST
-PRODID
- :-//RDU Software//NONSGML HandCal//EN
-VERSION
- :2.0
-BEGIN:VEVENT
-UID
- :guid-1@host1.com
-SEQUENCE
- :0
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=VALUE_PARSE_ERROR
- :Can't parse as RECUR value in RRULE property. Removing entire property: 
- 'FREQ=MONTHLY\;BYMONTHDAY=1\;UNTIL=19980901T210000Z'
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- ;PARTSTAT=ACCEPTED
- :Mailto:A@example.com
-ATTENDEE
- :Mailto:B@example.com
-ATTENDEE
- :Mailto:C@example.com
-ATTENDEE
- :Mailto:D@example.com
-DESCRIPTION
- :IETF-C&S Conference Call
-CLASS
- :PUBLIC
-SUMMARY
- :IETF Calendaring Working Group Meeting
-DTSTART
- :19970601T210000Z
-DTEND
- :19970601T220000Z
-LOCATION
- :Conference Call
-DTSTAMP
- :19970526T083000Z
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951965-26278-25--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:05 2000
-Content-Type: multipart/mixed; boundary="----------=_948951965-26278-26"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951965-26278-26
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951965-26278-26
-Content-Type: text/calendar; method=REQUEST; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-METHOD
- :REQUEST
-PRODID
- :-//RDU Software//NONSGML HandCal//EN
-VERSION
- :2.0
-BEGIN:VEVENT
-UID
- :guid-1@host1com
-RECURRENCE-ID
- :19970701T210000Z
-SEQUENCE
- :1
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- ;PARTSTAT=ACCEPTED
- :Mailto:A@example.com
-ATTENDEE
- :Mailto:B@example.com
-ATTENDEE
- :Mailto:C@example.com
-ATTENDEE
- :Mailto:D@example.com
-DESCRIPTION
- :IETF-C&S Conference Call
-CLASS
- :PUBLIC
-SUMMARY
- :IETF Calendaring Working Group Meeting
-DTSTART
- :19970703T210000Z
-DTEND
- :19970703T220000Z
-LOCATION
- :Conference Call
-DTSTAMP
- :19970626T093000Z
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951965-26278-26--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:05 2000
-Content-Type: multipart/mixed; boundary="----------=_948951965-26278-27"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951965-26278-27
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951965-26278-27
-Content-Type: text/calendar; method=CANCEL; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-METHOD
- :CANCEL
-PRODID
- :-//RDU Software//NONSGML HandCal//EN
-VERSION
- :2.0
-BEGIN:VEVENT
-UID
- :guid-1@host1.com
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- ;PARTSTAT=ACCEPTED
- :Mailto:A@example.com
-ATTENDEE
- :Mailto:B@example.com
-ATTENDEE
- :Mailto:C@example.com
-ATTENDEE
- :Mailto:D@example.com
-RECURRENCE-ID
- :19970801T210000Z
-SEQUENCE
- :2
-STATUS
- :CANCELLED
-DTSTAMP
- :19970721T093000Z
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951965-26278-27--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:05 2000
-Content-Type: multipart/mixed; boundary="----------=_948951965-26278-28"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951965-26278-28
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951965-26278-28
-Content-Type: text/calendar; method=CANCEL; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-METHOD
- :CANCEL
-PRODID
- :-//RDU Software//NONSGML HandCal//EN
-VERSION
- :2.0
-BEGIN:VEVENT
-UID
- :guid-1@host1.com
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- ;PARTSTAT=ACCEPTED
- :Mailto:A@example.com
-ATTENDEE
- :Mailto:B@example.com
-ATTENDEE
- :Mailto:C@example.com
-ATTENDEE
- :Mailto:D@example.com
-DTSTAMP
- :19970721T103000Z
-STATUS
- :CANCELLED
-SEQUENCE
- :3
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951965-26278-28--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:05 2000
-Content-Type: multipart/mixed; boundary="----------=_948951965-26278-29"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951965-26278-29
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951965-26278-29
-Content-Type: text/calendar; method=REQUEST; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-METHOD
- :REQUEST
-PRODID
- :-//RDU Software//NONSGML HandCal//EN
-VERSION
- :2.0
-BEGIN:VEVENT
-UID
- :guid-1@host1.com
-RECURRENCE-ID
- :19970901T210000Z
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'THISANDFUTURE'
-SEQUENCE
- :3
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- ;PARTSTAT=ACCEPTED
- :Mailto:A@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:B@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:C@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:D@example.com
-DESCRIPTION
- :IETF-C&S Discussion
-CLASS
- :PUBLIC
-SUMMARY
- :IETF Calendaring Working Group Meeting
-DTSTART
- :19970901T210000Z
-DTEND
- :19970901T220000Z
-LOCATION
- :Building 32
-LOCATION
- : Microsoft
-LOCATION
- : Seattle
-LOCATION
- : WA
-DTSTAMP
- :19970526T083000Z
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951965-26278-29--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:06 2000
-Content-Type: multipart/mixed; boundary="----------=_948951965-26278-30"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951965-26278-30
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951965-26278-30
-Content-Type: text/calendar; method=ADD; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-METHOD
- :ADD
-PRODID
- :-//RDU Software//NONSGML HandCal//EN
-VERSION
- :2.0
-BEGIN:VEVENT
-UID
- :123456789@host1.com
-SEQUENCE
- :4
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- ;PARTSTAT=ACCEPTED
- :Mailto:A@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:B@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:C@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:D@example.com
-DESCRIPTION
- :IETF-C&S Conference Call
-CLASS
- :PUBLIC
-SUMMARY
- :IETF Calendaring Working Group Meeting
-DTSTART
- :19970715T210000Z
-DTEND
- :19970715T220000Z
-LOCATION
- :Conference Call
-DTSTAMP
- :19970629T093000Z
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951965-26278-30--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:06 2000
-Content-Type: multipart/mixed; boundary="----------=_948951965-26278-31"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951965-26278-31
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951965-26278-31
-Content-Type: text/calendar; method=REQUEST; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-METHOD
- :REQUEST
-PRODID
- :-//RDU Software//NONSGML HandCal//EN
-VERSION
- :2.0
-BEGIN:VEVENT
-UID
- :123456789@host1.com
-SEQUENCE
- :0
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=VALUE_PARSE_ERROR
- :Can't parse as RECUR value in RRULE property. Removing entire property: 
- 'WKST=SU\;BYDAY=TU\;FREQ=WEEKLY'
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- ;PARTSTAT=ACCEPTED
- :Mailto:A@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:B@example.com
-SUMMARY
- :Review Accounts
-DTSTART
- :19980303T210000Z
-DTEND
- :19980303T220000Z
-LOCATION
- :The White Room
-DTSTAMP
- :19980301T093000Z
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951965-26278-31--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:06 2000
-Content-Type: multipart/mixed; boundary="----------=_948951966-26278-32"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951966-26278-32
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951966-26278-32
-Content-Type: text/calendar; method=ADD; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-METHOD
- :ADD
-PRODID
- :-//RDU Software//NONSGML HandCal//EN
-VERSION
- :2.0
-BEGIN:VEVENT
-UID
- :123456789@host1.com
-SEQUENCE
- :7
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=VALUE_PARSE_ERROR
- :Can't parse as RECUR value in RRULE property. Removing entire property: 
- 'WKST=SU\;BYDAY=TH\;FREQ=WEEKLY'
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- ;PARTSTAT=ACCEPTED
- :Mailto:A@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:B@example.com
-SUMMARY
- :Review Accounts
-DTSTART
- :19980303T210000Z
-DTEND
- :19980303T220000Z
-DTSTAMP
- :19980303T193000Z
-LOCATION
- :The Usual conference room
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951966-26278-32--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:06 2000
-Content-Type: multipart/mixed; boundary="----------=_948951966-26278-33"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951966-26278-33
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951966-26278-33
-Content-Type: text/calendar; method=REQUEST; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-METHOD
- :REQUEST
-PRODID
- :-//RDU Software//NONSGML HandCal//EN
-VERSION
- :2.0
-BEGIN:VEVENT
-UID
- :123456789@host1.com
-SEQUENCE
- :7
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=VALUE_PARSE_ERROR
- :Can't parse as RECUR value in RRULE property. Removing entire property: 
- 'WKST=SU\;BYDAY=TU'
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- ;PARTSTAT=ACCEPTED
- :Mailto:A@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:B@example.com
-SUMMARY
- :Review Accounts
-DTSTART
- :19980303T210000Z
-DTEND
- :19980303T220000Z
-DTSTAMP
- :19980303T193000Z
-LOCATION
- :The White Room
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951966-26278-33--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:06 2000
-Content-Type: multipart/mixed; boundary="----------=_948951966-26278-34"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951966-26278-34
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951966-26278-34
-Content-Type: text/calendar; method=REQUEST; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-METHOD
- :REQUEST
-PRODID
- :-//RDU Software//NONSGML HandCal//EN
-VERSION
- :2.0
-BEGIN:VEVENT
-UID
- :123456789@host1.com
-SEQUENCE
- :0
-RDATE
- :19980304T180000Z
-RDATE
- :19980311T180000Z
-RDATE
- :19980318T180000Z
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- ;PARTSTAT=ACCEPTED
- :Mailto:A@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:B@example.com
-SUMMARY
- :Review Accounts
-DTSTART
- :19980304T180000Z
-DTEND
- :19980304T200000Z
-DTSTAMP
- :19980303T193000Z
-LOCATION
- :Conference Room A
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951966-26278-34--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:06 2000
-Content-Type: multipart/mixed; boundary="----------=_948951966-26278-35"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951966-26278-35
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951966-26278-35
-Content-Type: text/calendar; method=REQUEST; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-METHOD
- :REQUEST
-PRODID
- :-//RDU Software//NONSGML HandCal//EN
-VERSION
- :2.0
-BEGIN:VEVENT
-UID
- :123456789@host1.com
-SEQUENCE
- :1
-RECURRENCE-ID
- :19980311T180000Z
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- ;PARTSTAT=ACCEPTED
- :Mailto:A@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:B@example.com
-SUMMARY
- :Review Accounts
-DTSTART
- :19980311T160000Z
-DTEND
- :19980311T180000Z
-DTSTAMP
- :19980306T193000Z
-LOCATION
- :The Small conference room
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951966-26278-35--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:06 2000
-Content-Type: multipart/mixed; boundary="----------=_948951966-26278-36"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951966-26278-36
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951966-26278-36
-Content-Type: text/calendar; method=ADD; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-METHOD
- :ADD
-PRODID
- :-//RDU Software//NONSGML HandCal//EN
-VERSION
- :2.0
-BEGIN:VEVENT
-UID
- :123456789@host1.com
-SEQUENCE
- :2
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- ;PARTSTAT=ACCEPTED
- :Mailto:A@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:B@example.com
-SUMMARY
- :Review Accounts
-DTSTART
- :19980315T180000Z
-DTEND
- :19980315T200000Z
-DTSTAMP
- :19980307T193000Z
-LOCATION
- :Conference Room A
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951966-26278-36--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:06 2000
-Content-Type: multipart/mixed; boundary="----------=_948951966-26278-37"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951966-26278-37
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951966-26278-37
-Content-Type: text/calendar; method=REQUEST; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-METHOD
- :REQUEST
-PRODID
- :-//RDU Software//NONSGML HandCal//EN
-VERSION
- :2.0
-BEGIN:VEVENT
-UID
- :123456789@host1.com
-SEQUENCE
- :2
-RDATE
- :19980304T180000Z
-RDATE
- :19980311T160000Z
-RDATE
- :19980315T180000Z
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=COMPONENT_PARSE_ERROR
- :Got a data line\, but could not find a property name or component 
- begin tag: 'Error! Bookmark not defined.'
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- ;PARTSTAT=ACCEPTED
- :Mailto:A@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:B@example.com
-SUMMARY
- :Review Accounts
-DTSTART
- :19980304T180000Z
-DTEND
- :19980304T200000Z
-DTSTAMP
- :19980303T193000Z
-LOCATION
- :Conference Room A
-STATUS
- :CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=COMPONENT_PARSE_ERROR
- :Got a data line\, but could not find a property name or component 
- begin tag: 'Error! Bookmark not defined.'
-SEQUENCE
- :2
-RECURRENCE-ID
- :19980311T160000Z
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=COMPONENT_PARSE_ERROR
- :Got a data line\, but could not find a property name or component 
- begin tag: 'Error! Bookmark not defined.'
-ATTENDEE
- :ROLE=CHAIR;Error! Bookmark not defined.
-ATTENDEE
- :Error! Bookmark not defined.
-SUMMARY
- :Review Accounts
-DTSTART
- :19980311T160000Z
-DTEND
- :19980304T180000Z
-DTSTAMP
- :19980306T193000Z
-LOCATION
- :The Small conference room
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951966-26278-37--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:06 2000
-Content-Type: multipart/mixed; boundary="----------=_948951966-26278-38"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951966-26278-38
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951966-26278-38
-Content-Type: text/calendar; method=COUNTER; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-METHOD
- :COUNTER
-PRODID
- :-//RDU Software//NONSGML HandCal//EN
-VERSION
- :2.0
-BEGIN:VEVENT
-UID
- :guid-1@host1.com
-RECURRENCE-ID
- :19970715T210000Z
-SEQUENCE
- :4
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- ;RSVP=TRUE
- :Mailto:A@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:B@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:C@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:D@example.com
-DESCRIPTION
- :IETF-C&S Conference Call
-CLASS
- :PUBLIC
-SUMMARY
- :IETF Calendaring Working Group Meeting
-DTSTART
- :19970715T220000Z
-DTEND
- :19970715T230000Z
-LOCATION
- :Conference Call
-COMMENT
- :May we bump this by an hour? I have a conflict
-DTSTAMP
- :19970629T094000Z
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951966-26278-38--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:06 2000
-Content-Type: multipart/mixed; boundary="----------=_948951966-26278-39"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951966-26278-39
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951966-26278-39
-Content-Type: text/calendar; method=REQUEST; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-METHOD
- :REQUEST
-PRODID
- :-//RDU Software//NONSGML HandCal//EN
-VERSION
- :2.0
-BEGIN:VEVENT
-UID
- :guid-1@host1.com
-SEQUENCE
- :0
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=VALUE_PARSE_ERROR
- :Can't parse as RECUR value in RRULE property. Removing entire property: 
- 'FREQ=MONTHLY\;BYMONTHDAY=1'
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- :Mailto:A@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:B@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:C@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:D@example.com
-DESCRIPTION
- :IETF-C&S Conference Call
-CLASS
- :PUBLIC
-SUMMARY
- :IETF Calendaring Working Group Meeting
-DTSTART
- :19970601T210000Z
-DTEND
- :19970601T220000Z
-DTSTAMP
- :19970602T094000Z
-LOCATION
- :Conference Call
-STATUS
- :CONFIRMED
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PROPERTY_PARSE_ERROR
- :Parse error in property name: 'FOO'
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951966-26278-39--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:06 2000
-Content-Type: multipart/mixed; boundary="----------=_948951966-26278-40"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951966-26278-40
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951966-26278-40
-Content-Type: text/calendar; method=REPLY; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//RDU Software//NONSGML HandCal//EN
-METHOD
- :REPLY
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- :Mailto:B@example.com
-REQUEST-STATUS
- :2.8\;Repeating event ignored. Scheduled as a single event\;RRULE
-REQUEST-STATUS
- :3.0\;Invalid Property Name\;FOO
-UID
- :guid-1@host1.com
-SEQUENCE
- :0
-DTSTAMP
- :19970603T094000Z
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951966-26278-40--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:06 2000
-Content-Type: multipart/mixed; boundary="----------=_948951966-26278-41"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951966-26278-41
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951966-26278-41
-Content-Type: text/calendar; method=REQUEST; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :REQUEST
-VERSION
- :2.0
-BEGIN:VTODO
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- :Mailto:A@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:B@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:C@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:D@example.com
-DTSTART
- :19970701T170000Z
-DUE
- :19970722T170000Z
-PRIORITY
- :1
-SUMMARY
- :Create the requirements document
-UID
- :calsrv.example.com-873970198738777-00@example.com
-SEQUENCE
- :0
-DTSTAMP
- :19970717T200000Z
-STATUS
- :Needs Action
-END:VTODO
-END:VCALENDAR
-
-------------=_948951966-26278-41--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:06 2000
-Content-Type: multipart/mixed; boundary="----------=_948951966-26278-42"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951966-26278-42
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951966-26278-42
-Content-Type: text/calendar; method=REPLY; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :REPLY
-VERSION
- :2.0
-BEGIN:VTODO
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;PARTSTAT=ACCEPTED
- :Mailto:B@example.com
-UID
- :calsrv.example.com-873970198738777-00@example.com
-COMMENT
- :I'll send you my input by e-mail
-SEQUENCE
- :0
-DTSTAMP
- :19970717T203000Z
-REQUEST-STATUS
- :2.0\;Success
-END:VTODO
-END:VCALENDAR
-
-------------=_948951966-26278-42--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:06 2000
-Content-Type: multipart/mixed; boundary="----------=_948951966-26278-43"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951966-26278-43
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951966-26278-43
-Content-Type: text/calendar; method=REQUEST; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :REQUEST
-VERSION
- :2.0
-BEGIN:VTODO
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- :Mailto:A@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:B@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:D@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-UID
- :calsrv.example.com-873970198738777-00@example.com
-SUMMARY
- :Create the requirements document
-PRIORITY
- :1
-SEQUENCE
- :0
-STATUS
- :IN-PROCESS
-DTSTART
- :19970701T170000Z
-DTSTAMP
- :19970717T230000Z
-END:VTODO
-END:VCALENDAR
-
-------------=_948951966-26278-43--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:06 2000
-Content-Type: multipart/mixed; boundary="----------=_948951966-26278-44"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951966-26278-44
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951966-26278-44
-Content-Type: text/calendar; method=REPLY; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :REPLY
-VERSION
- :2.0
-BEGIN:VTODO
-ORGANIZER
- :MAILTO:A@example.com
-ATTENDEE
- ;PARTSTAT=IN-PROCESS
- :Mailto:B@example.com
-PERCENT-COMPLETE
- :75
-UID
- :calsrv.example.com-873970198738777-00@example.com
-DTSTAMP
- :19970717T233000Z
-SEQUENCE
- :0
-END:VTODO
-END:VCALENDAR
-
-------------=_948951966-26278-44--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:06 2000
-Content-Type: multipart/mixed; boundary="----------=_948951966-26278-45"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951966-26278-45
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951966-26278-45
-Content-Type: text/calendar; method=REPLY; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :REPLY
-VERSION
- :2.0
-BEGIN:VTODO
-ORGANIZER
- :MAILTO:A@example.com
-ATTENDEE
- ;PARTSTAT=COMPLETED
- :Mailto:D@example.com
-UID
- :calsrv.example.com-873970198738777-00@example.com
-DTSTAMP
- :19970717T233000Z
-SEQUENCE
- :0
-END:VTODO
-END:VCALENDAR
-
-------------=_948951966-26278-45--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:06 2000
-Content-Type: multipart/mixed; boundary="----------=_948951966-26278-46"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951966-26278-46
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951966-26278-46
-Content-Type: text/calendar; method=REQUEST; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :REQUEST
-VERSION
- :2.0
-BEGIN:VTODO
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- ;PARTSTAT=ACCEPTED
- :Mailto:A@example.com
-ATTENDEE
- ;PARTSTAT=ACCEPTED
- :Mailto:B@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-ATTENDEE
- ;PARTSTAT=IN-PROCESS
- :Mailto:D@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-DTSTART
- :19970701T170000Z
-DUE
- :19970722T170000Z
-PRIORITY
- :1
-SUMMARY
- :Create the requirements document
-UID
- :calsrv.example.com-873970198738777-00@example.com
-SEQUENCE
- :1
-DTSTAMP
- :19970718T100000Z
-STATUS
- :IN-PROGRESS
-PERCENT-COMPLETE
- :40
-END:VTODO
-END:VCALENDAR
-
-------------=_948951966-26278-46--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:06 2000
-Content-Type: multipart/mixed; boundary="----------=_948951966-26278-47"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951966-26278-47
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951966-26278-47
-Content-Type: text/calendar; method=REQUEST; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :REQUEST
-VERSION
- :2.0
-BEGIN:VTODO
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- :Mailto:A@example.com
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:B@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-ATTENDEE
- ;RSVP=TRUE
- :Mailto:D@example.com
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=PARAMETER_PARSE_ERROR
- :Can't parse parameter name: 'TYPE=INDIVIDUAL'
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=VALUE_PARSE_ERROR
- :Can't parse as RECUR value in RRULE property. Removing entire property: 
- 'FREQ=MONTHLY\;COUNT=10\;BYDAY=1FR'
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=VALUE_PARSE_ERROR
- :Can't parse as DATE-TIME value in DTSTART property. Removing entire 
- property: '19980101T100000-0700'
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=VALUE_PARSE_ERROR
- :Can't parse as DATE-TIME value in DUE property. Removing entire property: 
- '19980103T100000-0700'
-SUMMARY
- :Send Status Reports to Area Managers
-UID
- :calsrv.example.com-873970198738777-00@example.com
-SEQUENCE
- :0
-DTSTAMP
- :19970717T200000Z
-STATUS
- :NEEDS ACTION
-PRIORITY
- :1
-END:VTODO
-END:VCALENDAR
-
-------------=_948951966-26278-47--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:06 2000
-Content-Type: multipart/mixed; boundary="----------=_948951966-26278-48"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951966-26278-48
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951966-26278-48
-Content-Type: text/calendar; method=REPLY; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//ACME/DesktopCalendar//EN
-METHOD
- :REPLY
-VERSION
- :2.0
-BEGIN:VTODO
-ATTENDEE
- ;PARTSTAT=IN-PROCESS
- :Mailto:B@example.com
-PERCENT-COMPLETE
- :75
-UID
- :calsrv.example.com-873970198738777-00@example.com
-DTSTAMP
- :19970717T233000Z
-RECURRENCE-ID
- :19980101T170000Z
-SEQUENCE
- :1
-END:VTODO
-END:VCALENDAR
-
-------------=_948951966-26278-48--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:06 2000
-Content-Type: multipart/mixed; boundary="----------=_948951966-26278-49"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951966-26278-49
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951966-26278-49
-Content-Type: text/calendar; method=PUBLISH; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-METHOD
- :PUBLISH
-PRODID
- :-//ACME/DesktopCalendar//EN
-VERSION
- :2.0
-BEGIN:VJOURNAL
-DTSTART
- :19971002T200000Z
-ORGANIZER
- :MAILTO:A@Example.com
-SUMMARY
- :Phone conference minutes
-DESCRIPTION
- :The editors meeting was held on October 1
-DESCRIPTION
- : 1997. Details are in the attached document.
-UID
- :0981234-1234234-2410@example.com
-RELATED-TO
- :0981234-1234234-2402-35@example.com
-ATTACH
- :ftp://ftp.example.com/pub/ed/minutes100197.txt
-END:VJOURNAL
-END:VCALENDAR
-
-------------=_948951966-26278-49--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:06 2000
-Content-Type: multipart/mixed; boundary="----------=_948951966-26278-50"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951966-26278-50
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951966-26278-50
-Content-Type: text/calendar; method=REFRESH; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//RDU Software//NONSGML HandCal//EN
-METHOD
- :REFRESH
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- ;PARTSTAT=ACCEPTED
- :Mailto:A@example.com
-ATTENDEE
- :Mailto:B@example.com
-ATTENDEE
- :Mailto:C@example.com
-ATTENDEE
- :Mailto:D@example.com
-UID
- : guid-1-12345@host1.com
-DTSTAMP
- :19970603T094000
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951966-26278-50--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:06 2000
-Content-Type: multipart/mixed; boundary="----------=_948951966-26278-51"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951966-26278-51
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951966-26278-51
-Content-Type: text/calendar; method=REQUEST; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-METHOD
- :REQUEST
-PRODID
- :-//RDU Software//NONSGML HandCal//EN
-VERSION
- :2.0
-BEGIN:VEVENT
-UID
- :acme-12345@host1.com
-SEQUENCE
- :3
-X-LIC-ERROR
- ;X-LIC-ERRORTYPE=VALUE_PARSE_ERROR
- :Can't parse as RECUR value in RRULE property. Removing entire property: 
- 'FREQ=WEEKLY'
-RDATE
- ;VALUE=PERIOD
- :19970819T210000Z/19970081T220000Z
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- ;ROLE=CHAIR
- ;PARTSTAT=ACCEPTED
- :Mailto:A@example.com
-ATTENDEE
- :Mailto:B@example.com
-DESCRIPTION
- :IETF-C&S Conference Call
-SUMMARY
- :IETF Calendaring Working Group Meeting
-DTSTART
- :19970801T210000Z
-DTEND
- :19970801T220000Z
-RECURRENCE-ID
- :19970809T210000Z
-DTSTAMP
- :19970726T083000
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951966-26278-51--
-
-
-From eric@busboom.org  Wed Jan 26 21:46:06 2000
-Content-Type: multipart/mixed; boundary="----------=_948951966-26278-52"
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-From: eric@busboom.org
-To: alice
-Subject: Hello, nurse!
-
-This is a multi-part message in MIME format...
-
-------------=_948951966-26278-52
-Content-Type: text/plain
-Content-Disposition: inline
-
-Hey! Come to the meeting!
-------------=_948951966-26278-52
-Content-Type: text/calendar; method=REFRESH; charset=US-ASCII
-Content-Disposition: inline
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0
-X-Mailer: MIME-tools 4.104 (Entity 4.117)
-
-BEGIN:VCALENDAR
-PRODID
- :-//RDU Software//NONSGML HandCal//EN
-METHOD
- :REFRESH
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :Mailto:A@example.com
-ATTENDEE
- :Mailto:B@example.com
-UID
- :acme-12345@host1.com
-DTSTAMP
- :19970603T094000
-END:VEVENT
-END:VCALENDAR
-
-------------=_948951966-26278-52--
-
-
diff --git a/libical/src/Net-ICal-Libical/test-data/error b/libical/src/Net-ICal-Libical/test-data/error
deleted file mode 100644
index aa0efce1b4..0000000000
--- a/libical/src/Net-ICal-Libical/test-data/error
+++ /dev/null
@@ -1,58 +0,0 @@
-From foo6@example.com  Sun Jan 16 17:34:23 2000
-From: foo6@example.com
-MIME-Version: 1.0
-To: alice@agony
-Subject: REQUEST - Phone Conference
-Content-Type:multipart/related;boundary="--FEE3790DC7E35189CA67CE2C"
-
-----FEE3790DC7E35189CA67CE2C
-Content-Type: multipart/alternative;boundary="--00FEE3790DC7E35189CA67CE2C00"
-
-----00FEE3790DC7E35189CA67CE2C00
-Content-Type: text/plain; charset=us-ascii
-Content-Transfer-Encoding: 7bit
-
-When: 7/1/1997 10:00PM PDT- 7/1/97 10:30 PM PDT
-Where:
-Organizer: foo1@example.com
-Summary: Let's discuss the attached document
-
-----00FEE3790DC7E35189CA67CE2C00
-Content-Type:text/calendar; method=REQUEST; charset=US-ASCII;Component=vevent
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment; filename="event.vcs"
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:foo1@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:foo1@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:mailto:foo2@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:mailto:foo3@example.com
-DTSTAMP:19970611T190000Z
-DTSTART:19970621T170000Z
-DTEND:199706211T173000Z
-SUMMARY:Let's discuss the attached document
-UID:calsvr.example.com-873970198738777-8aa
-ATTACH:cid:calsvr.example.com-12345aaa
-SEQUENCE:0
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-----00FEE3790DC7E35189CA67CE2C00--
-
-----FEE3790DC7E35189CA67CE2C
-Content-Type: application/msword; name="FieldReport.doc"
-Content-Transfer-Encoding: base64
-Content-Disposition: inline; filename="FieldReport.doc"
-Content-ID: <calsvr.example.com-12345aaa>
-
-
-R0lGODdhTAQZAJEAAFVVVd3d3e4AAP///ywAAAAATAQZAAAC/5yPOSLhD6OctNqLs94XqAG
-4kiW5omm6sq27gvH8kzX9o1y+s73/g8MCofEovGITCoxKMbyCR16cNSq9YrNarfcrvdriIH
-5LL5jE6rxc3G+v2cguf0uv2Oz+v38L7/DxgoOKjURnjIIbe3yNjo+AgZWYVIWWl5iZnJY6J.
-
-----FEE3790DC7E35189CA67CE2C--
diff --git a/libical/src/Net-ICal-Libical/test-data/mail-examples b/libical/src/Net-ICal-Libical/test-data/mail-examples
deleted file mode 100644
index 5fb7c55c82..0000000000
--- a/libical/src/Net-ICal-Libical/test-data/mail-examples
+++ /dev/null
@@ -1,262 +0,0 @@
-From foo1@example.com  Sun Jan 16 17:34:23 2000
-From: foo1@example.com
-To: alice@agony
-Subject: Phone Conference
-Mime-Version: 1.0
-Content-Type:text/calendar; method=REQUEST; charset=US-ASCII
-Content-Transfer-Encoding: 7bit
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:mailto:sman@netscape.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:mailto:sman@netscape.com
-ATTENDEE;RSVP=TRUE:mailto:stevesil@microsoft.com
-DTSTAMP:19970611T190000Z
-DTSTART:19970701T210000Z
-DTEND:19970701T230000Z
-SUMMARY:Phone Conference
-DESCRIPTION:Please review the attached document.
-UID:calsvr.example.com-873970198738777
-ATTACH:ftp://ftp.bar.com/pub/docs/foo.doc
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR                              
-
-From foo2@example.com  Sun Jan 16 17:34:23 2000
-From: foo2@example.com
-To: alice@agony
-Subject: Phone Conference
-Mime-Version: 1.0
-Content-Type: multipart/alternative;boundary="01BD3665.3AF0D360"
-
---01BD3665.3AF0D360
-Content-Type: text/plain;charset=us-ascii     
-Content-Transfer-Encoding: 7bit
-
-This is an alternative representation of a TEXT/CALENDAR MIME Object
-When: 7/1/1997 10:00AM PDT - 7/1/97 10:30AM PDT
-Where:
-Organizer: foo1@example.com
-Summary: Phone Conference
-
---01BD3665.3AF0D360
-Content-Type:text/calendar; method=REQUEST; charset=US-ASCII
-Content-Transfer-Encoding: 7bit
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:mailto:foo1@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:mailto:foo1@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:mailto:foo2@example.com
-DTSTAMP:19970611T190000Z
-DTSTART:19970701T170000Z
-DTEND:19970701T173000Z
-SUMMARY:Phone Conference
-UID:calsvr.example.com-8739701987387771
-SEQUENCE:0
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
---01BD3665.3AF0D360--
-
-From foo3@example.com  Sun Jan 16 17:34:23 2000
-From: foo3@example.com
-To: alice@agony
-Subject: Phone Conference
-Mime-Version: 1.0
-Content-Type: multipart/related; boundary="boundary-example-1";type=text/calendar
-
---boundary-example-1
-Content-Type:text/calendar; method=REQUEST; charset=US-ASCII
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment; filename="event.vcs"
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:mailto:foo1@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:mailto:foo1@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:mailto:foo2@example.com
-DTSTAMP:19970611T190000Z
-DTSTART:19970701T180000Z
-DTEND:19970701T183000Z
-SUMMARY:Phone Conference
-UID:calsvr.example.com-8739701987387771
-ATTACH:cid:123456789@example.com
-SEQUENCE:0
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
---boundary-example-1
-Content-Type: application/msword; name="FieldReport.doc"
-Content-Transfer-Encoding: base64
-Content-Disposition: inline; filename="FieldReport.doc"
-Content-ID: <123456789@example.com>
-
-0M8R4KGxGuEAAAAAAAAAAAAAAAAAAAAAPgADAP7/CQAGAAAAAAAAAAABAAAARAAAAAAA
-AAAAEAAAQAAAAAEAAAD+////AAAAAEUAAAD/////////////////////////////////
-
---boundary-example-1--
-
-From foo4@example.com  Sun Jan 16 17:34:23 2000
-From: foo4@example.com
-To: alice@agony
-Subject: Summer Company Holidays
-Mime-Version: 1.0
-Content-Type:text/calendar; method=PUBLISH; charset=US-ASCII
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment; filename="event.vcs"
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DESKTOPCALENDAR//EN
-METHOD:PUBLISH
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:MAILTO:FOO1@EXAMPLE.COM
-DTSTAMP:19970611T150000Z
-DTSTART:19970701T150000Z
-DTEND:19970701T230000Z
-SUMMARY:Company Picnic
-DESCRIPTION:Food and drink will be provided
-UID:CALSVR.EXAMPLE.COM-873970198738777-1
-SEQUENCE:0
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-ORGANIZER:MAILTO:FOO1@EXAMPLE.COM
-DTSTAMP:19970611T190000Z
-DTSTART:19970715T150000Z
-DTEND:19970715T230000Z
-SUMMARY:Company Bowling Tournament
-DESCRIPTION:We have 10 lanes reserved
-UID:CALSVR.EXAMPLE.COM-873970198738777-2
-SEQUENCE:0
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-From foo5@example.com  Sun Jan 16 17:34:23 2000
-From: foo5@example.com
-To: alice@agony
-Subject: Phone Conference
-Mime-Version: 1.0
-Content-Type:multipart/mixed;boundary="--FEE3790DC7E35189CA67CE2C"
-
-This is a multi-part message in MIME format.
-
-----FEE3790DC7E35189CA67CE2C
-Content-Type:text/calendar; method=REQUEST; charset=US-ASCII
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment; filename="event1.vcs"
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:mailto:foo1@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:mailto:foo1@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:mailto:foo2@example.com
-DTSTAMP:19970611T190000Z
-DTSTART:19970701T210000Z
-DTEND:19970701T230000Z
-SUMMARY:Phone Conference
-DESCRIPTION:Discuss what happened at the last meeting
-UID:calsvr.example.com-8739701987387772
-SEQUENCE:0
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-----FEE3790DC7E35189CA67CE2C
-Content-Type:text/calendar; method=REQUEST; charset=US-ASCII
-Content-Transfer-Encoding:7bit
-Content-Disposition: attachment; filename="todo1.vcs"
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VTODO
-DUE:19970701T090000
-ORGANIZER:mailto:foo1@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:mailto:foo1@example.com
-ATTENDEE;RSVP=TRUE:mailto:foo2@example.com
-SUMMARY:Phone Conference
-DESCRIPTION:Discuss a new location for the company picnic
-UID:calsvr.example.com-td-8739701987387773
-SEQUENCE:0
-STATUS:NEEDS ACTION
-END:VEVENT
-END:VCALENDAR
-
-----FEE3790DC7E35189CA67CE2C--
-
-From foo6@example.com  Sun Jan 16 17:34:23 2000
-From: foo6@example.com
-MIME-Version: 1.0
-To: alice@agony
-Subject: REQUEST - Phone Conference
-Content-Type:multipart/related;boundary="--FEE3790DC7E35189CA67CE2C"
-
-----FEE3790DC7E35189CA67CE2C
-Content-Type: multipart/alternative;boundary="--00FEE3790DC7E35189CA67CE2C00"
-
-----00FEE3790DC7E35189CA67CE2C00
-Content-Type: text/plain; charset=us-ascii
-Content-Transfer-Encoding: 7bit
-
-When: 7/1/1997 10:00PM PDT- 7/1/97 10:30 PM PDT
-Where:
-Organizer: foo1@example.com
-Summary: Let's discuss the attached document
-
-----00FEE3790DC7E35189CA67CE2C00
-Content-Type:text/calendar; method=REQUEST; charset=US-ASCII;Component=vevent
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment; filename="event.vcs"
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:foo1@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:foo1@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:mailto:foo2@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:mailto:foo3@example.com
-DTSTAMP:19970611T190000Z
-DTSTART:19970621T170000Z
-DTEND:199706211T173000Z
-SUMMARY:Let's discuss the attached document
-UID:calsvr.example.com-873970198738777-8aa
-ATTACH:cid:calsvr.example.com-12345aaa
-SEQUENCE:0
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-----00FEE3790DC7E35189CA67CE2C00--
-
-----FEE3790DC7E35189CA67CE2C
-Content-Type: application/msword; name="FieldReport.doc"
-Content-Transfer-Encoding: base64
-Content-Disposition: inline; filename="FieldReport.doc"
-Content-ID: <calsvr.example.com-12345aaa>
-
-
-R0lGODdhTAQZAJEAAFVVVd3d3e4AAP///ywAAAAATAQZAAAC/5yPOSLhD6OctNqLs94XqAG
-4kiW5omm6sq27gvH8kzX9o1y+s73/g8MCofEovGITCoxKMbyCR16cNSq9YrNarfcrvdriIH
-5LL5jE6rxc3G+v2cguf0uv2Oz+v38L7/DxgoOKjURnjIIbe3yNjo+AgZWYVIWWl5iZnJY6J.
-
-----FEE3790DC7E35189CA67CE2C--
\ No newline at end of file
diff --git a/libical/src/Net-ICal-Libical/test-data/no-error b/libical/src/Net-ICal-Libical/test-data/no-error
deleted file mode 100644
index f5b5ce995d..0000000000
--- a/libical/src/Net-ICal-Libical/test-data/no-error
+++ /dev/null
@@ -1,26 +0,0 @@
-From foo1@example.com  Sun Jan 16 17:34:23 2000
-From: foo1@example.com
-To: alice@agony
-Subject: Phone Conference
-Mime-Version: 1.0
-Content-Type:text/calendar; method=REQUEST; charset=US-ASCII
-Content-Transfer-Encoding: 7bit
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:mailto:sman@netscape.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:mailto:sman@netscape.com
-ATTENDEE;RSVP=TRUE:mailto:stevesil@microsoft.com
-DTSTAMP:19970611T190000Z
-DTSTART:19970701T210000Z
-DTEND:19970701T230000Z
-SUMMARY:Phone Conference
-DESCRIPTION:Please review the attached document.
-UID:calsvr.example.com-873970198738777
-ATTACH:ftp://ftp.bar.com/pub/docs/foo.doc
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR                              
diff --git a/libical/src/Net-ICal-Libical/test-data/rfc2445.ics b/libical/src/Net-ICal-Libical/test-data/rfc2445.ics
deleted file mode 100644
index f225f26331..0000000000
--- a/libical/src/Net-ICal-Libical/test-data/rfc2445.ics
+++ /dev/null
@@ -1,321 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//hacksw/handcal//NONSGML v1.0//EN
-BEGIN:VEVENT
-DTSTART:19970714T170000Z
-DTEND:19970715T035959Z
-SUMMARY:Bastille Day Party
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VEVENT
-UID:19970901T130000Z-123401@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19970903T163000Z
-DTEND:19970903T190000Z
-SUMMARY:Annual Employee Review
-CLASS:PRIVATE
-CATEGORIES:BUSINESS,HUMAN RESOURCES
-END:VEVENT
-
-BEGIN:VEVENT
-UID:19970901T130000Z-123402@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19970401T163000Z
-DTEND:19970402T010000Z
-SUMMARY:Laurel is in sensitivity awareness class.
-CLASS:PUBLIC
-CATEGORIES:BUSINESS,HUMAN RESOURCES
-TRANSP:TRANSPARENT
-END:VEVENT
-
-BEGIN:VEVENT
-UID:19970901T130000Z-123403@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19971102
-SUMMARY:Our Blissful Anniversary
-CLASS:CONFIDENTIAL
-CATEGORIES:ANNIVERSARY,PERSONAL,SPECIAL OCCASION
-RRULE:FREQ=YEARLY
-END:VEVENT
-
-BEGIN:VTODO
-UID:19970901T130000Z-123404@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19970415T133000Z
-DUE:19970416T045959Z
-SUMMARY:1996 Income Tax Preparation
-CLASS:CONFIDENTIAL
-CATEGORIES:FAMILY,FINANCE
-PRIORITY:1
-STATUS:NEEDS-ACTION
-END:VTODO
-BEGIN:VJOURNAL
-UID:19970901T130000Z-123405@host.com
-DTSTAMP:19970901T1300Z
-DTSTART;VALUE=DATE:19970317
-SUMMARY:Staff meeting minutes
-DESCRIPTION:1. Staff meeting: Participants include Joe\, Lisa
-  and Bob. Aurora project plans were reviewed. There is currently
-  no budget reserves for this project. Lisa will escalate to
-  management. Next meeting on Tuesday.\n
-  2. Telephone Conference: ABC Corp. sales representative called
-  to discuss new printer. Promised to get us a demo by Friday.\n
-  3. Henry Miller (Handsoff Insurance): Car was totaled by tree.
-  Is looking into a loaner car. 654-2323 (tel).
-END:VJOURNAL
-BEGIN:VFREEBUSY
-ORGANIZER:MAILTO:jane_doe@host1.com
-ATTENDEE:MAILTO:john_public@host2.com
-DTSTART:19971015T050000Z
-DTEND:19971016T050000Z
-DTSTAMP:19970901T083000Z
-END:VFREEBUSY
-BEGIN:VFREEBUSY
-ORGANIZER:MAILTO:jane_doe@host1.com
-ATTENDEE:MAILTO:john_public@host2.com
-DTSTAMP:19970901T100000Z
-FREEBUSY;VALUE=PERIOD:19971015T050000Z/PT8H30M,
- 19971015T160000Z/PT5H30M,19971015T223000Z/PT6H30M
-URL:http://host2.com/pub/busy/jpublic-01.ifb
-COMMENT:This iCalendar file contains busy time information for
-  the next three months.
-END:VFREEBUSY
-BEGIN:VFREEBUSY
-ORGANIZER:jsmith@host.com
-DTSTART:19980313T141711Z
-DTEND:19980410T141711Z
-FREEBUSY:19980314T233000Z/19980315T003000Z
-FREEBUSY:19980316T153000Z/19980316T163000Z
-FREEBUSY:19980318T030000Z/19980318T040000Z
-URL:http://www.host.com/calendar/busytime/jsmith.ifb
-END:VFREEBUSY
-BEGIN:VTIMEZONE
-TZID:US-Eastern
-LAST-MODIFIED:19870101T000000Z
-BEGIN:STANDARD
-DTSTART:19971026T020000
-RDATE:19971026T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19971026T020000
-RDATE:19970406T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VTIMEZONE
-TZID:US-Eastern
-LAST-MODIFIED:19870101T000000Z
-TZURL:http://zones.stds_r_us.net/tz/US-Eastern
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VTIMEZONE
-TZID:US--Fictitious-Eastern
-LAST-MODIFIED:19870101T000000Z
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4;UNTIL=19980404T070000Z
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VTIMEZONE
-TZID:US--Fictitious-Eastern
-LAST-MODIFIED:19870101T000000Z
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4;UNTIL=19980404T070000Z
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19990424T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=4
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VALARM
-TRIGGER;VALUE=DATE-TIME:19970317T133000Z
-REPEAT:4
-DURATION:PT15M
-ACTION:AUDIO
-ATTACH;FMTTYPE=audio/basic:ftp://host.com/pub/sounds/bell-01.aud
-END:VALARM
-BEGIN:VALARM
-TRIGGER:-PT30M
-REPEAT:2
-DURATION:PT15M
-ACTION:DISPLAY
-DESCRIPTION:Breakfast meeting with executive\n
- team at 8:30 AM EST.
-END:VALARM
-BEGIN:VALARM
-TRIGGER:-P2D
-ACTION:EMAIL
-ATTENDEE:MAILTO:john_doe@host.com
-SUMMARY:*** REMINDER: SEND AGENDA FOR WEEKLY STAFF MEETING ***
-DESCRIPTION:A draft agenda needs to be sent out to the attendees
-  to the weekly managers meeting (MGR-LIST). Attached is a
-  pointer the document template for the agenda file.
-ATTACH;FMTTYPE=application/binary:http://host.com/templates/agen
- da.doc
-END:VALARM
-BEGIN:VALARM
-TRIGGER;VALUE=DATE-TIME:19980101T050000Z
-REPEAT:23
-DURATION:PT1H
-ACTION:PROCEDURE
-ATTACH;FMTTYPE=application/binary:ftp://host.com/novo-
- procs/felizano.exe
-END:VALARM
-BEGIN:VCALENDAR
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:US-Eastern
-BEGIN:STANDARD
-DTSTART:19981025T020000
-RDATE:19981025T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19990404T020000
-RDATE:19990404T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:19980309T231000Z
-UID:guid-1.host1.com
-ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:
- MAILTO:employee-A@host.com
-DESCRIPTION:Project XYZ Review Meeting
-CATEGORIES:MEETING
-CLASS:PUBLIC
-CREATED:19980309T130000Z
-SUMMARY:XYZ Project Review
-DTSTART;TZID=US-Eastern:19980312T083000
-DTEND;TZID=US-Eastern:19980312T093000
-LOCATION:1CP Conference Room 4350
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:PUBLISH
-VERSION:2.0
-PRODID:-//ABC Corporation//NONSGML My Product//EN
-BEGIN:VEVENT
-DTSTAMP:19970324T1200Z
-SEQUENCE:0
-UID:uid3@host1.com
-ORGANIZER:MAILTO:jdoe@host1.com
-DTSTART:19970324T123000Z
-DTEND:19970324T210000Z
-CATEGORIES:MEETING,PROJECT
-CLASS:PUBLIC
-SUMMARY:Calendaring Interoperability Planning Meeting
-DESCRIPTION:Discuss how we can test c&s interoperability\n
- using iCalendar and other IETF standards.
-LOCATION:LDB Lobby
-ATTACH;FMTTYPE=application/postscript:ftp://xyzCorp.com/pub/
- conf/bkgrnd.ps
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//ABC Corporation//NONSGML My Product//EN
-BEGIN:VTODO
-DTSTAMP:19980130T134500Z
-SEQUENCE:2
-UID:uid4@host1.com
-ORGANIZER:MAILTO:unclesam@us.gov
-ATTENDEE;PARTSTAT=ACCEPTED:MAILTO:jqpublic@host.com
-DUE:19980415T235959
-STATUS:NEEDS-ACTION
-SUMMARY:Submit Income Taxes
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER:19980403T120000
-ATTACH;FMTTYPE=audio/basic:http://host.com/pub/audio-
- files/ssbanner.aud
-REPEAT:4
-DURATION:PT1H
-END:VALARM
-END:VTODO
-END:VCALENDAR
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//ABC Corporation//NONSGML My Product//EN
-BEGIN:VJOURNAL
-DTSTAMP:19970324T120000Z
-UID:uid5@host1.com
-ORGANIZER:MAILTO:jsmith@host.com
-STATUS:DRAFT
-CLASS:PUBLIC
-CATEGORIES:Project Report, XYZ, Weekly Meeting
-DESCRIPTION:Project xyz Review Meeting Minutes\n
- Agenda\n1. Review of project version 1.0 requirements.\n2.
- Definition
- of project processes.\n3. Review of project schedule.\n
- Participants: John Smith\, Jane Doe\, Jim Dandy\n-It was
-  decided that the requirements need to be signed off by
-  product marketing.\n-Project processes were accepted.\n
- -Project schedule needs to account for scheduled holidays
-  and employee vacation time. Check with HR for specific
-  dates.\n-New schedule will be distributed by Friday.\n-
- Next weeks meeting is cancelled. No meeting until 3/23.
-END:VJOURNAL
-END:VCALENDAR
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//RDU Software//NONSGML HandCal//EN
-BEGIN:VFREEBUSY
-ORGANIZER:MAILTO:jsmith@host.com
-DTSTART:19980313T141711Z
-DTEND:19980410T141711Z
-FREEBUSY:19980314T233000Z/19980315T003000Z
-FREEBUSY:19980316T153000Z/19980316T163000Z
-FREEBUSY:19980318T030000Z/19980318T040000Z
-URL:http://www.host.com/calendar/busytime/jsmith.ifb
-END:VFREEBUSY
-END:VCALENDAR
diff --git a/libical/src/Net-ICal-Libical/test-data/rfc2446.ics b/libical/src/Net-ICal-Libical/test-data/rfc2446.ics
deleted file mode 100644
index 8bf5c7e8f3..0000000000
--- a/libical/src/Net-ICal-Libical/test-data/rfc2446.ics
+++ /dev/null
@@ -1,1004 +0,0 @@
-
-BEGIN:VCALENDAR
-METHOD:PUBLISH
-PRODID:-//ACME/DesktopCalendar//EN
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:mailto:a@example.com
-DTSTART:19970701T200000Z
-DTSTAMP:19970611T190000Z
-SUMMARY:ST. PAUL SAINTS -VS- DULUTH-SUPERIOR DUKES
-UID:0981234-1234234-23@example.com
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-METHOD:PUBLISH
-VERSION:2.0
-PRODID:-//ACME/DesktopCalendar//EN
-BEGIN:VEVENT
-ORGANIZER:mailto:a@example.com
-DTSTAMP:19970612T190000Z
-DTSTART:19970701T210000Z
-DTEND:19970701T230000Z
-SEQUENCE:1
-UID:0981234-1234234-23@example.com
-SUMMARY:ST. PAUL SAINTS -VS- DULUTH-SUPERIOR DUKES
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-METHOD:CANCEL
-VERSION:2.0
-PRODID:-//ACME/DesktopCalendar//EN
-BEGIN:VEVENT
-ORGANIZER:mailto:a@example.com
-COMMENT:DUKES forfeit the game
-SEQUENCE:2
-UID:0981234-1234234-23@example.com
-DTSTAMP:19970613T190000Z
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:PUBLISH
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America-Chicago
-TZURL:http://zones.stds_r_us.net/tz/America-Chicago
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0600
-TZNAME:CST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZOFFSETFROM:-0600
-TZOFFSETTO:-0500
-TZNAME:CDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-ORGANIZER:mailto:a@example.com
-ATTACH:http://www.dukes.com/
-CATEGORIES:SPORTS EVENT,ENTERTAINMENT
-CLASS:PRIVATE
-DESCRIPTION:MIDWAY STADIUM\n
- Big time game. MUST see.\n
- Expected duration:2 hours\n
-DTEND;TZID=America-Chicago:19970701T180000
-DTSTART;TZID=America-Chicago:19970702T160000
-DTSTAMP:19970614T190000Z
-STATUS:CONFIRMED
-LOCATION;VALUE=URI:http://www.midwaystadium.com/
-PRIORITY:2
-RESOURCES:SCOREBOARD
-SEQUENCE:3
-SUMMARY:ST. PAUL SAINTS -VS- DULUTH-SUPERIOR DUKES
-UID:0981234-1234234-23@example.com
-RELATED-TO:0981234-1234234-14@example.com
-BEGIN:VALARM
-TRIGGER:-PT2H
-ACTION:DISPLAY
-DESCRIPTION:You should be leaving for the game now.
-END:VALARM
-BEGIN:VALARM
-TRIGGER:-PT30M
-ACTION:AUDIO
-END:VALARM
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:PUBLISH
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:mailto:a@example.com
-DTSTAMP:19970614T190000Z
-UID:0981234-1234234-23@example.com
-DTSTART;VALUE=DATE:19970714
-RRULE:FREQ=YEARLY;INTERVAL=1
-SUMMARY: Bastille Day
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED;CN=BIG A:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=B:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=C:Mailto:C@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=Hal:Mailto:D@example.com
-ATTENDEE;RSVP=FALSE;CUTYPE=ROOM:conf_Big@example.com
-ATTENDEE;ROLE=NON-PARTICIPANT;RSVP=FALSE:Mailto:E@example.com
-DTSTAMP:19970611T190000Z
-DTSTART:19970701T200000Z
-DTEND:19970701T2000000Z
-SUMMARY:Conference
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:0
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REPLY
-VERSION:2.0
-BEGIN:VEVENT
-ATTENDEE;PARTSTAT=ACCEPTED:Mailto:B@example.com
-ORGANIZER:MAILTO:A@example.com
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:0
-REQUEST-STATUS:2.0;Success
-DTSTAMP:19970612T190000Z
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:C@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL;CN=Hal:Mailto:D@example.com
-ATTENDEE;ROLE=NON-PARTICIPANT;RSVP=FALSE;
- CUTYPE=ROOM:Mailto:Conf@example.com
-ATTENDEE;ROLE=NON-PARTICIPANT;RSVP=FALSE:Mailto:E@example.com
-DTSTART:19970701T180000Z
-DTEND:19970701T190000Z
-SUMMARY:Phone Conference
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:1
-DTSTAMP:19970613T190000Z
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:C@example.com
-DTSTART:19970701T190000Z
-DTEND:19970701T200000Z
-SUMMARY:Discuss the Merits of the election results
-LOCATION:Green Conference Room
-UID:calsrv.example.com-873970198738777a@example.com
-SEQUENCE:0
-DTSTAMP:19970611T190000Z
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:COUNTER
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:C@example.com
-DTSTART:19970701T160000Z
-DTEND:19970701T190000Z
-DTSTAMP:19970612T190000Z
-SUMMARY:Discuss the Merits of the election results
-LOCATION:Green Conference Room
-COMMENT:This time works much better and I think the big conference
-  room is too big
-UID:calsrv.example.com-873970198738777a@example.com
-SEQUENCE:0
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:C@example.com
-DTSTAMP:19970613T190000Z
-DTSTART:19970701T160000Z
-DTEND:19970701T190000Z
-SUMMARY:Discuss the Merits of the election results - changed to
-  meet B's schedule
-LOCATION:Green Conference Room
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:1
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:DECLINECOUNTER
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-COMMENT:Sorry\, I cannot change this meeting time
-UID:calsrv.example.com-873970198738777@example.com
-DTSTAMP:19970614T190000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REPLY
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:MAILTO:A@Example.com
-ATTENDEE;PARTSTAT=DELEGATED;DELEGATED-
- TO="Mailto:E@example.com":Mailto:C@example.com
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:0
-REQUEST-STATUS:2.0;Success
-DTSTAMP:19970611T190000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;PARTSTAT=DELEGATED;DELEGATED-
- TO="Mailto:E@example.com":Mailto:C@example.com
-ATTENDEE;RSVP=TRUE;
- DELEGATED-FROM="Mailto:C@example.com":Mailto:E@example.com
-DTSTART:19970701T180000Z
-DTEND:19970701T200000Z
-SUMMARY:Phone Conference
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:0
-STATUS:CONFIRMED
-DTSTAMP:19970611T190000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REPLY
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:MAILTO:A@Example.com
-ATTENDEE;PARTSTAT=ACCEPTED;DELEGATED-
- FROM="Mailto:C@example.com":Mailto:E@example.com
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:0
-REQUEST-STATUS:2.0;Success
-DTSTAMP:19970614T190000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REPLY
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:MAILTO:A@Example.com
-ATTENDEE;PARTSTAT=DELEGATED;
- DELEGATED-TO="Mailto:E@example.com":Mailto:C@example.com
-COMMENT:Sorry\, I will be out of town at that time.
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:0
-REQUEST-STATUS:2.0;Success
-DTSTAMP:19970614T190000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:MAILTO:A@Example.com
-ATTENDEE;PARTSTAT=DECLINED;
- DELEGATED-FROM="Mailto:C@example.com":Mailto:E@example.com
-ATTENDEE;RSVP=TRUE:Mailto:C@example.com
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:0
-SUMMARY:Phone Conference
-DTSTART:19970701T180000Z
-DTEND:19970701T200000Z
-DTSTAMP:19970614T200000Z
-COMMENT:DELEGATE (ATTENDEE Mailto:E@example.com) DECLINED YOUR
- INVITATION
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:CANCEL
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;CUTYPE=INDIVIDUAL:Mailto:A@example.com
-ATTENDEE;CUTYPE=INDIVIDUAL:Mailto:B@example.com
-ATTENDEE;CUTYPE=INDIVIDUAL:Mailto:C@example.com
-ATTENDEE;CUTYPE=INDIVIDUAL:Mailto:D@example.com
-COMMENT:Mr. B cannot attend. It's raining. Lets cancel.
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:1
-STATUS:CANCELLED
-DTSTAMP:19970613T190000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:CANCEL
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE:mailto:B@example.com
-COMMENT:You're off the hook for this meeting
-UID:calsrv.example.com-873970198738777@example.com
-DTSTAMP:19970613T193000Z
-SEQUENCE:1
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;CUTYPE=INDIVIDUAL:Mailto:C@example.com
-ATTENDEE;CUTYPE=INDIVIDUAL:Mailto:D@example.com
-ATTENDEE;CUTYPE=ROOM:CR_Big@example.com
-ATTENDEE;ROLE=NON-PARTICIPANT;
- RSVP=FALSE:Mailto:E@example.com
-DTSTAMP:19970611T190000Z
-DTSTART:19970701T200000Z
-DTEND:19970701T203000Z
-SUMMARY:Phone Conference
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:2
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:B@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:B@example.com
-ATTENDEE;CUTYPE=INDIVIDUAL:Mailto:C@example.com
-ATTENDEE;CUTYPE=INDIVIDUAL:Mailto:D@example.com
-DTSTAMP:19970611T190000Z
-DTSTART:19970701T200000Z
-DTEND:19970701T203000Z
-RRULE:FREQ=WEEKLY
-SUMMARY:Phone Conference
-UID:123456@example.com
-SEQUENCE:1
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-VERSION:2.0
-METHOD:PUBLISH
-BEGIN:VFREEBUSY
-DTSTAMP:19980101T124100Z
-ORGANIZER:MAILTO:A@Example.com
-DTSTART:19980101T124200Z
-DTEND:19980107T124200Z
-FREEBUSY:19980101T180000Z/19980101T190000Z
-FREEBUSY:19980103T020000Z/19980103T050000Z
-FREEBUSY:19980107T020000Z/19980107T050000Z
-FREEBUSY:19980113T000000Z/19980113T010000Z
-FREEBUSY:19980115T190000Z/19980115T200000Z
-FREEBUSY:19980115T220000Z/19980115T230000Z
-FREEBUSY:19980116T013000Z/19980116T043000Z
-END:VFREEBUSY
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VFREEBUSY
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR:Mailto:A@example.com
-ATTENDEE:Mailto:B@example.com
-ATTENDEE:Mailto:C@example.com
-DTSTAMP:19970613T190000Z
-DTSTART:19970701T080000Z
-DTEND:19970701T200000
-UID:calsrv.example.com-873970198738777@example.com
-END:VFREEBUSY
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REPLY
-VERSION:2.0
-BEGIN:VFREEBUSY
-ORGANIZER:MAILTO:A@example.com
-ATTENDEE:Mailto:B@example.com
-DTSTART:19970701T080000Z
-DTEND:19970701T200000Z
-UID:calsrv.example.com-873970198738777@example.com
-FREEBUSY:19970701T090000Z/PT1H,19970701T140000Z/PT30M
-DTSTAMP:19970613T190030Z
-END:VFREEBUSY
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America-SanJose
-TZURL:http://zones.stds_r_us.net/tz/America-SanJose
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0800
-TZNAME:PST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZOFFSETFROM:-0800
-TZOFFSETTO:-0700
-TZNAME:PDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED;CUTYPE=INDIVIDUAL:A@example.COM
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:B@example.fr
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:c@example.jp
-DTSTAMP:19970613T190030Z
-DTSTART;TZID=America-SanJose:19970701T140000
-DTEND;TZID=America-SanJose:19970701T150000
-RRULE:FREQ=WEEKLY;INTERVAL=20;WKST=SU;BYDAY=TU
-RDATE;TZID=America-SanJose:19970910T140000
-EXDATE;TZID=America-SanJose:19970909T140000
-EXDATE;TZID=America-SanJose:19971028T140000
-SUMMARY:Weekly Phone Conference
-UID:calsrv.example.com-873970198738777@example.com
-SEQUENCE:0
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:guid-1@host1.com
-SEQUENCE:0
-RRULE:FREQ=MONTHLY;BYMONTHDAY=1;UNTIL=19980901T210000Z
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE:Mailto:B@example.com
-ATTENDEE:Mailto:C@example.com
-ATTENDEE:Mailto:D@example.com
-DESCRIPTION:IETF-C&S Conference Call
-CLASS:PUBLIC
-SUMMARY:IETF Calendaring Working Group Meeting
-DTSTART:19970601T210000Z
-DTEND:19970601T220000Z
-LOCATION:Conference Call
-DTSTAMP:19970526T083000Z
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:guid-1@host1com
-RECURRENCE-ID:19970701T210000Z
-SEQUENCE:1
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE:Mailto:B@example.com
-ATTENDEE:Mailto:C@example.com
-ATTENDEE:Mailto:D@example.com
-DESCRIPTION:IETF-C&S Conference Call
-CLASS:PUBLIC
-SUMMARY:IETF Calendaring Working Group Meeting
-DTSTART:19970703T210000Z
-DTEND:19970703T220000Z
-LOCATION:Conference Call
-DTSTAMP:19970626T093000Z
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:CANCEL
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:guid-1@host1.com
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE:Mailto:B@example.com
-ATTENDEE:Mailto:C@example.com
-ATTENDEE:Mailto:D@example.com
-RECURRENCE-ID:19970801T210000Z
-SEQUENCE:2
-STATUS:CANCELLED
-DTSTAMP:19970721T093000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:CANCEL
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:guid-1@host1.com
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE:Mailto:B@example.com
-ATTENDEE:Mailto:C@example.com
-ATTENDEE:Mailto:D@example.com
-DTSTAMP:19970721T103000Z
-STATUS:CANCELLED
-SEQUENCE:3
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:guid-1@host1.com
-RECURRENCE-ID;RANGE=THISANDFUTURE:19970901T210000Z
-SEQUENCE:3
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE:Mailto:C@example.com
-ATTENDEE;RSVP=TRUE:Mailto:D@example.com
-DESCRIPTION:IETF-C&S Discussion
-CLASS:PUBLIC
-SUMMARY:IETF Calendaring Working Group Meeting
-DTSTART:19970901T210000Z
-DTEND:19970901T220000Z
-LOCATION:Building 32\, Microsoft\, Seattle\, WA
-DTSTAMP:19970526T083000Z
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:ADD
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:123456789@host1.com
-SEQUENCE:4
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE:Mailto:C@example.com
-ATTENDEE;RSVP=TRUE:Mailto:D@example.com
-DESCRIPTION:IETF-C&S Conference Call
-CLASS:PUBLIC
-SUMMARY:IETF Calendaring Working Group Meeting
-DTSTART:19970715T210000Z
-DTEND:19970715T220000Z
-LOCATION:Conference Call
-DTSTAMP:19970629T093000Z
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:123456789@host1.com
-SEQUENCE:0
-RRULE:FREQ=WEEKLY;WKST=SU;BYDAY=TU
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-SUMMARY:Review Accounts
-DTSTART:19980303T210000Z
-DTEND:19980303T220000Z
-LOCATION:The White Room
-DTSTAMP:19980301T093000Z
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:ADD
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:123456789@host1.com
-SEQUENCE:7
-RRULE:FREQ=WEEKLY;WKST=SU;BYDAY=TH
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-SUMMARY:Review Accounts
-DTSTART:19980303T210000Z
-DTEND:19980303T220000Z
-DTSTAMP:19980303T193000Z
-LOCATION:The Usual conference room
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:123456789@host1.com
-SEQUENCE:7
-RRULE:FREQ=WEEKLY;WKST=SU;BYDAY=TU,TH
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-SUMMARY:Review Accounts
-DTSTART:19980303T210000Z
-DTEND:19980303T220000Z
-DTSTAMP:19980303T193000Z
-LOCATION:The White Room
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:123456789@host1.com
-SEQUENCE:0
-RDATE:19980304T180000Z
-RDATE:19980311T180000Z
-RDATE:19980318T180000Z
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-SUMMARY:Review Accounts
-DTSTART:19980304T180000Z
-DTEND:19980304T200000Z
-DTSTAMP:19980303T193000Z
-LOCATION:Conference Room A
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:123456789@host1.com
-SEQUENCE:1
-RECURRENCE-ID:19980311T180000Z
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-SUMMARY:Review Accounts
-DTSTART:19980311T160000Z
-DTEND:19980311T180000Z
-DTSTAMP:19980306T193000Z
-LOCATION:The Small conference room
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:ADD
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:123456789@host1.com
-SEQUENCE:2
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-SUMMARY:Review Accounts
-DTSTART:19980315T180000Z
-DTEND:19980315T200000Z
-DTSTAMP:19980307T193000Z
-LOCATION:Conference Room A
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:123456789@host1.com
-SEQUENCE:2
-RDATE:19980304T180000Z
-RDATE:19980311T160000Z
-RDATE:19980315T180000Z
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-SUMMARY:Review Accounts
-DTSTART:19980304T180000Z
-DTEND:19980304T200000Z
-DTSTAMP:19980303T193000Z
-LOCATION:Conference Room A
-STATUS:CONFIRMED
-END:VEVENT
-BEGIN:VEVENT
-SEQUENCE:2
-RECURRENCE-ID:19980311T160000Z
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-SUMMARY:Review Accounts
-DTSTART:19980311T160000Z
-DTEND:19980304T180000Z
-DTSTAMP:19980306T193000Z
-ORGANIZER:Mailto:A@example.com
-LOCATION:The Small conference room
-UID:guid-1@host1.com
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:COUNTER
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:guid-1@host1.com
-RECURRENCE-ID:19970715T210000Z
-SEQUENCE:4
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;RSVP=TRUE:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE:Mailto:C@example.com
-ATTENDEE;RSVP=TRUE:Mailto:D@example.com
-DESCRIPTION:IETF-C&S Conference Call
-CLASS:PUBLIC
-SUMMARY:IETF Calendaring Working Group Meeting
-DTSTART:19970715T220000Z
-DTEND:19970715T230000Z
-LOCATION:Conference Call
-COMMENT:May we bump this by an hour? I have a conflict
-DTSTAMP:19970629T094000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:guid-1@host1.com
-SEQUENCE:0
-RRULE:FREQ=MONTHLY;BYMONTHDAY=1
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE:Mailto:C@example.com
-ATTENDEE;RSVP=TRUE:Mailto:D@example.com
-DESCRIPTION:IETF-C&S Conference Call
-CLASS:PUBLIC
-SUMMARY:IETF Calendaring Working Group Meeting
-DTSTART:19970601T210000Z
-DTEND:19970601T220000Z
-DTSTAMP:19970602T094000Z
-LOCATION:Conference Call
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//RDU Software//NONSGML HandCal//EN
-METHOD:REPLY
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE:Mailto:B@example.com
-REQUEST-STATUS:2.8;Repeating event ignored. Scheduled as a single
-  event;RRULE
-REQUEST-STATUS:3.0;Invalid Property Name;FOO
-UID:guid-1@host1.com
-SEQUENCE:0
-DTSTAMP:19970603T094000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VTODO
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE:Mailto:C@example.com
-ATTENDEE;RSVP=TRUE:Mailto:D@example.com
-DTSTART:19970701T170000Z
-DUE:19970722T170000Z
-PRIORITY:1
-SUMMARY:Create the requirements document
-UID:calsrv.example.com-873970198738777-00@example.com
-SEQUENCE:0
-DTSTAMP:19970717T200000Z
-STATUS:Needs Action
-END:VTODO
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REPLY
-VERSION:2.0
-BEGIN:VTODO
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;PARTSTAT=ACCEPTED:Mailto:B@example.com
-UID:calsrv.example.com-873970198738777-00@example.com
-COMMENT:I'll send you my input by e-mail
-SEQUENCE:0
-DTSTAMP:19970717T203000Z
-REQUEST-STATUS:2.0;Success
-END:VTODO
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VTODO
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:D@example.com
-UID:calsrv.example.com-873970198738777-00@example.com
-SUMMARY:Create the requirements document
-PRIORITY:1
-SEQUENCE:0
-STATUS:IN-PROCESS
-DTSTART:19970701T170000Z
-DTSTAMP:19970717T230000Z
-END:VTODO
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REPLY
-VERSION:2.0
-BEGIN:VTODO
-ORGANIZER:MAILTO:A@example.com
-ATTENDEE;PARTSTAT=IN-PROCESS:Mailto:B@example.com
-PERCENT-COMPLETE:75
-REQUEST-STATUS:2.0
-UID:calsrv.example.com-873970198738777-00@example.com
-DTSTAMP:19970717T233000Z
-SEQUENCE:0
-END:VTODO
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REPLY
-VERSION:2.0
-BEGIN:VTODO
-ORGANIZER:MAILTO:A@example.com
-ATTENDEE;PARTSTAT=COMPLETED:Mailto:D@example.com
-UID:calsrv.example.com-873970198738777-00@example.com
-REQUEST-STATUS:2.0
-DTSTAMP:19970717T233000Z
-SEQUENCE:0
-END:VTODO
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VTODO
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE;PARTSTAT=ACCEPTED;CUTYPE=INDIVIDUAL:Mailto:B@example.com
-ATTENDEE;PARTSTAT=IN-PROCESS;CUTYPE=INDIVIDUAL:Mailto:D@example.com
-DTSTART:19970701T170000Z
-DUE:19970722T170000Z
-PRIORITY:1
-SUMMARY:Create the requirements document
-UID:calsrv.example.com-873970198738777-00@example.com
-SEQUENCE:1
-DTSTAMP:19970718T100000Z
-STATUS:IN-PROGRESS
-PERCENT-COMPLETE:40
-END:VTODO
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REQUEST
-VERSION:2.0
-BEGIN:VTODO
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR:Mailto:A@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:B@example.com
-ATTENDEE;RSVP=TRUE;CUTYPE=INDIVIDUAL:Mailto:D@example.com
-RRULE:FREQ=MONTHLY;COUNT=10;BYDAY=1FR
-DTSTART:19980101T100000
-DUE:19980103T100000
-SUMMARY:Send Status Reports to Area Managers
-UID:calsrv.example.com-873970198738777-00@example.com
-SEQUENCE:0
-DTSTAMP:19970717T200000Z
-STATUS:NEEDS-ACTION
-PRIORITY:1
-END:VTODO
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//ACME/DesktopCalendar//EN
-METHOD:REPLY
-VERSION:2.0
-BEGIN:VTODO
-ATTENDEE;PARTSTAT=IN-PROCESS:Mailto:B@example.com
-PERCENT-COMPLETE:75
-UID:calsrv.example.com-873970198738777-00@example.com
-DTSTAMP:19970717T233000Z
-RECURRENCE-ID:19980101T170000Z
-SEQUENCE:1
-ORGANIZER:MAILTO:A@Example.com
-REQUEST-STATUS:2.0
-END:VTODO
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:PUBLISH
-PRODID:-//ACME/DesktopCalendar//EN
-VERSION:2.0
-BEGIN:VJOURNAL
-DTSTART:19971002T200000Z
-DTSTAMP:19971002T200000Z
-ORGANIZER:MAILTO:A@Example.com
-SUMMARY:Phone conference minutes
-DESCRIPTION:The editors meeting was held on October 1\, 1997.
-  Details are in the attached document.
-UID:0981234-1234234-2410@example.com
-RELATED-TO:0981234-1234234-2402-35@example.com
-ATTACH:ftp://ftp.example.com/pub/ed/minutes100197.txt
-END:VJOURNAL
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//RDU Software//NONSGML HandCal//EN
-METHOD:REFRESH
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-UID: guid-1-12345@host1.com
-DTSTAMP:19970603T094000
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VEVENT
-UID:acme-12345@host1.com
-SEQUENCE:3
-RRULE:FREQ=WEEKLY
-RDATE;VALUE=PERIOD:19970819T210000Z/199700819T220000Z
-ORGANIZER:Mailto:A@example.com
-ATTENDEE;ROLE=CHAIR;PARTSTAT=ACCEPTED:Mailto:A@example.com
-ATTENDEE:Mailto:B@example.com
-DESCRIPTION:IETF-C&S Conference Call
-SUMMARY:IETF Calendaring Working Group Meeting
-DTSTART:19970801T210000Z
-DTEND:19970801T220000Z
-RECURRENCE-ID:19970809T210000Z
-DTSTAMP:19970726T083000
-STATUS:CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-PRODID:-//RDU Software//NONSGML HandCal//EN
-METHOD:REFRESH
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:Mailto:A@example.com
-ATTENDEE:Mailto:B@example.com
-UID:acme-12345@host1.com
-DTSTAMP:19970603T094000
-END:VEVENT
-END:VCALENDAR
diff --git a/libical/src/Net-ICal-Libical/test-data/single-with-error b/libical/src/Net-ICal-Libical/test-data/single-with-error
deleted file mode 100644
index 6a368d9997..0000000000
--- a/libical/src/Net-ICal-Libical/test-data/single-with-error
+++ /dev/null
@@ -1,39 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:"-//RDU Software//NONSGML HandCal//EN"
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:US-Eastern
-BEGIN:STANDARD
-DTSTART:19981025T020000
-RDATE:19981025T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19990404T020000
-RDATE:19990404T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:19980309T231000Z
-UID:guid-1.host1.com
-ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MAILTO:employee-A@host.com
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:mailto:Employee-B@HOST.com
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MailTo:Eric@Agony.Qualcomm.com
-DESCRIPTION:Project XYZ Review Meeting
-CATEGORIES:MEETING
-CLASS:PUBLIC
-CREATED:19980309T130000Z
-SUMMARY:XYZ Project Review
-DTSTAR;TZID=US-Eastern:19980312T083000
-DTEND;TZID=US-Eastern:19980312T093000
-LOCATION:1CP Conference 
-Room 4350
-END:VEVENT
-END:VCALENDAR
-
diff --git a/libical/src/Net-ICal-Libical/test/component.pl b/libical/src/Net-ICal-Libical/test/component.pl
deleted file mode 100644
index 2fdaf41d65..0000000000
--- a/libical/src/Net-ICal-Libical/test/component.pl
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/perl
-
-use lib "../blib/lib";
-use lib "../blib/arch";
-use lib "../";
-
-use Time::Local;
-
-use Net::ICal::Libical;
-
-use POSIX; 
-
-
-  my $comp_str=<<EOM;
-BEGIN:VCALENDAR
-METHOD
- :PUBLISH
-PRODID
- :-//ACME/DesktopCalendar//EN
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :mailto:a\@example.com
-ATTENDEE
- ;RSVP=TRUE
- ;ROLE=REQ-PARTICIPANT
- ;CUTYPE=GROUP
- :MAILTO:employee-A\@host.com
-DTSTART
- :19970701T200000Z
-DURATION
- :P3DT4H50M36S
-DTSTAMP
- :19970611T190000Z
-SUMMARY
- :ST. PAUL SAINTS -VS- DULUTH-SUPERIOR DUKES
-UID
- :0981234-1234234-23\@example.com
-END:VEVENT
-END:VCALENDAR         
-EOM
-  
-my $c;
-
-$c = new Net::ICal::Libical::Component($comp_str);
-
-my @props = $c->properties();
-
-my $p;
-foreach $p (@props) {
-  print $p->name()." ".$p->value()."\n";
-  
-}
-
-$inner = ($c->components())[0];
-
-print "\n";
-
-print " -------- Attendee \n";
-
-$p = ($inner->properties('ATTENDEE'))[0];
-
-print $p->as_ical_string(),"\n";
-
-print $p->get_parameter('ROLE'),"\n";
-
-die if $p->get_parameter('ROLE') ne 'REQ-PARTICIPANT';
-
-$p->set_parameter('ROLE','INDIVIDUAL');
-
-print $p->as_ical_string(),"\n";
-
-print " -------- DTSTART \n";
-
-$p = ($inner->properties('DTSTART'))[0];
-
-print $p->as_ical_string()."\n";
-print $p->as_ical_string()."\n";
-
-print "hour: ". $p->hour()." \n";
-
-$p->hour($p->hour() - 10);
-
-print $p->hour(),"\n";
-
-$p->timezone('America/Los_Angeles');
-
-print $p->as_ical_string()."\n";
-
-
-print "----------- DURATION \n";
-
-$p = ($inner->properties('DURATION'))[0];
-
-print $p->as_ical_string()."\n";
-
-print $p->seconds(),"\n";
-
-$p->seconds(3630);
-
-print $p->as_ical_string()."\n";
-print $p->seconds(),"\n";
-
-
-
diff --git a/libical/src/Net-ICal-Libical/test/libical.pl b/libical/src/Net-ICal-Libical/test/libical.pl
deleted file mode 100755
index 9499dd9850..0000000000
--- a/libical/src/Net-ICal-Libical/test/libical.pl
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/usr/bin/perl
-
-use lib "../blib/lib";
-use lib "../blib/arch";
-use lib "../";
-
-use Time::Local;
-
-use Net::ICal::Libical;
-
-use POSIX; 
-
-
-my $comp_str=<<EOM;
-BEGIN:VCALENDAR
-METHOD:PUBLISH
-VERSION:2.0
-PRODID:-//ACME/DesktopCalendar//EN
-BEGIN:VEVENT
-ORGANIZER:mailto:a\@example.com
-DTSTAMP:19970612T190000Z
-DTSTART:19970701T210000Z
-DTEND:19970701T230000Z
-SEQUENCE:1
-UID:0981234-1234234-23\@example.com
-SUMMARY:ST. PAUL SAINTS -VS- DULUTH-SUPERIOR DUKES
-END:VEVENT
-END:VCALENDAR
-EOM
-
-my $comp_str_error=<<EOM;
-BEGIN:VCALENDAR
-METHOD:REQUEST
-VERSION:2.0
-PRODID:-//ACME/DesktopCalendar//EN
-BEGIN:VEVENT
-ORGANIZER:mailto:a\@example.com
-DTSTAMP:19970612T190000Z
-DTSTART:19970701T210000Z
-DTEND:19970701T230000Z
-SEQENCE:1
-UID:0981234-1234234-23\@example.com
-SUMMARY:ST. PAUL SAINTS -VS- DULUTH-SUPERIOR DUKES
-END:VEVENT
-END:VCALENDAR
-EOM
-
-print "-- Good Component --\n";
-print Net::ICal::Libical::validate_component($comp_str);
-
-print "-- BadComponent --\n";
-print Net::ICal::Libical::validate_component($comp_str_error);
-
-
-print "-- Generate Occurrences --\n";
-$rule = "FREQ=MONTHLY;UNTIL=19971224T000000Z;INTERVAL=1;BYDAY=TU,2FR,3SA";
-$limit = 25;
-$start = timelocal(0,0,9,5,8,1997); # 19970905T090000Z
-
-@occur = Net::ICal::Libical::generate_occurrences($rule,$start,$limit);
-
-print $rule."\n";
-
-foreach $i (@occur){
-
-  my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = gmtime($i);
-
-  printf("%s %s %2d %02d:%02d:%02d %d\n",
-	 (Sun,Mon,Tue,Wed,Thur,Fri,Sat)[$wday],
-	 (Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec)[$mon],
-	 $mday, 
-	 $hour,$min,$sec,
-	 $year);
-
-}
-
-print "-- Interpret iCal data --\n";
-
-
-my $comp_str=<<EOM;
-BEGIN:VEVENT
-ORGANIZER:mailto:a\@example.com
-DTSTAMP:19970612T190000Z
-DTSTART:19970701T210000Z
-DTEND:19970701T230000Z
-SEQUENCE:1
-UID:0981234-1234234-23\@example.com
-SUMMARY:ST. PAUL SAINTS -VS- DULUTH-SUPERIOR DUKES
-END:VEVENT
-
-EOM
-
-
-
diff --git a/libical/src/Net-ICal-Libical/test/swig.pl b/libical/src/Net-ICal-Libical/test/swig.pl
deleted file mode 100755
index 939f5ce936..0000000000
--- a/libical/src/Net-ICal-Libical/test/swig.pl
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/perl
-
-use lib "../blib/lib";
-use lib "../blib/arch";
-use lib "../";
-
-use Net::ICal::Libical;
-
-
-my $comp_str=<<EOM;
-BEGIN:VCALENDAR
-METHOD:PUBLISH
-VERSION:2.0
-PRODID:-//ACME/DesktopCalendar//EN
-BEGIN:VEVENT
-ORGANIZER:mailto:a\@example.com
-DTSTAMP:19970612T190000Z
-DTSTART:19970701T210000Z
-DTEND:19970701T230000Z
-SEQUENCE:1
-UID:0981234-1234234-23\@example.com
-SUMMARY:ST. PAUL SAINTS -VS- DULUTH-SUPERIOR DUKES
-END:VEVENT
-END:VCALENDAR
-EOM
-
-$c = Net::ICal::Libical::icalparser_parse_string($comp_str);   
-
-print Net::ICal::Libical::icalcomponent_as_ical_string($c)."\n";
diff --git a/libical/src/java/.cvsignore b/libical/src/java/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/libical/src/java/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/libical/src/java/ICalDurationType.java b/libical/src/java/ICalDurationType.java
deleted file mode 100644
index 2dcc23442e..0000000000
--- a/libical/src/java/ICalDurationType.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*======================================================================
- FILE: ICalDurationType.java
- CREATOR: structConverter 01/11/02
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-package net.cp.jlibical;
-
-/** struct icaldurationtype */
-public class ICalDurationType
-{
-	/**
-	 * Constructor for pre-existing native icaldurationtype.
-	 * @param obj c++ pointer
-	 */
-	ICalDurationType(long obj)
-	{
-		init(obj);
-	}
-
-	/**
-	 * Constructor for default ICalDurationType
-	 */
-	public ICalDurationType()
-	{
-	}
-
-	public void setIs_neg(int lcl_arg0)
-	{
-	is_neg = lcl_arg0;
-	}
-	public int getIs_neg()
-	{
-	return is_neg;
-	}
-
-	public void setDays(long lcl_arg0)
-	{
-	days = lcl_arg0;
-	}
-	public long getDays()
-	{
-	return days;
-	}
-
-	public void setWeeks(long lcl_arg0)
-	{
-	weeks = lcl_arg0;
-	}
-	public long getWeeks()
-	{
-	return weeks;
-	}
-
-	public void setHours(long lcl_arg0)
-	{
-	hours = lcl_arg0;
-	}
-	public long getHours()
-	{
-	return hours;
-	}
-
-	public void setMinutes(long lcl_arg0)
-	{
-	minutes = lcl_arg0;
-	}
-	public long getMinutes()
-	{
-	return minutes;
-	}
-
-	public void setSeconds(long lcl_arg0)
-	{
-	seconds = lcl_arg0;
-	}
-	public long getSeconds()
-	{
-	return seconds;
-	}
-
-	// --------------------------------------------------------
-	// Initialization
-	// --------------------------------------------------------
-
-	/**
-	 * native code inits from an existing struct.
-	 */
-	private native void init(long aDuration);
-
-	/**
-	* optimization: init field id cache,
-	*/
-	private native static void initFIDs();
-
-	/**
-	* load the jni library for this class
-	*/
-	static {
-		System.loadLibrary("ical_jni");
-		initFIDs();
-	}
-
-	// --------------------------------------------------------
-	// Fields
-	// --------------------------------------------------------
-
-	private int	is_neg;
-	private long	days;	//  unsigned int
-	private long	weeks;	//  unsigned int
-	private long	hours;	//  unsigned int
-	private long	minutes;	//  unsigned int
-	private long	seconds;	//  unsigned int
-}
diff --git a/libical/src/java/ICalParameter.java b/libical/src/java/ICalParameter.java
deleted file mode 100644
index 74bf3db84e..0000000000
--- a/libical/src/java/ICalParameter.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*======================================================================
- FILE: ICalParameter.java
- CREATOR: gnorman 01/09/02
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-package net.cp.jlibical;
-
-public class ICalParameter
-{
-	/** It's not typesafe, but it's simple to understand! */
-	public interface ICalParameterKind
-	{
-		// icalparameter_kind
-		int ICAL_ANY_PARAMETER = 0;
-		int ICAL_ALTREP_PARAMETER = 1;
-		int ICAL_CN_PARAMETER = 2;
-		int ICAL_CUTYPE_PARAMETER = 3;
-		int ICAL_DELEGATEDFROM_PARAMETER = 4;
-		int ICAL_DELEGATEDTO_PARAMETER = 5;
-		int ICAL_DIR_PARAMETER = 6;
-		int ICAL_ENCODING_PARAMETER = 7;
-		int ICAL_FBTYPE_PARAMETER = 8;
-		int ICAL_FMTTYPE_PARAMETER = 9;
-		int ICAL_LANGUAGE_PARAMETER = 10;
-		int ICAL_MEMBER_PARAMETER = 11;
-		int ICAL_PARTSTAT_PARAMETER = 12;
-		int ICAL_RANGE_PARAMETER = 13;
-		int ICAL_RELATED_PARAMETER = 14;
-		int ICAL_RELTYPE_PARAMETER = 15;
-		int ICAL_RIGHTREF_PARAMETER = 16;
-		int ICAL_ROLE_PARAMETER = 17;
-		int ICAL_RSVP_PARAMETER = 18;
-		int ICAL_SENTBY_PARAMETER = 19;
-		int ICAL_TZID_PARAMETER = 20;
-		int ICAL_VALUE_PARAMETER = 21;
-		int ICAL_WKST_PARAMETER = 22;
-		int ICAL_X_PARAMETER = 23;
-		int ICAL_XLICCOMPARETYPE_PARAMETER = 24;
-		int ICAL_XLICERRORTYPE_PARAMETER = 25;
-		int ICAL_NO_PARAMETER = 26;
-	}
-
-	/** It's not typesafe, but it's simple to understand! */
-	public interface ICalParameterEncoding
-	{
-		// icalparameter_encoding
-		int ICAL_ENCODING_X = 20007;
-		int ICAL_ENCODING_8BIT = 20008;
-		int ICAL_ENCODING_BASE64 = 20009;
-		int ICAL_ENCODING_NONE = 20010;
-	}
-
-	public interface ICalParameterPartStat {
-	    int ICAL_PARTSTAT_X = 20017;
-	    int ICAL_PARTSTAT_NEEDSACTION = 20018;
-	    int ICAL_PARTSTAT_ACCEPTED = 20019;
-	    int ICAL_PARTSTAT_DECLINED = 20020;
-	    int ICAL_PARTSTAT_TENTATIVE = 20021;
-	    int ICAL_PARTSTAT_DELEGATED = 20022;
-	    int ICAL_PARTSTAT_COMPLETED = 20023;
-	    int ICAL_PARTSTAT_INPROCESS = 20024;
-	    int ICAL_PARTSTAT_NONE = 20025;
-	}
-
-	public interface ICalParameterRole {
-	    int ICAL_ROLE_X = 20047;
-	    int ICAL_ROLE_CHAIR = 20048;
-	    int ICAL_ROLE_REQPARTICIPANT = 20049;
-	    int ICAL_ROLE_OPTPARTICIPANT = 20050;
-	    int ICAL_ROLE_NONPARTICIPANT = 20051;
-	    int ICAL_ROLE_NONE = 20052;
-	}
-
-	/**
-	 * Constructor for ICalParameter
-	 * @param obj c++ pointer
-	 */
-	private ICalParameter(long obj)
-	{
-		init(obj);
-	}
-
-	/**
-	 * Constructor for ICalParameter
-	 */
-	public ICalParameter()
-	{
-		init();
-	}
-
-	/**
-	 * Create instance from a string of form "PARAMNAME=VALUE"
-	 */
-	public ICalParameter(String str)
-	{
-		init(str);
-	}
-
-	/**
-	 * Create from just the value, the part after the "="
-	 */
-	public ICalParameter(/* ICalParameterKind */ int kind, String  str)
-	{
-		init(kind,str);
-	}
-
-	/**
-	 * Create empty value for specified kind
-	 */
-	public ICalParameter(/* ICalParameterKind */ int kind)
-	{
-		init(kind);
-	}
-
-	/**
-	 * Return ical String representation
-	 */
-	public native String as_ical_string();
-
-	/**
-	 * Return true if this instance is valid
-	 */
-	//public native boolean is_valid();
-
-	/**
-	 * Return what kind of parameter this instance represents
-	 */
-	public native /* ICalParameterKind */ int isa();
-
-	/**
-	 * Return true if this is a parameter
-	 */
-	public native boolean isa_parameter(Object parameter);
-
-	/* Convert enumerations */
-	//public native static String kind_to_string(/* ICalParameterKind */ int kind);
-	//public native static /* ICalParameterKind */ int string_to_kind(String  str);
-
-	/* DELEGATED-FROM */
-	//public native String get_delegatedfrom();
-	//public native void set_delegatedfrom(String  v);
-
-	/* RELATED */
-	//public native icalparameter_related get_related();
-	//public native void set_related(icalparameter_related v);
-
-	/* SENT-BY */
-	//public native String get_sentby();
-	//public native void set_sentby(String  v);
-
-	/* LANGUAGE */
-	public native String get_language();
-	public native void set_language(String  v);
-
-	/* RELTYPE */
-	//public native icalparameter_reltype get_reltype();
-	//public native void set_reltype(icalparameter_reltype v);
-
-	/* ENCODING */
-	public native /* ICalParameterEncoding */ int get_encoding();
-	public native void set_encoding(/* ICalParameterEncoding */ int v);
-
-	/* ALTREP */
-	//public native String get_altrep();
-	//public native void set_altrep(String  v);
-
-	/* FMTTYPE */
-	//public native String get_fmttype();
-	//public native void set_fmttype(String  v);
-
-	/* FBTYPE */
-	//public native icalparameter_fbtype get_fbtype();
-	//public native void set_fbtype(icalparameter_fbtype v);
-
-	/* RSVP */
-	//public native icalparameter_rsvp get_rsvp();
-	//public native void set_rsvp(icalparameter_rsvp v);
-
-	/* RANGE */
-	//public native icalparameter_range get_range();
-	//public native void set_range(icalparameter_range v);
-
-	/* DELEGATED-TO */
-	//public native String get_delegatedto();
-	//public native void set_delegatedto(String  v);
-
-	/* CN */
-	//public native String get_cn();
-	//public native void set_cn(String  v);
-
-	/* ROLE */
-	public native /* ICalParameterRole */ int get_role();
-	public native void set_role(/* ICalParameterRole */ int v);
-
-	/* X-LIC-COMPARETYPE */
-	//public native icalparameter_xliccomparetype get_xliccomparetype();
-	//public native void set_xliccomparetype(icalparameter_xliccomparetype v);
-
-	/* PARTSTAT */
-	public native /* ICalParameterPartStat */ int get_partstat();
-	public native void set_partstat(/* ICalParameterPartStat */ int v);
-
-	/* X-LIC-ERRORTYPE */
-	//public native icalparameter_xlicerrortype get_xlicerrortype();
-	//public native void set_xlicerrortype(icalparameter_xlicerrortype v);
-
-	/* MEMBER */
-	//public native String get_member();
-	//public native void set_member(String  v);
-
-	/* X */
-	//public native String get_x();
-	//public native void set_x(String  v);
-
-	/* CUTYPE */
-	//public native icalparameter_cutype get_cutype();
-	//public native void set_cutype(icalparameter_cutype v);
-
-	/* TZID */
-	//public native String get_tzid();
-	//public native void set_tzid(String  v);
-
-	/* VALUE */
-	//public native /* ICalParameterValue */ int get_value();
-	//public native void set_value(/* ICalParameterValue */ int v);
-
-	/* DIR */
-	//public native String get_dir();
-	//public native void set_dir(String  v);
-
-	/**
-	 * init the native class
-	 */
-	private void init(long obj)
-	{
-		m_Obj = obj;
-	}
-
-	private native void init();
-	private native void init(String str);
-	private native void init(/* ICalParameterKind */ int kind, String str);
-	private native void init(/* ICalParameterKind */ int kind);
-
-	/**
-	 * load the jni library for this class
-	 */
-	static {
-		System.loadLibrary("ical_jni");
-	}
-
-	public static void main(String[] args)
-	{
-		System.out.println("*** ICalParameter main called ok.");
-	}
-
-	/** pointer to C++ object  */
-	private long	m_Obj = 0;
-}
diff --git a/libical/src/java/ICalPeriodType.java b/libical/src/java/ICalPeriodType.java
deleted file mode 100644
index 204ff2a141..0000000000
--- a/libical/src/java/ICalPeriodType.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*======================================================================
- FILE: ICalPeriodType.java
- CREATOR: structConverter 01/11/02
-======================================================================*/
-
-package net.cp.jlibical;
-
-public class ICalPeriodType
-{
-	public ICalPeriodType(long obj)
-	{
-		init(obj);
-	}
-
-	public ICalPeriodType()
-	{
-	}
-
-	public ICalPeriodType(long aStart, long aEnd, long aDuration)
-	{
-		init(aStart, aEnd, aDuration);
-	}
-
-	public void setStart(ICalTimeType lcl_arg0)
-	{
-		start = lcl_arg0;
-	}
-	public ICalTimeType getStart()
-	{
-		return start;
-	}
-
-	public void setEnd(ICalTimeType lcl_arg0)
-	{
-		end = lcl_arg0;
-	}
-	public ICalTimeType getEnd()
-	{
-		return end;
-	}
-
-	public void setDuration(ICalDurationType lcl_arg0)
-	{
-		duration = lcl_arg0;
-	}
-	public ICalDurationType getDuration()
-	{
-		return duration;
-	}
-
-	private void init(long aStart, long aEnd, long aDuration)
-	{
-		start = new ICalTimeType(aStart);
-		end = new ICalTimeType(aEnd);
-		duration = new ICalDurationType(aDuration);
-	}
-
-	private native void init(long obj);
-
-    private native static void initFIDs();
-
-    static {
-		System.loadLibrary("ical_jni");
-		initFIDs();
-    }
-
-	private ICalTimeType		start = new ICalTimeType();
-	private ICalTimeType		end = new ICalTimeType();
-	private ICalDurationType	duration = new ICalDurationType();
-}
-
diff --git a/libical/src/java/ICalProperty.java b/libical/src/java/ICalProperty.java
deleted file mode 100644
index 02bb2912f1..0000000000
--- a/libical/src/java/ICalProperty.java
+++ /dev/null
@@ -1,507 +0,0 @@
-/*======================================================================
- FILE: ICalProperty.java
- CREATOR: gnorman 01/09/02
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-package net.cp.jlibical;
-
-public class ICalProperty
-{
-	/** It's not typesafe, but it's simple to understand! */
-	public interface ICalPropertyMethod
-	{
-		// icalproperty_method
-		int ICAL_METHOD_X = 10011;
-		int ICAL_METHOD_PUBLISH = 10012;
-		int ICAL_METHOD_REQUEST = 10013;
-		int ICAL_METHOD_REPLY = 10014;
-		int ICAL_METHOD_ADD = 10015;
-		int ICAL_METHOD_CANCEL = 10016;
-		int ICAL_METHOD_REFRESH = 10017;
-		int ICAL_METHOD_COUNTER = 10018;
-		int ICAL_METHOD_DECLINECOUNTER = 10019;
-		int ICAL_METHOD_CREATE = 10020;
-		int ICAL_METHOD_READ = 10021;
-		int ICAL_METHOD_RESPONSE = 10022;
-		int ICAL_METHOD_MOVE = 10023;
-		int ICAL_METHOD_MODIFY = 10024;
-		int ICAL_METHOD_GENERATEUID = 10025;
-		int ICAL_METHOD_DELETE = 10026;
-		int ICAL_METHOD_NONE = 10027;
-	}
-
-	/** It's not typesafe, but it's simple to understand! */
-	public interface ICalPropertyAction
-	{
-		// icalproperty_action
-		int ICAL_ACTION_X = 10000;
-		int ICAL_ACTION_AUDIO = 10001;
-		int ICAL_ACTION_DISPLAY = 10002;
-		int ICAL_ACTION_EMAIL = 10003;
-		int ICAL_ACTION_PROCEDURE = 10004;
-		int ICAL_ACTION_NONE = 10005;
-	}
-
-	/** It's not typesafe, but it's simple to understand! */
-	public interface ICalPropertyKind
-	{
-		// icalproperty_kind
-		int ICAL_ANY_PROPERTY = 0;
-		int ICAL_ACTION_PROPERTY=1;
-		int ICAL_ALLOWCONFLICT_PROPERTY=2;
-		int ICAL_ATTACH_PROPERTY=3;
-		int ICAL_ATTENDEE_PROPERTY=4;
-		int ICAL_CALID_PROPERTY=5;
-		int ICAL_CALMASTER_PROPERTY=6;
-		int ICAL_CALSCALE_PROPERTY=7;
-		int ICAL_CARID_PROPERTY=8;
-		int ICAL_CATEGORIES_PROPERTY=9;
-		int ICAL_CLASS_PROPERTY=10;
-		int ICAL_COMMENT_PROPERTY=11;
-		int ICAL_COMPLETED_PROPERTY=12;
-		int ICAL_CONTACT_PROPERTY=13;
-		int ICAL_CREATED_PROPERTY=14;
-		int ICAL_DATEFORMAT_PROPERTY=15;
-		int ICAL_DECREED_PROPERTY=16;
-		int ICAL_DEFAULTCHARSET_PROPERTY=17;
-		int ICAL_DEFAULTLOCALE_PROPERTY=18;
-		int ICAL_DEFAULTTZID_PROPERTY=19;
-		int ICAL_DESCRIPTION_PROPERTY=20;
-		int ICAL_DTEND_PROPERTY=21;
-		int ICAL_DTSTAMP_PROPERTY=22;
-		int ICAL_DTSTART_PROPERTY=23;
-		int ICAL_DUE_PROPERTY=24;
-		int ICAL_DURATION_PROPERTY=25;
-		int ICAL_EXDATE_PROPERTY=26;
-		int ICAL_EXPAND_PROPERTY=27;
-		int ICAL_EXRULE_PROPERTY=28;
-		int ICAL_FREEBUSY_PROPERTY=29;
-		int ICAL_GEO_PROPERTY=30;
-		int ICAL_GRANT_PROPERTY=31;
-		int ICAL_LASTMODIFIED_PROPERTY=32;
-		int ICAL_LOCATION_PROPERTY=33;
-		int ICAL_MAXRESULTS_PROPERTY=34;
-		int ICAL_MAXRESULTSSIZE_PROPERTY=35;
-		int ICAL_METHOD_PROPERTY=36;
-		int ICAL_ORGANIZER_PROPERTY=37;
-		int ICAL_OWNER_PROPERTY=38;
-		int ICAL_PERCENTCOMPLETE_PROPERTY=39;
-		int ICAL_PRIORITY_PROPERTY=40;
-		int ICAL_PRODID_PROPERTY=41;
-		int ICAL_QUERY_PROPERTY=42;
-		int ICAL_QUERYNAME_PROPERTY=43;
-		int ICAL_RDATE_PROPERTY=44;
-		int ICAL_RECURRENCEID_PROPERTY=45;
-		int ICAL_RELATEDTO_PROPERTY=46;
-		int ICAL_RELCALID_PROPERTY=47;
-		int ICAL_REPEAT_PROPERTY=48;
-		int ICAL_REQUESTSTATUS_PROPERTY=49;
-		int ICAL_RESOURCES_PROPERTY=50;
-		int ICAL_RRULE_PROPERTY=51;
-		int ICAL_SCOPE_PROPERTY=52;
-		int ICAL_SEQUENCE_PROPERTY=53;
-		int ICAL_STATUS_PROPERTY=54;
-		int ICAL_SUMMARY_PROPERTY=55;
-		int ICAL_TARGET_PROPERTY=56;
-		int ICAL_TIMEFORMAT_PROPERTY=57;
-		int ICAL_TRANSP_PROPERTY=58;
-		int ICAL_TRIGGER_PROPERTY=59;
-		int ICAL_TZID_PROPERTY=60;
-		int ICAL_TZNAME_PROPERTY=61;
-		int ICAL_TZOFFSETFROM_PROPERTY=62;
-		int ICAL_TZOFFSETTO_PROPERTY=63;
-		int ICAL_TZURL_PROPERTY=64;
-		int ICAL_UID_PROPERTY=65;
-		int ICAL_URL_PROPERTY=66;
-		int ICAL_VERSION_PROPERTY=67;
-		int ICAL_X_PROPERTY=68;
-		int ICAL_XLICCLASS_PROPERTY=69;
-		int ICAL_XLICCLUSTERCOUNT_PROPERTY=70;
-		int ICAL_XLICERROR_PROPERTY=71;
-		int ICAL_XLICMIMECHARSET_PROPERTY=72;
-		int ICAL_XLICMIMECID_PROPERTY=73;
-		int ICAL_XLICMIMECONTENTTYPE_PROPERTY=74;
-		int ICAL_XLICMIMEENCODING_PROPERTY=75;
-		int ICAL_XLICMIMEFILENAME_PROPERTY=76;
-		int ICAL_XLICMIMEOPTINFO_PROPERTY=77;
-		int ICAL_NO_PROPERTY=78;
-	}
-
-	public interface ICalPropertyStatus
-	{
-		// icalproperty_status
-		int ICAL_STATUS_X = 10028;
-		int ICAL_STATUS_TENTATIVE = 10029;
-		int ICAL_STATUS_CONFIRMED = 10030;
-		int ICAL_STATUS_COMPLETED = 10031;
-		int ICAL_STATUS_NEEDSACTION = 10032;
-		int ICAL_STATUS_CANCELLED = 10033;
-		int ICAL_STATUS_INPROCESS = 10034;
-		int ICAL_STATUS_DRAFT = 10035;
-		int ICAL_STATUS_FINAL = 10036;
-		int ICAL_STATUS_NONE = 10037;
-	}
-
-	/**
-	 * Constructor for ICalProperty
-	 * @param obj c++ pointer
-	 */
-	private ICalProperty(long obj)
-	{
-		init(obj);
-	}
-
-	public ICalProperty()
-	{
-		init();
-	}
-
-	public ICalProperty(String str)
-	{
-		init(str);
-	}
-
-	public ICalProperty(/* ICalPropertyKind */ int kind)
-	{
-		init(kind);
-	}
-
-	public native String as_ical_string();
-	public native /* ICalPropertyKind */ int isa();
-	public native boolean isa_property(Object property);
-
-	public native void add_parameter(ICalParameter parameter);
-	public native void set_parameter(ICalParameter parameter);
-	public native void set_parameter_from_string(String name, String val);
-	public native String get_parameter_as_string(String name);
-	public native void remove_parameter(/* ICalParameterKind */ int kind);
-	public native int count_parameters();
-
-	/* Iterate through the parameters */
-	public native ICalParameter get_first_parameter(/* ICalParameterKind */ int kind);
-	public native ICalParameter get_next_parameter(/* ICalParameterKind */ int kind);
-
-	/* Access the value of the property */
-	public native void set_value(ICalValue val);
-	public native void set_value_from_string(String val, String kind);
-
-	public native ICalValue get_value();
-	public native String get_value_as_string();
-
-	/* Return the name of the property -- the type name converted to a
-       String, or the value of get_x_name if the type is X property
-	*/
-	public native String get_name();
-
-	/* Deal with X properties */
-	//static void set_x_name(ICalProperty prop, String name);
-	//static String get_x_name(ICalProperty prop);
-
-	//public native static /* ICalValueKind */ int icalparameter_value_to_value_kind(/* ICalParameterValue */ int val);
-
-	/* Convert kinds to String and get default value type */
-	//public native static /* ICalValueKind */ int kind_to_value_kind(/* ICalPropertyKind */ int kind);
-	//public native static /* ICalValueKind */ int value_kind_to_kind(/* ICalValueKind */ int kind);
-	//public native static String kind_to_string(/* ICalPropertyKind */ int kind);
-	//public native static /* ICalPropertyKind */ int string_to_kind(String str);
-
-	//public native static /* ICalPropertyMethod */ int string_to_method(String str);
-	//public native static String method_to_string(/* ICalPropertyMethod */ int method);
-
-	//public native static String enum_to_string(int e);
-	//public native static int string_to_enum(String str);
-
-	//public native static String status_to_string(/* ICalPropertyStatus */ int status);
-	//public native static /* ICalPropertyStatus */ int string_to_status(String str);
-
-	//public native static int enum_belongs_to_property(/* ICalPropertyKind */ int kind, int e);
-
-	/* ACTION */
-	public native void set_action(/* ICalPropertyAction */ int v);
-	public native /* ICalPropertyAction */ int get_action();
-
-	/* ATTACH */
-	//void set_attach(struct icalattachtype v);
-	//struct icalattachtype get_attach();
-
-	/* ATTENDEE */
-	public native void set_attendee(String val);
-	public native String get_attendee();
-
-	/* CALSCALE */
-	//public native void set_calscale(String val);
-	//public native String get_calscale();
-
-	/* CATEGORIES */
-	//public native void set_categories(String val);
-	//public native String get_categories();
-
-	/* CLASS */
-	//public native void set_class(String val);
-	//public native String get_class();
-
-	/* COMMENT */
-	public native void set_comment(String val);
-	public native String get_comment();
-
-	/* COMPLETED */
-	//void set_completed(ICalTimeType val);
-	//ICalTimeType get_completed();
-
-	/* CONTACT */
-	//public native void set_contact(String val);
-	//public native String get_contact();
-
-	/* CREATED */
-	//void set_created(ICalTimeType val);
-	//ICalTimeType get_created();
-
-	/* DESCRIPTION */
-	public native void set_description(String val);
-	public native String get_description();
-
-	/* DTEND */
-	public native void set_dtend(ICalTimeType val);
-	public native ICalTimeType get_dtend();
-
-	/* DTSTAMP */
-	public native void set_dtstamp(ICalTimeType val);
-	public native ICalTimeType get_dtstamp();
-
-	/* DTSTART */
-	public native void set_dtstart(ICalTimeType val);
-	public native ICalTimeType get_dtstart();
-
-	/* DUE */
-	public native void set_due(ICalTimeType val);
-	public native ICalTimeType get_due();
-
-	/* DURATION */
-	public native void set_duration(ICalDurationType val);
-	public native ICalDurationType get_duration();
-
-	/* EXDATE */
-	public native void set_exdate(ICalTimeType val);
-	public native ICalTimeType get_exdate();
-
-	/* EXRULE */
-	public native void set_exrule(ICalRecurrenceType val);
-	public native ICalRecurrenceType get_exrule();
-
-	/* EXPAND */
-	public void set_expand(int val) {} // @-@:p0 TMA TODO
-	public int get_expand() {return 0;} // @-@:p0 TMA TODO
-
-	/* FREEBUSY */
-	public native void set_freebusy(ICalPeriodType val);
-	public native ICalPeriodType get_freebusy();
-
-	/* GEO */
-	//void set_geo(struct icalgeotype val);
-	//struct icalgeotype get_geo();
-
-	/* LAST-MODIFIED */
-	//void set_lastmodified(ICalTimeType val);
-	//ICalTimeType get_lastmodified();
-
-	/* LOCATION */
-	public native void set_location(String val);
-	public native String get_location();
-
-	/* MAXRESULTS */
-	//public native void set_maxresults(int val);
-	//public native int get_maxresults();
-
-	/* MAXRESULTSSIZE */
-	//public native void set_maxresultsize(int val);
-	//public native int get_maxresultsize();
-
-	/* METHOD */
-	public native void set_method(/* ICalPropertyMethod */ int val);
-	public native /* ICalPropertyMethod */ int get_method();
-
-	/* ORGANIZER */
-	public native void set_organizer(String val);
-	public native String get_organizer();
-
-	/* OWNER */
-	public native void set_owner(String val);
-	public native String get_owner();
-
-	/* PERCENT-COMPLETE */
-	//void set_percentcomplete(int val);
-	//int get_percentcomplete();
-
-	/* PRIORITY */
-	//void set_priority(int val);
-	//int get_priority();
-
-	/* PRODID */
-	public native void set_prodid(String val);
-	public native String get_prodid();
-
-	/* QUERY */
-	public native void set_query(String val);
-	public native String get_query();
-
-	/* QUERYNAME */
-	public native void set_queryname(String val);
-	public native String get_queryname();
-
-	/* RDATE */
-	//void set_rdate(struct icaldatetimeperiodtype val);
-	//struct icaldatetimeperiodtype get_rdate();
-
-	/* RECURRENCE-ID */
-	public native  void set_recurrenceid(ICalTimeType val);
-	public native  ICalTimeType get_recurrenceid();
-
-	/* RELATED-TO */
-	//public native void set_relatedto(String val);
-	//public native String get_relatedto();
-
-        /* RELCALID */
-        public native void set_relcalid(String val);
-        public native String get_relcalid();
-
-	/* REPEAT */
-	public native void set_repeat(int val);
-	public native int get_repeat();
-
-	/* REQUEST-STATUS */
-	//public native void set_requeststatus(String val);
-	//public native String get_requeststatus();
-
-	/* RESOURCES */
-	//public native void set_resources(String val);
-	//public native String get_resources();
-
-	/* RRULE */
-	public native void set_rrule(ICalRecurrenceType val);
-	public native ICalRecurrenceType get_rrule();
-
-	/* SCOPE */
-	//public native void set_scope(String val);
-	//public native String get_scope();
-
-	/* SEQUENCE */
-	//public native void set_sequence(int val);
-	//public native int get_sequence();
-
-	/* STATUS */
-	public native void set_status(/* ICalPropertyStatus */ int val);
-	public native /* ICalPropertyStatus */ int get_status();
-
-	/* SUMMARY */
-	public native void set_summary(String val);
-	public native String get_summary();
-
-	/* TARGET */
-	public native void set_target(String val);
-	public native String get_target();
-
-	/* TRANSP */
-	//public native void set_transp(String val);
-	//public native String get_transp();
-
-	/* TRIGGER */
-	public native void set_trigger(ICalTriggerType val);
-	public native ICalTriggerType get_trigger();
-
-	/* TZID */
-	public native void set_tzid(String val);
-	public native String get_tzid();
-
-	/* TZNAME */
-	//public native void set_tzname(String val);
-	//public native String get_tzname();
-
-	/* TZOFFSETFROM */
-	//public native void set_tzoffsetfrom(int val);
-	//public native int get_tzoffsetfrom();
-
-
-	/* TZOFFSETTO */
-	//public native void set_tzoffsetto(int val);
-	//public native int get_tzoffsetto();
-
-	/* TZURL */
-	//public native void set_tzurl(String val);
-	//public native String get_tzurl();
-
-	/* UID */
-	public native void set_uid(String val);
-	public native String get_uid();
-
-	/* URL */
-	//public native void set_url(String val);
-	//public native String get_url();
-
-	/* VERSION */
-	//public native void set_version(String val);
-	//public native String get_version();
-
-	/* X */
-	//void set_x(String val);
-	//String get_x();
-
-	/* X-LIC-CLUSTERCOUNT */
-	//void set_xlicclustercount(String val);
-	//String get_xlicclustercount();
-
-	/* X-LIC-ERROR */
-	//void set_xlicerror(String val);
-	//String get_xlicerror();
-
-	/* X-LIC-MIMECHARSET */
-	//void set_xlicmimecharset(String val);
-	//String get_xlicmimecharset();
-
-	/* X-LIC-MIMECID */
-	//void set_xlicmimecid(String val);
-	//String get_xlicmimecid();
-
-	/* X-LIC-MIMECONTENTTYPE */
-	//void set_xlicmimecontenttype(String val);
-	//String get_xlicmimecontenttype();
-
-	/* X-LIC-MIMEENCODING */
-	//void set_xlicmimeencoding(String val);
-	//String get_xlicmimeencoding();
-
-	/* X-LIC-MIMEFILENAME */
-	//void set_xlicmimefilename(String val);
-	//String get_xlicmimefilename();
-
-	/* X-LIC-MIMEOPTINFO */
-	//void set_xlicmimeoptinfo(String val);
-	//String get_xlicmimeoptinfo();
-
-	/**
-	 * init the native class
-	 */
-	private void init(long obj)
-	{
-		m_Obj = obj;
-	}
-
-	private native void init();
-	private native void init(String str);
-	private native void init(/* ICalPropertyKind */ int kind);
-
-	/**
-	 * load the jni library for this class
-	 */
-	static {
-		System.loadLibrary("ical_jni");
-	}
-
-	public static void main(String[] args)
-	{
-		System.out.println("*** ICalProperty main called ok.");
-	}
-
-	/** pointer to C++ object  */
-	private long	m_Obj = 0;
-}
diff --git a/libical/src/java/ICalRecurrenceType.java b/libical/src/java/ICalRecurrenceType.java
deleted file mode 100644
index cfe27911ab..0000000000
--- a/libical/src/java/ICalRecurrenceType.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*======================================================================
- FILE: ICalRecurrenceType.java
- CREATOR: structConverter 01/11/02
-======================================================================*/
-
-package net.cp.jlibical;
-
-public class ICalRecurrenceType
-{
-	public interface ICalRecurrenceTypeFrequency
-	{
-		int ICAL_SECONDLY_RECURRENCE=0;
-		int ICAL_MINUTELY_RECURRENCE=1;
-		int ICAL_HOURLY_RECURRENCE=2;
-		int ICAL_DAILY_RECURRENCE=3;
-		int ICAL_WEEKLY_RECURRENCE=4;
-		int ICAL_MONTHLY_RECURRENCE=5;
-		int ICAL_YEARLY_RECURRENCE=6;
-    		int ICAL_NO_RECURRENCE=7;
-	}
-
-	public interface ICalRecurrenceTypeWeekday
-	{
-		int ICAL_NO_WEEKDAY=0;
-		int ICAL_SUNDAY_WEEKDAY=1;
-		int ICAL_MONDAY_WEEKDAY=2;
-		int ICAL_TUESDAY_WEEKDAY=3;
-		int ICAL_WEDNESDAY_WEEKDAY=4;
-		int ICAL_THURSDAY_WEEKDAY=5;
-		int ICAL_FRIDAY_WEEKDAY=6;
-    		int ICAL_SATURDAY_WEEKDAY=7;
-	}
-
-	ICalRecurrenceType(long obj)
-	{
-		init(obj);
-	}
-
-	public ICalRecurrenceType()
-	{
-	}
-
-	public void setUntil(ICalTimeType lcl_arg0)
-	{
-		until = lcl_arg0;
-	}
-	public ICalTimeType getUntil()
-	{
-		return until;
-	}
-
-	public void setFreq(int lcl_arg0)
-	{
-		freq = lcl_arg0;
-	}
-	public int getFreq()
-	{
-		return freq;
-    }
-
-	public void setWeek_start(int lcl_arg0)
-	{
-		week_start = lcl_arg0;
-	}
-	public int getWeek_start()
-	{
-		return week_start;
-    }
-
-    public void setCount(int lcl_arg0)
-    {
-		count = lcl_arg0;
-    }
-    public int getCount()
-    {
-		return count;
-    }
-
-    public void setInterval(short lcl_arg0)
-    {
-		interval = lcl_arg0;
-    }
-    public short getInterval()
-    {
-		return interval;
-    }
-
-    public void setBy_second(short[] lcl_arg0)
-    {
-		by_second = lcl_arg0;
-    }
-
-    public void setBy_secondIndexed(int ix,short lcl_arg0)
-    {
-		by_second[ix] = lcl_arg0;
-    }
-    public short[] getBy_second()
-    {
-		return by_second;
-    }
-    public short getBy_secondIndexed(int ix)
-    {
-		return by_second[ix];
-    }
-
-    public void setBy_minute(short[] lcl_arg0)
-    {
-		by_minute = lcl_arg0;
-    }
-
-    public void setBy_minuteIndexed(int ix,short lcl_arg0)
-    {
-		by_minute[ix] = lcl_arg0;
-    }
-    public short[] getBy_minute()
-    {
-		return by_minute;
-    }
-    public short getBy_minuteIndexed(int ix)
-    {
-		return by_minute[ix];
-    }
-
-    public void setBy_hour(short[] lcl_arg0)
-    {
-		by_hour = lcl_arg0;
-    }
-
-    public void setBy_hourIndexed(int ix,short lcl_arg0)
-    {
-		by_hour[ix] = lcl_arg0;
-    }
-    public short[] getBy_hour()
-    {
-		return by_hour;
-    }
-    public short getBy_hourIndexed(int ix)
-    {
-		return by_hour[ix];
-    }
-
-    public void setBy_day(short[] lcl_arg0)
-    {
-		by_day = lcl_arg0;
-    }
-
-    public void setBy_dayIndexed(int ix,short lcl_arg0)
-    {
-		by_day[ix] = lcl_arg0;
-    }
-    public short[] getBy_day()
-    {
-		return by_day;
-    }
-    public short getBy_dayIndexed(int ix)
-    {
-		return by_day[ix];
-    }
-
-    public void setBy_month_day(short[] lcl_arg0)
-    {
-		by_month_day = lcl_arg0;
-    }
-
-    public void setBy_month_dayIndexed(int ix,short lcl_arg0)
-    {
-		by_month_day[ix] = lcl_arg0;
-    }
-    public short[] getBy_month_day()
-    {
-		return by_month_day;
-    }
-    public short getBy_month_dayIndexed(int ix)
-    {
-		return by_month_day[ix];
-    }
-
-    public void setBy_year_day(short[] lcl_arg0)
-    {
-		by_year_day = lcl_arg0;
-    }
-
-    public void setBy_year_dayIndexed(int ix,short lcl_arg0)
-    {
-		by_year_day[ix] = lcl_arg0;
-    }
-    public short[] getBy_year_day()
-    {
-		return by_year_day;
-    }
-    public short getBy_year_dayIndexed(int ix)
-    {
-		return by_year_day[ix];
-    }
-
-    public void setBy_week_no(short[] lcl_arg0)
-    {
-		by_week_no = lcl_arg0;
-    }
-
-    public void setBy_week_noIndexed(int ix,short lcl_arg0)
-    {
-		by_week_no[ix] = lcl_arg0;
-    }
-    public short[] getBy_week_no()
-    {
-		return by_week_no;
-    }
-    public short getBy_week_noIndexed(int ix)
-    {
-		return by_week_no[ix];
-    }
-
-    public void setBy_month(short[] lcl_arg0)
-    {
-		by_month = lcl_arg0;
-    }
-
-    public void setBy_monthIndexed(int ix,short lcl_arg0)
-    {
-		by_month[ix] = lcl_arg0;
-    }
-    public short[] getBy_month()
-    {
-		return by_month;
-    }
-    public short getBy_monthIndexed(int ix)
-    {
-		return by_month[ix];
-    }
-
-    public void setBy_set_pos(short[] lcl_arg0)
-    {
-		by_set_pos = lcl_arg0;
-    }
-
-    public void setBy_set_posIndexed(int ix,short lcl_arg0)
-    {
-		by_set_pos[ix] = lcl_arg0;
-    }
-    public short[] getBy_set_pos()
-    {
-		return by_set_pos;
-    }
-    public short getBy_set_posIndexed(int ix)
-    {
-		return by_set_pos[ix];
-    }
-
-	private native void init(long obj);
-
-    private native static void initFIDs();
-
-    static {
-		System.loadLibrary("ical_jni");
-		initFIDs();
-    }
-
-	private /* ICalRecurrenceTypeFrequency */ int freq;
-	private /* ICalRecurrenceTypeWeekday */ int week_start;
-	private int	count;
-	private short	interval;
-	private short[]	by_second = new short[ICAL_BY_SECOND_SIZE];		//  Converted from short[61]
-	private short[]	by_minute = new short[ICAL_BY_MINUTE_SIZE];		//  Converted from short[61]
-	private short[]	by_hour = new short[ICAL_BY_HOUR_SIZE];		//  Converted from short[25]
-	private short[] by_day = new short[ICAL_BY_DAY_SIZE];			//  Converted from short[364]
-	private short[]	by_month_day = new short[ICAL_BY_MONTHDAY_SIZE];	//  Converted from short[32]
-	private short[]	by_year_day = new short[ICAL_BY_YEARDAY_SIZE];	//  Converted from short[367]
-	private short[]	by_week_no = new short[ICAL_BY_WEEKNO_SIZE];		//  Converted from short[54]
-	private short[]	by_month = new short[ICAL_BY_MONTH_SIZE];		//  Converted from short[13]
-	private short[]	by_set_pos = new short[ICAL_BY_SETPOS_SIZE];		//  Converted from short[367]
-	private ICalTimeType		until = new ICalTimeType();
-
-	public static final int ICAL_BY_SECOND_SIZE  	= 61;
-	public static final int ICAL_BY_MINUTE_SIZE 	= 61;
-	public static final int ICAL_BY_HOUR_SIZE 		= 25;
-	public static final int ICAL_BY_DAY_SIZE 		= 364;
-	public static final int ICAL_BY_MONTHDAY_SIZE 	= 32;
-	public static final int ICAL_BY_YEARDAY_SIZE 	= 367;
-	public static final int ICAL_BY_WEEKNO_SIZE 	= 54;
-	public static final int ICAL_BY_MONTH_SIZE 		= 13;
-	public static final int ICAL_BY_SETPOS_SIZE 	= 367;
-}
-
diff --git a/libical/src/java/ICalTimeType.java b/libical/src/java/ICalTimeType.java
deleted file mode 100644
index cf4ee40747..0000000000
--- a/libical/src/java/ICalTimeType.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*======================================================================
- FILE: ICalTimeType.java
- CREATOR: structConverter 01/11/02
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-package net.cp.jlibical;
-
-/** struct icaltimetype */
-public class ICalTimeType
-{
-	/**
-	 * Constructor for pre-existing native icaltimetype
-	 * @param obj c++ pointer
-	 */
-	ICalTimeType(long obj)
-	{
-		init(obj);
-	}
-
-	/**
-	 * Constructor for default ICalTimeType
-	 */
-	public ICalTimeType()
-	{
-	}
-
-    public void setYear(int lcl_arg0)
-    {
-	year = lcl_arg0;
-    }
-    public int getYear()
-    {
-	return year;
-    }
-
-    public void setMonth(int lcl_arg0)
-    {
-	month = lcl_arg0;
-    }
-    public int getMonth()
-    {
-	return month;
-    }
-
-    public void setDay(int lcl_arg0)
-    {
-	day = lcl_arg0;
-    }
-    public int getDay()
-    {
-	return day;
-    }
-
-    public void setHour(int lcl_arg0)
-    {
-	hour = lcl_arg0;
-    }
-    public int getHour()
-    {
-	return hour;
-    }
-
-    public void setMinute(int lcl_arg0)
-    {
-	minute = lcl_arg0;
-    }
-    public int getMinute()
-    {
-	return minute;
-    }
-
-    public void setSecond(int lcl_arg0)
-    {
-	second = lcl_arg0;
-    }
-    public int getSecond()
-    {
-	return second;
-    }
-
-    public void setIs_utc(boolean lcl_arg0)
-    {
-	is_utc = lcl_arg0 ? 1 : 0;
-    }
-    public boolean getIs_utc()
-    {
-	return is_utc == 0 ? false : true;
-    }
-
-    public void setIs_date(boolean lcl_arg0)
-    {
-	is_date = lcl_arg0 ? 1 : 0;
-    }
-    public boolean getIs_date()
-    {
-	return is_date == 0 ? false : true;
-    }
-
-    public void setZone(String lcl_arg0)
-    {
-	zone = lcl_arg0;
-    }
-    public String getZone()
-    {
-	return zone;
-    }
-
-	// --------------------------------------------------------
-	// Initialization
-	// --------------------------------------------------------
-
-	/**
-	 * copy data from an existing struct.
-	 */
-	private native void init(long obj);
-
-	/**
-	 * optimization: init field id cache,
-	 */
-    private native static void initFIDs();
-
-	/**
-	 * load the jni library for this class
-	 */
-	static {
-		System.loadLibrary("ical_jni");
-		initFIDs();
-	}
-
-	// --------------------------------------------------------
-	// Fields
-	// --------------------------------------------------------
-
-    private int	month;
-    private int	day;
-    private int	year;
-    private int	hour;
-    private int	minute;
-    private int	second;
-    private int	is_utc;
-    private int	is_date;
-    private String	zone = new String();	//   Converted from char*
-}
-
diff --git a/libical/src/java/ICalTriggerType.java b/libical/src/java/ICalTriggerType.java
deleted file mode 100644
index e2ef7a72e0..0000000000
--- a/libical/src/java/ICalTriggerType.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*======================================================================
- FILE: ICalTriggerType.java
- CREATOR: structConverter 01/11/02
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-package net.cp.jlibical;
-
-/** struct icaltriggertype */
-public class ICalTriggerType
-{
-	/**
-	 * Constructor for pre-existing native icaltriggertype
-	 * @param obj c++ pointer
-	 */
-	ICalTriggerType(long obj)
-	{
-		init(obj);
-	}
-
-	/**
-	* Constructor for pre-existing native icaltriggertype
-	* @param aTime c++ pointer
-	* @param aDuration c++ pointer
-	*/
-	ICalTriggerType(long aTime, long aDuration)
-	{
-		init(aTime, aDuration);
-	}
-
-	/**
-	* Constructor for default ICalTriggerType
-	*/
-	public ICalTriggerType()
-	{
-	}
-
-	public void setTime(ICalTimeType lcl_arg0)
-	{
-		time = lcl_arg0;
-	}
-	public ICalTimeType getTime()
-	{
-		return time;
-	}
-
-	public void setDuration(ICalDurationType lcl_arg0)
-	{
-		duration = lcl_arg0;
-	}
-	public ICalDurationType getDuration()
-	{
-		return duration;
-	}
-
-	// --------------------------------------------------------
-	// Initialization
-	// --------------------------------------------------------
-
-	/**
-	* init with a native object
-	*/
-	private void init(long aTime, long aDuration)
-	{
-		time = new ICalTimeType(aTime);
-		duration = new ICalDurationType(aDuration);
-	}
-
-	/**
-	 * copy data from an existing struct.
-	 */
-	private native void init(long obj);
-
-	/**
-	* optimization: init field id cache,
-	*/
-	private native static void initFIDs();
-
-	/**
-	* load the jni library for this class
-	*/
-	static {
-		System.loadLibrary("ical_jni");
-		initFIDs();
-	}
-
-	// --------------------------------------------------------
-	// Fields
-	// --------------------------------------------------------
-	private ICalTimeType		time = new ICalTimeType();
-	private ICalDurationType	duration = new ICalDurationType();
-}
-
diff --git a/libical/src/java/ICalValue.java b/libical/src/java/ICalValue.java
deleted file mode 100644
index dbe2b8aeee..0000000000
--- a/libical/src/java/ICalValue.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*======================================================================
- FILE: ICalValue.java
- CREATOR: gnorman 01/10/02
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-package net.cp.jlibical;
-
-public class ICalValue 
-{
-	/** It's not typesafe, but it's simple to understand! */
-	public interface ICalValueKind 
-	{
-		// icalvalue_kind
-		int ICAL_ANY_VALUE=5000;
-		int ICAL_BOOLEAN_VALUE=5001;
-		int ICAL_UTCOFFSET_VALUE=5002;
-		int ICAL_RECUR_VALUE=5003;
-		int ICAL_METHOD_VALUE=5004;
-		int ICAL_CALADDRESS_VALUE=5005;
-		int ICAL_PERIOD_VALUE=5006;
-		int ICAL_STATUS_VALUE=5007;
-		int ICAL_BINARY_VALUE=5008;
-		int ICAL_TEXT_VALUE=5009;
-		int ICAL_DATETIMEDATE_VALUE=5010;
-		int ICAL_DURATION_VALUE=5011;
-		int ICAL_DATETIMEPERIOD_VALUE=5012;
-		int ICAL_INTEGER_VALUE=5013;
-		int ICAL_TIME_VALUE=5014;
-		int ICAL_URI_VALUE=5015;
-		int ICAL_TRIGGER_VALUE=5016;
-		int ICAL_ATTACH_VALUE=5017;
-		int ICAL_CLASS_VALUE=5018;
-		int ICAL_FLOAT_VALUE=5019;
-		int ICAL_QUERY_VALUE=5020;
-		int ICAL_STRING_VALUE=5021;
-		int ICAL_TRANSP_VALUE=5022;
-		int ICAL_X_VALUE=5023;
-		int ICAL_DATETIME_VALUE=5024;
-		int ICAL_GEO_VALUE=5025;
-		int ICAL_DATE_VALUE=5026;
-		int ICAL_ACTION_VALUE=5027;
-		int ICAL_NO_VALUE=5028;
-	}
-
-	/**
-	* Constructor for ICalValue
-	* @param obj c++ pointer
-	*/
-	private ICalValue(long obj)
-	{
-		init(obj);
-	}
-
-	public ICalValue()
-	{
-		init();
-	}
-
-	public ICalValue(/* ICalValueKind */ int kind)
-	{
-		init(kind);
-	}
-
-	public ICalValue(/* ICalValueKind */ int kind, String  str)
-	{
-		init(kind,str);
-	}
-
-	public native String as_ical_string();
-	//public native boolean is_valid();
-	public native /* ICalValueKind */ int isa();
-	public native boolean isa_value(Object value);
-
-	/* Special, non autogenerated value accessors */
-	//void set_recur(struct icalrecurrencetype v);
-	//struct icalrecurrencetype get_recur();
-
-	public native void set_trigger(ICalTriggerType v);
-	public native ICalTriggerType get_trigger();
-
-	//void set_datetimeperiod(struct icaldatetimeperiodtype v);
-	//struct icaldatetimeperiodtype get_datetimeperiod();
-
-	//public native static /* ICalParameterXLicCompareType */ int compare(ICalValue a, ICalValue b);
-
-	/* Convert enumerations */
-	//public native static /* ICalValueKind */ int string_to_kind(String str);
-	//public native String kind_to_string(/* ICalValueKind */ int kind);
-
-	/* BOOLEAN */
-	//public native int get_boolean();
-	//public native void set_boolean(int v);
-
-	/* UTC-OFFSET */
-	//public native int get_utcoffset();
-	//public native void set_utcoffset(int v);
-
-	/* METHOD */
-	public native /* ICalPropertyMethod */ int get_method();
-	public native void set_method(/* ICalPropertyMethod */ int v);
-
-	/* CAL-ADDRESS */
-	//public native String get_caladdress();
-	//public native void set_caladdress(String  v);
-
-	/* PERIOD */
-	//struct icalperiodtype get_period();
-	//void set_period(struct icalperiodtype v);
-
-	/* STATUS */
-	//public native /* ICalPropertyStatus */ int get_status();
-	//public native void set_status(/* ICalPropertyStatus */ int v);
-
-	/* BINARY */
-	//public native String get_binary();
-	//public native void set_binary(String  v);
-
-	/* TEXT */
-	public native String get_text();
-	public native void set_text(String  v);
-
-	/* DATE-TIME-DATE */
-	//ICalTimeType get_datetimedate();
-	//void set_datetimedate(ICalTimeType v);
-
-	/* DURATION */
-	public native ICalDurationType get_duration();
-	public native void set_duration(ICalDurationType v);
-
-	/* INTEGER */
-	//public native int get_integer();
-	//public native void set_integer(int v);
-
-	/* TIME */
-	//ICalTimeType get_time();
-	//void set_time(ICalTimeType v);
-
-	/* URI */
-	//public native String get_uri();
-	//public native void set_uri(String  v);
-
-	/* ATTACH */
-	//struct icalattachtype get_attach();
-	//void set_attach(struct icalattachtype v);
-
-	/* CLASS */
-	//public native /* ICalPropertyClass */ int get_class();
-	//public native void set_class(/* ICalPropertyClass */ int v);
-
-	/* FLOAT */
-	//public native float get_float();
-	//public native void set_float(float v);
-
-	/* QUERY */
-	public native String get_query();
-	public native void set_query(String  v);
-
-	/* STRING */
-	//public native String get_string();
-	//public native void set_string(String  v);
-
-	/* TRANSP */
-	//public native /* ICalPropertyTransp */ int get_transp();
-	//public native void set_transp(/* ICalPropertyTransp */ int v);
-
-	/* DATE-TIME */
-	public native ICalTimeType get_datetime();
-	public native void set_datetime(ICalTimeType v);
-
-	/* GEO */
-	//struct icalgeotype get_geo();
-	//void set_geo(struct icalgeotype v);
-
-	/* DATE */
-	//ICalTimeType get_date();
-	//void set_date(ICalTimeType v);
-
-	/* ACTION */
-	public native /* ICalPropertyAction */ int get_action();
-	public native void set_action(/* ICalPropertyAction */ int v);
-
-	/**
-	 * init the native class
-	 */
-	private void init(long obj)
-	{
-		m_Obj = obj;
-	}
-
-	private native void init();
-	private native void init(/* ICalValueKind */ int kind, String str);
-	private native void init(/* ICalValueKind */ int kind);
-
-	/**
-	 * load the jni library for this class
-	 */
-	static {
-		System.loadLibrary("ical_jni");
-	}
-
-	public static void main(String[] args)
-	{
-		System.out.println("*** ICalValue main called ok.");
-	}
-
-	/** pointer to C++ object  */
-	private long	m_Obj = 0;
-}
diff --git a/libical/src/java/Makefile.am b/libical/src/java/Makefile.am
deleted file mode 100644
index 6105b7ae5b..0000000000
--- a/libical/src/java/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-lib_LTLIBRARIES = libical_jni.la
-
-INCLUDES = -I../libical -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(JAVA_PLATFORM)
-
-libical_jni_la_LDFLAGS = -no-defined -version-info 0:0:0
-
-libical_jni_la_LIBADD = 			\
-	../libical/libical_cxx.la
-
-libical_jni_la_SOURCES =			\
-	jlibical_consts_cxx.h			\
-	jlibical_utils_cxx.cpp			\
-	jlibical_utils_cxx.h			\
-	jniICalDurationType_cxx.cpp		\
-	jniICalDurationType_cxx.h		\
-	jniICalPeriodType_cxx.cpp		\
-	jniICalPeriodType_cxx.h			\
-	jniICalRecurrenceType_cxx.cpp		\
-	jniICalRecurrenceType_cxx.h		\
-	jniICalTimeType_cxx.cpp			\
-	jniICalTimeType_cxx.h			\
-	jniICalTriggerType_cxx.cpp		\
-	jniICalTriggerType_cxx.h		\
-	net_cp_jlibical_ICalParameter_cxx.cpp	\
-	net_cp_jlibical_ICalParameter_cxx.h	\
-	net_cp_jlibical_ICalProperty_cxx.cpp	\
-	net_cp_jlibical_ICalProperty_cxx.h	\
-	net_cp_jlibical_ICalValue_cxx.cpp	\
-	net_cp_jlibical_ICalValue_cxx.h		\
-	net_cp_jlibical_VComponent_cxx.cpp	\
-	net_cp_jlibical_VComponent_cxx.h
-
-java_JAVA=\
-ICalDurationType.java    ICalTriggerType.java     VEvent.java\
-ICalParameter.java       ICalValue.java           VFreeBusy.java\
-ICalPeriodType.java      VAgenda.java             VQuery.java\
-ICalProperty.java        VAlarm.java              VToDo.java\
-ICalRecurrenceType.java  VCalendar.java           \
-ICalTimeType.java        VComponent.java
-
-data_DATA = libical.jar
-
-libical.jar: classjava.stamp
-	(cd $(top_builddir); $(JAR) cf src/java/libical.jar net)
-
-jlibical_jniincludedir = $(includedir)
-
-TESTS = testjni.sh
-
-testjni.sh:
-	echo "$(JAVA) -Djava.library.path=@prefix@/lib -classpath $(JAVA_HOME)/lib/classes.zip:@prefix@/lib/libical.jar net.cp.jlibical.testjni" > testjni.sh && chmod a+x testjni.sh
diff --git a/libical/src/java/VAgenda.java b/libical/src/java/VAgenda.java
deleted file mode 100644
index 8b85fe11c2..0000000000
--- a/libical/src/java/VAgenda.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*======================================================================
- FILE: VAgenda.java
- CREATOR: fnguyen 01/11/02
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-package net.cp.jlibical;
-
-public class VAgenda extends VComponent {
-	public VAgenda()
-	{
-		super(ICalComponentKind.ICAL_VAGENDA_COMPONENT);
-	}	
-
-	public VAgenda(long obj)
-	{
-		super(obj);
-	}
-
-	public VAgenda(String str)
-	{
-		super(str);
-	}
-}
diff --git a/libical/src/java/VAlarm.java b/libical/src/java/VAlarm.java
deleted file mode 100644
index d7693f7622..0000000000
--- a/libical/src/java/VAlarm.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*======================================================================
- FILE: VAlarm.java
- CREATOR: fnguyen 01/11/02
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-package net.cp.jlibical;
-
-public class VAlarm extends VComponent {
-	public VAlarm()
-	{
-		super(ICalComponentKind.ICAL_VALARM_COMPONENT);
-	}
-	
-	public VAlarm(long obj)
-	{
-		super(obj);
-	}
-
-	public VAlarm(String str)
-	{
-		super(str);
-	}
-}
diff --git a/libical/src/java/VCalendar.java b/libical/src/java/VCalendar.java
deleted file mode 100644
index 4cfcad2709..0000000000
--- a/libical/src/java/VCalendar.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*======================================================================
- FILE: VCalendar.java
- CREATOR: echoi 01/28/02
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-package net.cp.jlibical;
-
-public class VCalendar extends VComponent {
-	public VCalendar()
-	{
-		super(ICalComponentKind.ICAL_VCALENDAR_COMPONENT);
-	}	
-
-	public VCalendar(long obj)
-	{
-		super(obj);
-	}
-
-	public VCalendar(String str)
-	{
-		super(str);
-	}
-}
diff --git a/libical/src/java/VComponent.java b/libical/src/java/VComponent.java
deleted file mode 100644
index 70c5915c91..0000000000
--- a/libical/src/java/VComponent.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*======================================================================
- FILE: VComponent.java
- CREATOR: gnorman 01/11/02
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-package net.cp.jlibical;
-
-public class VComponent
-{
-	/** It's not typesafe, but it's simple to understand! */
-	public interface ICalComponentKind
-	{
-		// icalcomponent_kind
-		int ICAL_NO_COMPONENT = 0;
-		int ICAL_ANY_COMPONENT = 1;
-		int ICAL_XROOT_COMPONENT = 2;
-		int ICAL_XATTACH_COMPONENT = 3;
-		int ICAL_VEVENT_COMPONENT = 4;
-		int ICAL_VTODO_COMPONENT = 5;
-		int ICAL_VJOURNAL_COMPONENT = 6;
-		int ICAL_VCALENDAR_COMPONENT = 7;
-		int ICAL_VAGENDA_COMPONENT = 8;
-		int ICAL_VFREEBUSY_COMPONENT = 9;
-		int ICAL_VALARM_COMPONENT = 10;
-		int ICAL_XAUDIOALARM_COMPONENT = 11;
-		int ICAL_XDISPLAYALARM_COMPONENT = 12;
-		int ICAL_XEMAILALARM_COMPONENT = 13;
-		int ICAL_XPROCEDUREALARM_COMPONENT = 14;
-		int ICAL_VTIMEZONE_COMPONENT = 15;
-		int ICAL_XSTANDARD_COMPONENT = 16;
-		int ICAL_XDAYLIGHT_COMPONENT = 17;
-		int ICAL_X_COMPONENT = 18;
-		int ICAL_VSCHEDULE_COMPONENT = 19;
-		int ICAL_VQUERY_COMPONENT = 20;
-		int ICAL_VCOMMAND_COMPONENT = 21;
-		int ICAL_XLICINVALID_COMPONENT = 22;
-		int ICAL_XLICMIMEPART_COMPONENT = 23;
-		int ICAL_XPREFERENCES_COMPONENT = 24;
-	}
-
-	/**
-	 * Constructor for VComponent
-	 * @param obj c++ pointer
-	 */
-	protected VComponent(long obj)
-	{
-		init(obj);
-	}
-
-	public VComponent()
-	{
-		init();
-	}
-
-	public VComponent(/* ICalComponentKind */ int kind)
-	{
-		init(kind);
-	}
-
-	public VComponent(String str)
-	{
-		init(str);
-	}
-
-	public native String as_ical_string();
-	//public native boolean is_valid();
-	public native /* ICalComponentKind */ int isa();
-	public native boolean isa_component(Object component);
-
-	/* Working with properties */
-	public native void add_property(ICalProperty property);
-	public native void remove_property(ICalProperty property);
-	public native int count_properties(/* ICalPropertyKind */ int kind);
-
-	/* Iterate through the properties */
-	public native ICalProperty get_current_property();
-	public native ICalProperty get_first_property(/* ICalPropertyKind */ int kind);
-	public native ICalProperty get_next_property(/* ICalPropertyKind */ int kind);
-
-	/* Working with components */
-
-	/* Return the first VEVENT, VTODO or VJOURNAL sub-component if it is one of those types */
-	public native VComponent get_inner();
-
-	public native void add_component(VComponent child);
-	public native void remove_component(VComponent child);
-	public native int count_components(/* ICalComponentKind */ int kind);
-
-	/* Iteration Routines. There are two forms of iterators, internal and
-	   external. The internal ones came first, and are almost completely
-	   sufficient, but they fail badly when you want to construct a loop that
-	   removes components from the container.
-	*/
-
-	/* Iterate through components */
-	public native VComponent get_current_component();
-	public native VComponent get_first_component(/* ICalComponentKind */ int kind);
-	public native VComponent get_next_component(/* ICalComponentKind */ int kind);
-
-	/* Using external iterators */
-	//public native icalcompiter begin_component(/* ICalComponentKind */ int kind);
-	//public native icalcompiter end_component(/* ICalComponentKind */ int kind);
-	//public native VComponent next(icalcompiter i);
-	//public native VComponent prev(icalcompiter i);
-	//public native VComponent current(icalcompiter i);
-
-	/* Working with embedded error properties */
-	//public native int count_errors();
-
-	/* Remove all X-LIC-ERROR properties*/
-	//public native void strip_errors();
-
-	/* Convert some X-LIC-ERROR properties into RETURN-STATUS properties*/
-	//public native void convert_errors();
-
-	/* Kind conversion routines */
-	//public native static /* ICalComponentKind */ int string_to_kind(String str);
-	//public native static String kind_to_string(/* ICalComponentKind */ int kind);
-
-	public native ICalTimeType get_dtstart();
-	public native void set_dtstart(ICalTimeType v);
-
-	/* For the icalcomponent routines only, dtend and duration are tied
-	   together. If you call the set routine for one and the other exists,
-	   the routine will calculate the change to the other. That is, if
-	   there is a DTEND and you call set_duration, the routine will modify
-	   DTEND to be the sum of DTSTART and the duration. If you call a get
-	   routine for one and the other exists, the routine will calculate
-	   the return value. If you call a set routine and neither exists, the
-	   routine will create the apcompriate comperty */
-
-	public native ICalTimeType get_dtend();
-	public native void set_dtend(ICalTimeType v);
-
-	public native ICalDurationType get_duration();
-	public native void set_duration(ICalDurationType v);
-
-	public native /* ICalPropertyMethod */ int get_method();
-	public native void set_method(/* ICalPropertyMethod */ int method);
-
-	public native ICalTimeType get_dtstamp();
-	public native void set_dtstamp(ICalTimeType v);
-
-	public native String get_summary();
-	public native void set_summary(String v);
-
-	public native String get_location();
-	public native void set_location(String v);
-
-	public native String get_description();
-	public native void set_description(String v);
-
-	//public native String get_comment();
-	//public native void set_comment(String v);
-
-	public native String get_uid();
-	public native void set_uid(String v);
-
-	public native String get_relcalid();
-	public native void set_relcalid(String v);
-
-	public native ICalTimeType get_recurrenceid();
-	public native void set_recurrenceid(ICalTimeType v);
-
-	/* For VCOMPONENT: Return a reference to the first VEVENT, VTODO, or VJOURNAL */
-	public native VComponent get_first_real_component();
-
-	/* For VEVENT, VTODO, VJOURNAL and VTIMEZONE: report the start and end
-	   times of an event in UTC */
-	//public native virtual struct icaltime_span get_span();
-
-	/**
-	 * init the native class
-	 */
-	private void init(long obj)
-	{
-		m_Obj = obj;
-	}
-
-	private native void init();
-	private native void init(String str);
-	private native void init(/* ICalComponentKind */ int kind);
-
-	/**
-	 * load the jni library for this class
-	 */
-	static {
-		System.loadLibrary("ical_jni");
-	}
-
-	public static void main(String[] args)
-	{
-		System.out.println("*** VComponent main called ok.");
-	}
-
-	/** pointer to C++ object  */
-	private long	m_Obj = 0;
-}
diff --git a/libical/src/java/VEvent.java b/libical/src/java/VEvent.java
deleted file mode 100644
index 2017aa58ce..0000000000
--- a/libical/src/java/VEvent.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*======================================================================
- FILE: VEvent.java
- CREATOR: fnguyen 01/11/02
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-package net.cp.jlibical;
-
-public class VEvent extends VComponent {
-	public VEvent()
-	{
-		super(ICalComponentKind.ICAL_VEVENT_COMPONENT);
-	}	
-
-	public VEvent(long obj)
-	{
-		super(obj);
-	}
-
-	public VEvent(String str)
-	{
-		super(str);
-	}
-}
diff --git a/libical/src/java/VFreeBusy.java b/libical/src/java/VFreeBusy.java
deleted file mode 100644
index a781edc59a..0000000000
--- a/libical/src/java/VFreeBusy.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package net.cp.jlibical;
-
-public class VFreeBusy extends VComponent {
-	public VFreeBusy()
-	{
-		super(ICalComponentKind.ICAL_VFREEBUSY_COMPONENT);
-	}	
-
-	public VFreeBusy(long obj)
-	{
-		super(obj);
-	}
-
-	public VFreeBusy(String str)
-	{
-		super(str);
-	}
-}
diff --git a/libical/src/java/VQuery.java b/libical/src/java/VQuery.java
deleted file mode 100644
index e94a07327e..0000000000
--- a/libical/src/java/VQuery.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*======================================================================
- FILE: VQuery.java
- CREATOR: fnguyen 01/11/02
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-package net.cp.jlibical;
-
-public class VQuery extends VComponent {
-	public VQuery()
-	{
-		super(ICalComponentKind.ICAL_VQUERY_COMPONENT);
-	}	
-
-	public VQuery(long obj)
-	{
-		super(obj);
-	}
-
-	public VQuery(String str)
-	{
-		super(str);
-	}
-}
diff --git a/libical/src/java/VToDo.java b/libical/src/java/VToDo.java
deleted file mode 100644
index 9e4a06e1f0..0000000000
--- a/libical/src/java/VToDo.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*======================================================================
- FILE: VToDo.java
- CREATOR: fnguyen 01/11/02
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-package net.cp.jlibical;
-
-public class VToDo extends VComponent {
-	public VToDo()
-	{
-		super(ICalComponentKind.ICAL_VTODO_COMPONENT);
-	}	
-
-	public VToDo(long obj)
-	{
-		super(obj);
-	}
-
-	public VToDo(String str)
-	{
-		super(str);
-	}
-}
diff --git a/libical/src/java/jlibical_consts_cxx.h b/libical/src/java/jlibical_consts_cxx.h
deleted file mode 100644
index 2cdf1f8b5a..0000000000
--- a/libical/src/java/jlibical_consts_cxx.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-/*======================================================================
- FILE: jlibical_consts_cxx/h
- CREATOR: Srinivasa Boppana/George Norman
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-#ifndef JLIBICAL_CONSTS_CXX_H
-#define JLIBICAL_CONSTS_CXX_H
-
-/*
- * Error code constants.
- */
-#define JLIBICAL_OK                         0	/* good return code */
-
-/* system/API errors */
-#define JLIBICAL_ERR_NETWORK                100 /* general network error */
-#define JLIBICAL_ERR_SERVER_INTERNAL        101 /* internal server error (database, file system, etc.) */
-#define JLIBICAL_ERR_CLIENT_INTERNAL        102 /* internal error in client API (memory, parsing errors, etc.)*/
-#define JLIBICAL_ERR_ILLEGAL_ARGUMENT       103 /* incorrect API use */
-#define JLIBICAL_ERR_API_NOT_INITED         104 /* either the InitModule API call was called prior to use of the API or it failed to initialize correctly */
-#define JLIBICAL_ERR_HOST_INVALID           105 /* the host name specified cannot be resolved */
-
-/* Java classes */
-#define JLIBICAL_CLASS_ICALVALUE                "net/cp/jlibical/ICalValue"
-#define JLIBICAL_CLASS_VCOMPONENT               "net/cp/jlibical/VComponent"
-#define JLIBICAL_CLASS_VALARM			"net/cp/jlibical/VAlarm"
-#define JLIBICAL_CLASS_VCALENDAR		"net/cp/jlibical/VCalendar"
-#define JLIBICAL_CLASS_VAGENDA                  "net/cp/jlibical/VAgenda"
-#define JLIBICAL_CLASS_VEVENT			"net/cp/jlibical/VEvent"
-#define JLIBICAL_CLASS_VQUERY			"net/cp/jlibical/VQuery"
-#define JLIBICAL_CLASS_VTODO			"net/cp/jlibical/VToDo"
-#define JLIBICAL_CLASS_ICALPARAMETER            "net/cp/jlibical/ICalParameter"
-#define JLIBICAL_CLASS_ICALPROPERTY             "net/cp/jlibical/ICalProperty"
-
-#define JLIBICAL_CLASS_ICALDURATIONTYPE         "net/cp/jlibical/ICalDurationType"
-#define JLIBICAL_CLASS_ICALTIMETYPE             "net/cp/jlibical/ICalTimeType"
-#define JLIBICAL_CLASS_ICALTRIGGERTYPE          "net/cp/jlibical/ICalTriggerType"
-#define JLIBICAL_CLASS_ICALRECURRENCETYPE       "net/cp/jlibical/ICalRecurrenceType"
-#define JLIBICAL_CLASS_ICALPERIODTYPE      		"net/cp/jlibical/ICalPeriodType"
-
-#endif /* JLIBICAL_CONSTS_CXX_H */
diff --git a/libical/src/java/jlibical_utils_cxx.cpp b/libical/src/java/jlibical_utils_cxx.cpp
deleted file mode 100644
index d06d4ba004..0000000000
--- a/libical/src/java/jlibical_utils_cxx.cpp
+++ /dev/null
@@ -1,458 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: jlibical_utils_cxx.cpp
- CREATOR: Srinivasa Boppana/George Norman
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-#ifndef JLIBICAL_UTILS_CXX_H
-#include "jlibical_utils_cxx.h"
-#endif
-
-#ifndef JLIBICAL_CONSTS_CXX_H
-#include "jlibical_consts_cxx.h"
-#endif
-
-#ifndef ICALPARAMETER_CXX_H
-#include "icalparameter_cxx.h"
-#endif
-
-#ifndef VCOMPONENT_CXX_H
-#include "vcomponent.h"
-#endif
-
-#ifndef ICALPROPERTY_CXX_H
-#include "icalproperty_cxx.h"
-#endif
-
-#ifndef ICALVALUE_CXX_H
-#include "icalvalue_cxx.h"
-#endif
-
-#ifndef _jni_ICalTimeType_H
-#include "jniICalTimeType_cxx.h"
-#endif
-
-#ifndef _jni_ICalTriggerType_H
-#include "jniICalTriggerType_cxx.h"
-#endif
-
-#ifndef _jni_ICalDurationType_H
-#include "jniICalDurationType_cxx.h"
-#endif
-
-#ifndef _jni_ICalRecurrenceType_H
-#include "jniICalRecurrenceType_cxx.h"
-#endif
-
-#ifndef _jni_ICalPeriodType_H
-#include "jniICalPeriodType_cxx.h"
-#endif
-
-//-------------------------------------------------------
-// Returns a pointer to the subject (a c++ object) for the given surrogate (a java object)
-//-------------------------------------------------------
-void* getCObjectPtr(JNIEnv *env, jobject surrogate)
-{
-	void* result = 0;
-    jclass jcls = env->GetObjectClass(surrogate);
-    jfieldID fid = env->GetFieldID(jcls,"m_Obj","J");
-
-    if (fid == NULL)
-    {
-		// this should never happen.
-        throwException( env, JLIBICAL_ERR_CLIENT_INTERNAL );
-        return(NULL);
-    }
-
-	result = (void*)env->GetLongField(surrogate,fid);
-    if (result == NULL)
-	{
-		// the proxy object (java) has no subject (c++ object)
-        throwException( env, JLIBICAL_ERR_CLIENT_INTERNAL );
-        return(NULL);
-	}
-
-	return(result);
-}
-
-//-------------------------------------------------------
-// Set the subject (a c++ object) for the given surrogate (a java object).
-// Throws exception if the m_Obj field can not be found.
-//-------------------------------------------------------
-void setCObjectPtr(JNIEnv *env, jobject surrogate, void* subject)
-{
-    jclass jcls = env->GetObjectClass(surrogate);
-    jfieldID fid = env->GetFieldID(jcls,"m_Obj","J");
-
-    if (fid == NULL)
-    {
-        throwException( env, JLIBICAL_ERR_CLIENT_INTERNAL );
-        return;
-    }
-
-	env->SetLongField(surrogate,fid,(long)subject);
-}
-
-//-------------------------------------------------------
-// Return the pointer to the subject (as an VComponent*) from the given surrogate.
-// If the subject is not an VComponent type, or if the subject is NULL, then return NULL.
-//-------------------------------------------------------
-VComponent* getSubjectAsVComponent(JNIEnv *env, jobject surrogateComponent, int exceptionType)
-{
-	VComponent* result = (VComponent*)(getCObjectPtr(env,surrogateComponent));
-
-	if (result == NULL)
-	{
-        throwException(env, exceptionType );
-	}
-
-	return(result);
-}
-
-//-------------------------------------------------------
-// Return the pointer to the subject (as an ICalProperty*) from the given surrogate.
-// If the subject is not an ICalProperty type, or if the subject is NULL, then return NULL.
-//-------------------------------------------------------
-ICalProperty* getSubjectAsICalProperty(JNIEnv *env, jobject surrogateProperty, int exceptionType)
-{
-	ICalProperty* result = (ICalProperty*)(getCObjectPtr(env,surrogateProperty));
-
-	if (result == NULL)
-	{
-        throwException(env, exceptionType );
-	}
-
-	return(result);
-}
-
-//-------------------------------------------------------
-// Return the pointer to the subject (as an ICalValue*) from the given surrogate.
-// If the subject is not an ICalValue type, or if the subject is NULL, then return NULL.
-//-------------------------------------------------------
-ICalValue* getSubjectAsICalValue(JNIEnv *env, jobject surrogateValue, int exceptionType)
-{
-	ICalValue* result = (ICalValue*)(getCObjectPtr(env,surrogateValue));
-
-	if (result == NULL)
-	{
-        throwException( env, exceptionType );
-	}
-
-	return(result);
-}
-
-//-------------------------------------------------------
-// Return the pointer to the subject (as an ICalParameter*) from the given surrogate.
-// If the subject is not an ICalParameter type, or if the subject is NULL, then return NULL.
-//-------------------------------------------------------
-ICalParameter* getSubjectAsICalParameter(JNIEnv *env, jobject surrogateParameter, int exceptionType)
-{
-	ICalParameter* result = (ICalParameter*)(getCObjectPtr(env,surrogateParameter));
-
-	if (result == NULL)
-	{
-        throwException( env, exceptionType );
-	}
-
-	return(result);
-}
-
-//-------------------------------------------------------
-// Copy the data from the src (a java ICalTimeType object)
-// to the dest (a c struct icaltimetype*).
-// Returns true if success.  False if exception is thrown:
-//	- the src java object is not an ICalTimeType type
-//	- the dest c struct is null.
-//-------------------------------------------------------
-bool copyObjToicaltimetype(JNIEnv *env, jobject src, icaltimetype* dest)
-{
-	bool result = false;
-
-	if (dest != NULL && env->IsInstanceOf(src,env->FindClass(JLIBICAL_CLASS_ICALTIMETYPE)))
-	{
-		jni_GetAll_from_ICalTimeType(dest, env, src);
-		result = true;
-	}
-	else
-	{
-        throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
-	}
-
-	return(result);
-}
-
-//-------------------------------------------------------
-// Copy the data from the src (a java ICalTriggerType object)
-// to the dest (a c struct icaltriggertype*).
-// Returns true if success.  False if exception is thrown:
-//	- the src java object is not an ICalTriggerType type
-//	- the dest c struct is null.
-//-------------------------------------------------------
-bool copyObjToicaltriggertype(JNIEnv *env, jobject src, icaltriggertype* dest)
-{
-	bool result = false;
-
-	if (dest != NULL && env->IsInstanceOf(src,env->FindClass(JLIBICAL_CLASS_ICALTRIGGERTYPE)))
-	{
-		jni_GetAll_from_ICalTriggerType(dest, env, src);
-		result = true;
-	}
-	else
-	{
-        throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
-	}
-
-	return(result);
-}
-
-//-------------------------------------------------------
-// Copy the data from the src (a java ICalDurationType object)
-// to the dest (a c struct icaldurationtype*).
-// Returns true if success.  False if exception is thrown:
-//	- the src java object is not an ICalDurationType type
-//	- the dest c struct is null.
-//-------------------------------------------------------
-bool copyObjToicaldurationtype(JNIEnv *env, jobject src, icaldurationtype* dest)
-{
-	bool result = false;
-
-	if (dest != NULL && env->IsInstanceOf(src,env->FindClass(JLIBICAL_CLASS_ICALDURATIONTYPE)))
-	{
-		jni_GetAll_from_ICalDurationType(dest, env, src);
-		result = true;
-	}
-	else
-	{
-        throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
-	}
-
-	return(result);
-}
-
-//-------------------------------------------------------
-// Copy the data from the src (a java ICalRecurrenceType object)
-// to the dest (a c struct icalrecurrencetype*).
-// Returns true if success.  False if exception is thrown:
-//	- the src java object is not an ICalRecurrenceType type
-//	- the dest c struct is null.
-//-------------------------------------------------------
-bool copyObjToicalrecurrencetype(JNIEnv *env, jobject src, icalrecurrencetype* dest)
-{
-	bool result = false;
-
-	if (dest != NULL && env->IsInstanceOf(src,env->FindClass(JLIBICAL_CLASS_ICALRECURRENCETYPE)))
-	{
-		jni_GetAll_from_ICalRecurrenceType(dest, env, src);
-		result = true;
-	}
-	else
-	{
-        throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
-	}
-
-	return(result);
-}
-
-//-------------------------------------------------------
-// Copy the data from the src (a java ICalPeriodType object)
-// to the dest (a c struct icalperiodtype*).
-// Returns true if success.  False if exception is thrown:
-//	- the src java object is not an ICalPeriodType type
-//	- the dest c struct is null.
-//-------------------------------------------------------
-bool copyObjToicalperiodtype(JNIEnv *env, jobject src, icalperiodtype* dest)
-{
-	bool result = false;
-
-	if (dest != NULL && env->IsInstanceOf(src,env->FindClass(JLIBICAL_CLASS_ICALPERIODTYPE)))
-	{
-		jni_GetAll_from_ICalPeriodType(dest, env, src);
-		result = true;
-	}
-	else
-	{
-        throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
-	}
-
-	return(result);
-}
-
-//-------------------------------------------------------
-// Create a new VComponent surrogate for given subject.
-// If subject is NULL, then returns NULL (will not create a
-// surrogate to a NULL subject);
-//-------------------------------------------------------
-jobject createNewVComponentSurrogate(JNIEnv *env, VComponent* subject)
-{
-	char* classname = JLIBICAL_CLASS_VCOMPONENT;
-	if (dynamic_cast<VAlarm*>(subject))
-		classname = JLIBICAL_CLASS_VALARM;
-	else if (dynamic_cast<VCalendar*>(subject))
-		classname = JLIBICAL_CLASS_VCALENDAR;
-	else if (dynamic_cast<VEvent*>(subject))
-		classname = JLIBICAL_CLASS_VEVENT;
-	else if (dynamic_cast<VQuery*>(subject))
-		classname = JLIBICAL_CLASS_VQUERY;
-	else if (dynamic_cast<VToDo*>(subject))
-		classname = JLIBICAL_CLASS_VTODO;
-        else if (dynamic_cast<VAgenda*>(subject))
-                classname = JLIBICAL_CLASS_VAGENDA;
-
-	return(doCreateNewSurrogate(env,env->FindClass(classname),(jlong)subject));
-}
-
-//-------------------------------------------------------
-// Create a new ICalProperty surrogate for given subject.
-// If subject is NULL, then returns NULL (will not create a
-// surrogate to a NULL subject);
-//-------------------------------------------------------
-jobject createNewICalPropertySurrogate(JNIEnv *env, ICalProperty* subject)
-{
-	return(doCreateNewSurrogate(env,env->FindClass(JLIBICAL_CLASS_ICALPROPERTY),(jlong)subject));
-}
-
-//-------------------------------------------------------
-// Create a new ICalValue surrogate for given subject.
-// If subject is NULL, then returns NULL (will not create a
-// surrogate to a NULL subject);
-//-------------------------------------------------------
-jobject createNewICalValueSurrogate(JNIEnv *env, ICalValue* subject)
-{
-	return(doCreateNewSurrogate(env,env->FindClass(JLIBICAL_CLASS_ICALVALUE),(jlong)subject));
-}
-
-//-------------------------------------------------------
-// Create a new ICalParameter surrogate for given subject.
-// If subject is NULL, then returns NULL (will not create a
-// surrogate to a NULL subject);
-//-------------------------------------------------------
-jobject createNewICalParameterSurrogate(JNIEnv *env, ICalParameter* subject)
-{
-	return(doCreateNewSurrogate(env,env->FindClass(JLIBICAL_CLASS_ICALPARAMETER),(jlong)subject));
-}
-
-//-------------------------------------------------------
-// Create a new ICalTimeType object from the given source struct.
-// A copy is made,  .
-// If source is NULL, then returns NULL (will not create an
-// object to a NULL source);
-//-------------------------------------------------------
-jobject createNewICalTimeType(JNIEnv *env, icaltimetype* source)
-{
-	return(doCreateNewSurrogate(env,env->FindClass(JLIBICAL_CLASS_ICALTIMETYPE),(jlong)source));
-}
-
-//-------------------------------------------------------
-// Create a new ICalTriggerType object from the given source struct.
-// A copy is made,  .
-// If source is NULL, then returns NULL (will not create an
-// object to a NULL source);
-//-------------------------------------------------------
-jobject createNewICalTriggerType(JNIEnv *env, icaltriggertype* source)
-{
-	return(doCreateNewSurrogate(env,env->FindClass(JLIBICAL_CLASS_ICALTRIGGERTYPE),(jlong)source));
-}
-
-//-------------------------------------------------------
-// Create a new ICalDurationType object from the given source struct.
-// A copy is made,  .
-// If source is NULL, then returns NULL (will not create an
-// object to a NULL source);
-//-------------------------------------------------------
-jobject createNewICalDurationType(JNIEnv *env, icaldurationtype* source)
-{
-	return(doCreateNewSurrogate(env,env->FindClass(JLIBICAL_CLASS_ICALDURATIONTYPE),(jlong)source));
-}
-
-//-------------------------------------------------------
-// Create a new ICalRecurrenceType object from the given source struct.
-// A copy is made,  .
-// If source is NULL, then returns NULL (will not create an
-// object to a NULL source);
-//-------------------------------------------------------
-jobject createNewICalRecurrenceType(JNIEnv *env, icalrecurrencetype* source)
-{
-	return(doCreateNewSurrogate(env,env->FindClass(JLIBICAL_CLASS_ICALRECURRENCETYPE),(jlong)source));
-}
-
-//-------------------------------------------------------
-// Create a new ICalPeriodType object from the given source struct.
-// A copy is made,  .
-// If source is NULL, then returns NULL (will not create an
-// object to a NULL source);
-//-------------------------------------------------------
-jobject createNewICalPeriodType(JNIEnv *env, icalperiodtype* source)
-{
-	return(doCreateNewSurrogate(env,env->FindClass(JLIBICAL_CLASS_ICALPERIODTYPE),(jlong)source));
-}
-
-//-------------------------------------------------------
-// Creat a new surrogate of the given type for the given subject.
-//-------------------------------------------------------
-jobject doCreateNewSurrogate(JNIEnv *env, jclass surrogateClass, jlong subject)
-{
-	jobject result = NULL;
-
-	if (subject != NULL)
-	{
-		jmethodID jconstructorID = env->GetMethodID(surrogateClass, "<init>", "(J)V");
-
-		result = env->NewObject(surrogateClass, jconstructorID, subject);
-	}
-
-	return(result);
-}
-
-
-//-------------------------------------------------------
-// For the given cpErr, create a new Exception and send it to env.
-// Note: Throw does not throw anything.  It only sets the state.
-//		The JVM will check this and throw an exception later.
-//-------------------------------------------------------
-void throwException(JNIEnv *env, int cpErr)
-{
-	jclass jexceptionClass;
-	jthrowable jexceptionObj;
-	jmethodID jconstructorID;
-	const char* exClassName;
-
-	if (env->ExceptionOccurred())
-	{
-		return;
-	}
-
-    switch ( cpErr )
-    {
-    case JLIBICAL_ERR_NETWORK:
-            exClassName = "net.cp.jlibical/JLCNetworkException";
-	    break;
-
-    case JLIBICAL_ERR_SERVER_INTERNAL:
-            exClassName = "net.cp.jlibical/JLCServerInternalException";
-	    break;
-
-    case JLIBICAL_ERR_CLIENT_INTERNAL:
-            exClassName = "net.cp.jlibical/JLCClientInternalException";
-	    break;
-
-    case JLIBICAL_ERR_ILLEGAL_ARGUMENT:
-            exClassName = "net.cp.jlibical/JLCIllegalArgumentException";
-	    break;
-
-    case JLIBICAL_ERR_API_NOT_INITED:
-            exClassName = "net.cp.jlibical/JLCNotInitedException";
-	    break;
-
-    case JLIBICAL_ERR_HOST_INVALID:
-            exClassName = "net.cp.jlibical/JLCHostInvalidException";
-	    break;
-
-    default:
-            exClassName = "net.cp.jlibical/JLCClientInternalException";
-	    printf("*** JLIBICAL JNI throwException: unknown error code: %d\n", cpErr );
-	    break;
-    }
-
-    env->ThrowNew(env->FindClass(exClassName),"");
-}
diff --git a/libical/src/java/jlibical_utils_cxx.h b/libical/src/java/jlibical_utils_cxx.h
deleted file mode 100644
index a6cdbc56be..0000000000
--- a/libical/src/java/jlibical_utils_cxx.h
+++ /dev/null
@@ -1,59 +0,0 @@
-
-/*======================================================================
- FILE: jlibical_utils_cxx.h
- CREATOR: Srinivasa Boppana/George Norman
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-#ifndef TEST_CXX_H
-#define TEST_CXX_H
-
-#ifndef JNI_H
-#include <jni.h>
-#endif
-
-class VComponent;
-class ICalProperty;
-class ICalValue;
-class ICalParameter;
-struct icaltimetype;
-struct icaltriggertype;
-struct icaldurationtype;
-struct icalrecurrencetype;
-struct icalperiodtype;
-
-// get & set
-void* getCObjectPtr(JNIEnv *env, jobject anObj);
-void setCObjectPtr(JNIEnv *env, jobject anObj, void* val);
-
-// type-safe getters
-VComponent* getSubjectAsVComponent(JNIEnv *env, jobject surrogateComponent, int exceptionType);
-ICalProperty* getSubjectAsICalProperty(JNIEnv *env, jobject surrogateProperty, int exceptionType);
-ICalValue* getSubjectAsICalValue(JNIEnv *env, jobject surrogateValue, int exceptionType);
-ICalParameter* getSubjectAsICalParameter(JNIEnv *env, jobject surrogateParameter, int exceptionType);
-
-bool copyObjToicaltimetype(JNIEnv *env, jobject src, icaltimetype* dest);
-bool copyObjToicaltriggertype(JNIEnv *env, jobject src, icaltriggertype* dest);
-bool copyObjToicaldurationtype(JNIEnv *env, jobject src, icaldurationtype* dest);
-bool copyObjToicalrecurrencetype(JNIEnv *env, jobject src, icalrecurrencetype* dest);
-bool copyObjToicalperiodtype(JNIEnv *env, jobject src, icalperiodtype* dest);
-
-// exception handling
-void throwException( JNIEnv *env, int cpErr );
-
-// create objects
-jobject createNewVComponentSurrogate(JNIEnv *env, VComponent* subject);
-jobject createNewICalPropertySurrogate(JNIEnv *env, ICalProperty* subject);
-jobject createNewICalValueSurrogate(JNIEnv *env, ICalValue* subject);
-jobject createNewICalParameterSurrogate(JNIEnv *env, ICalParameter* subject);
-
-jobject createNewICalTimeType(JNIEnv *env, icaltimetype* source);
-jobject createNewICalTriggerType(JNIEnv *env, icaltriggertype* source);
-jobject createNewICalDurationType(JNIEnv *env, icaldurationtype* source);
-jobject createNewICalRecurrenceType(JNIEnv *env, icalrecurrencetype* source);
-jobject createNewICalPeriodType(JNIEnv *env, icalperiodtype* source);
-
-jobject doCreateNewSurrogate(JNIEnv *env, jclass surrogateClass, jlong subject);
-
-
-#endif /*TEST_CXX_H*/
diff --git a/libical/src/java/jniICalDurationType_cxx.cpp b/libical/src/java/jniICalDurationType_cxx.cpp
deleted file mode 100644
index e1e0204c46..0000000000
--- a/libical/src/java/jniICalDurationType_cxx.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: jniICalDurationType_cxx.cpp
- CREATOR: structConverter
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-#include <jni.h>
-
-#include "jniICalDurationType_cxx.h"
-
-static jfieldID ICalDurationType_Is_neg_FID;
-static jfieldID ICalDurationType_Days_FID;
-static jfieldID ICalDurationType_Weeks_FID;
-static jfieldID ICalDurationType_Hours_FID;
-static jfieldID ICalDurationType_Minutes_FID;
-static jfieldID ICalDurationType_Seconds_FID;
-
-
-void initICalDurationTypeFieldIDs(JNIEnv* env, jclass clazz)
-{
-	ICalDurationType_Is_neg_FID = env->GetFieldID(clazz, "is_neg", "I");
-	ICalDurationType_Days_FID = env->GetFieldID(clazz, "days", "J");
-	ICalDurationType_Weeks_FID = env->GetFieldID(clazz, "weeks", "J");
-	ICalDurationType_Hours_FID = env->GetFieldID(clazz, "hours", "J");
-	ICalDurationType_Minutes_FID = env->GetFieldID(clazz, "minutes", "J");
-	ICalDurationType_Seconds_FID = env->GetFieldID(clazz, "seconds", "J");
-}
-
-void  jni_SetIs_neg_in_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType)
-{
-	env->SetIntField(thisICalDurationType, ICalDurationType_Is_neg_FID, (jint) __ICalDurationType_->is_neg);
-}
-
-void jni_GetIs_neg_from_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType)
-{
-	__ICalDurationType_->is_neg = env->GetIntField(thisICalDurationType, ICalDurationType_Is_neg_FID);
-}
-
-void  jni_SetDays_in_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType)
-{
-	env->SetLongField(thisICalDurationType, ICalDurationType_Days_FID, (jlong) __ICalDurationType_->days);
-}
-
-void jni_GetDays_from_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType)
-{
-	__ICalDurationType_->days = env->GetLongField(thisICalDurationType, ICalDurationType_Days_FID);
-}
-
-void  jni_SetWeeks_in_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType)
-{
-	env->SetLongField(thisICalDurationType, ICalDurationType_Weeks_FID, (jlong) __ICalDurationType_->weeks);
-}
-
-void jni_GetWeeks_from_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType)
-{
-	__ICalDurationType_->weeks = env->GetLongField(thisICalDurationType, ICalDurationType_Weeks_FID);
-}
-
-void  jni_SetHours_in_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType)
-{
-	env->SetLongField(thisICalDurationType, ICalDurationType_Hours_FID, (jlong) __ICalDurationType_->hours);
-}
-
-void jni_GetHours_from_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType)
-{
-	__ICalDurationType_->hours = env->GetLongField(thisICalDurationType, ICalDurationType_Hours_FID);
-}
-
-void  jni_SetMinutes_in_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType)
-{
-	env->SetLongField(thisICalDurationType, ICalDurationType_Minutes_FID, (jlong) __ICalDurationType_->minutes);
-}
-
-void jni_GetMinutes_from_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType)
-{
-	__ICalDurationType_->minutes = env->GetLongField(thisICalDurationType, ICalDurationType_Minutes_FID);
-}
-
-void  jni_SetSeconds_in_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType)
-{
-	env->SetLongField(thisICalDurationType, ICalDurationType_Seconds_FID, (jlong) __ICalDurationType_->seconds);
-}
-
-void jni_GetSeconds_from_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType)
-{
-	__ICalDurationType_->seconds = env->GetLongField(thisICalDurationType, ICalDurationType_Seconds_FID);
-}
-
-// copy all fields from the c struct (ICalDurationType) to the java object (thisICalDurationType).
-void jni_SetAll_in_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv* env, jobject thisICalDurationType)
-{
-	jni_SetIs_neg_in_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
-	jni_SetDays_in_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
-	jni_SetWeeks_in_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
-	jni_SetHours_in_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
-	jni_SetMinutes_in_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
-	jni_SetSeconds_in_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
-}
-
-// copy all fields from the java object (thisICalDurationType) to the c struct (__ICalDurationType_).
-void jni_GetAll_from_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv* env, jobject thisICalDurationType)
-{
-	jni_GetIs_neg_from_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
-	jni_GetDays_from_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
-	jni_GetWeeks_from_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
-	jni_GetHours_from_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
-	jni_GetMinutes_from_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
-	jni_GetSeconds_from_ICalDurationType(__ICalDurationType_, env, thisICalDurationType);
-}
-/*
- * Class:     net_cp_jlibical_ICalDurationType
- * Method:    init
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalDurationType_init__J
-  (JNIEnv *env, jobject thisICalDurationType, jlong data)
-{
-	// copy all fields from the c struct (data) to the java object (thisICalDurationType). 
-	jni_SetAll_in_ICalDurationType((ICalDurationType*)data,env,thisICalDurationType);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalDurationType
- * Method:    initFIDs
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalDurationType_initFIDs(JNIEnv *env, jclass clazz) {
-	initICalDurationTypeFieldIDs(env, clazz);
-}
diff --git a/libical/src/java/jniICalDurationType_cxx.h b/libical/src/java/jniICalDurationType_cxx.h
deleted file mode 100644
index 6ef1de1a09..0000000000
--- a/libical/src/java/jniICalDurationType_cxx.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-/*======================================================================
- FILE: jniICalDurationType_cxx.h
- CREATOR: structConverter
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-#ifndef _jni_ICalDurationType_H
-#define _jni_ICalDurationType_H
-#include <jni.h>
-
-// I forgot how to do this using a typedef in c++!!!!
-#define ICalDurationType icaldurationtype
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "ical.h"
-
-static void initICalDurationTypeFieldIDs(JNIEnv* env, jclass clazz);
-
-void  jni_SetIs_neg_in_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType);
-void jni_GetIs_neg_from_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType);
-void  jni_SetDays_in_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType);
-void jni_GetDays_from_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType);
-void  jni_SetWeeks_in_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType);
-void jni_GetWeeks_from_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType);
-void  jni_SetHours_in_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType);
-void jni_GetHours_from_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType);
-void  jni_SetMinutes_in_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType);
-void jni_GetMinutes_from_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType);
-void  jni_SetSeconds_in_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType);
-void jni_GetSeconds_from_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv *env, jobject thisICalDurationType);
-void jni_SetAll_in_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv* env, jobject thisICalDurationType);
-
-void jni_GetAll_from_ICalDurationType(struct ICalDurationType* __ICalDurationType_, JNIEnv* env, jobject thisICalDurationType);
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalDurationType_initFIDs(JNIEnv *env, jclass clazz);
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalDurationType_init__J(JNIEnv *env, jobject thisICalDurationType, jlong data);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/libical/src/java/jniICalPeriodType_cxx.cpp b/libical/src/java/jniICalPeriodType_cxx.cpp
deleted file mode 100644
index 5a0b676915..0000000000
--- a/libical/src/java/jniICalPeriodType_cxx.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: jniICalPeriodType_cxx.cpp
- CREATOR: structConverter
-======================================================================*/
-
-#include <jni.h>
-
-#include "jniICalPeriodType_cxx.h"
-#include "jniICalTimeType_cxx.h"
-#include "jniICalDurationType_cxx.h"
-
-static jfieldID ICalPeriodType_Start_FID;
-static jfieldID ICalPeriodType_End_FID;
-static jfieldID ICalPeriodType_Duration_FID;
-
-
-void initICalPeriodTypeFieldIDs(JNIEnv* env, jclass clazz)
-{
-	ICalPeriodType_Start_FID = env->GetFieldID(clazz, "start", "Lnet/cp/jlibical/ICalTimeType;");
-	ICalPeriodType_End_FID = env->GetFieldID(clazz, "end", "Lnet/cp/jlibical/ICalTimeType;");
-	ICalPeriodType_Duration_FID = env->GetFieldID(clazz, "duration", "Lnet/cp/jlibical/ICalDurationType;");
-}
-
-void  jni_SetStart_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType)
-{
-	jobject	lcl_jobj0;
-	lcl_jobj0 = env->GetObjectField(thisICalPeriodType, ICalPeriodType_Start_FID);
-	jni_SetYear_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
-	jni_SetMonth_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
-	jni_SetDay_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
-	jni_SetHour_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
-	jni_SetMinute_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
-	jni_SetSecond_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
-	jni_SetIs_utc_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
-	jni_SetIs_date_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
-	jni_SetZone_in_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
-}
-
-void jni_GetStart_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType)
-{
-	jobject	lcl_jobj0;
-	lcl_jobj0 = env->GetObjectField(thisICalPeriodType, ICalPeriodType_Start_FID);
-	jni_GetYear_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
-	jni_GetMonth_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
-	jni_GetDay_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
-	jni_GetHour_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
-	jni_GetMinute_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
-	jni_GetSecond_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
-	jni_GetIs_utc_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
-	jni_GetIs_date_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
-	jni_GetZone_from_ICalTimeType(&(__ICalPeriodType_->start), env, lcl_jobj0);
-}
-
-void  jni_SetEnd_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType)
-{
-	jobject	lcl_jobj0;
-	lcl_jobj0 = env->GetObjectField(thisICalPeriodType, ICalPeriodType_End_FID);
-	jni_SetYear_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
-	jni_SetMonth_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
-	jni_SetDay_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
-	jni_SetHour_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
-	jni_SetMinute_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
-	jni_SetSecond_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
-	jni_SetIs_utc_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
-	jni_SetIs_date_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
-	jni_SetZone_in_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
-}
-
-void jni_GetEnd_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType)
-{
-	jobject	lcl_jobj0;
-	lcl_jobj0 = env->GetObjectField(thisICalPeriodType, ICalPeriodType_End_FID);
-	jni_GetYear_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
-	jni_GetMonth_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
-	jni_GetDay_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
-	jni_GetHour_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
-	jni_GetMinute_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
-	jni_GetSecond_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
-	jni_GetIs_utc_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
-	jni_GetIs_date_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
-	jni_GetZone_from_ICalTimeType(&(__ICalPeriodType_->end), env, lcl_jobj0);
-}
-
-void  jni_SetDuration_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType)
-{
-	jobject	lcl_jobj0;
-	lcl_jobj0 = env->GetObjectField(thisICalPeriodType, ICalPeriodType_Duration_FID);
-	jni_SetIs_neg_in_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);
-	jni_SetDays_in_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);
-	jni_SetWeeks_in_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);
-	jni_SetHours_in_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);
-	jni_SetMinutes_in_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);
-	jni_SetSeconds_in_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);
-}
-
-void jni_GetDuration_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType)
-{
-	jobject	lcl_jobj0;
-	lcl_jobj0 = env->GetObjectField(thisICalPeriodType, ICalPeriodType_Duration_FID);
-	jni_GetIs_neg_from_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);
-	jni_GetDays_from_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);
-	jni_GetWeeks_from_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);
-	jni_GetHours_from_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);
-	jni_GetMinutes_from_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);
-	jni_GetSeconds_from_ICalDurationType(&(__ICalPeriodType_->duration), env, lcl_jobj0);
-}
-
-// copy all fields from the c struct (__ICalPeriodType_) to the java object (thisICalPeriodType).
-void jni_SetAll_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv* env, jobject thisICalPeriodType)
-{
-	jni_SetStart_in_ICalPeriodType(__ICalPeriodType_, env, thisICalPeriodType);
-	jni_SetEnd_in_ICalPeriodType(__ICalPeriodType_, env, thisICalPeriodType);
-	jni_SetDuration_in_ICalPeriodType(__ICalPeriodType_, env, thisICalPeriodType);
-}
-
-// copy all fields from the java object (thisICalPeriodType) to the c struct (__ICalPeriodType_).
-void jni_GetAll_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv* env, jobject thisICalPeriodType)
-{
-	jni_GetStart_from_ICalPeriodType(__ICalPeriodType_, env, thisICalPeriodType);
-	jni_GetEnd_from_ICalPeriodType(__ICalPeriodType_, env, thisICalPeriodType);
-	jni_GetDuration_from_ICalPeriodType(__ICalPeriodType_, env, thisICalPeriodType);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalPeriodType
- * Method:    init
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalPeriodType_init__J
-  (JNIEnv* env, jobject thisICalPeriodType, jlong data)
-{
-	// copy all fields from the c struct (data) to the java object (thisICalTimeType).
-	jni_SetAll_in_ICalPeriodType((ICalPeriodType*)data,env,thisICalPeriodType);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalPeriodType
- * Method:    initFIDs
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalPeriodType_initFIDs(JNIEnv *env, jclass clazz) {
-	initICalPeriodTypeFieldIDs(env, clazz);
-}
diff --git a/libical/src/java/jniICalPeriodType_cxx.h b/libical/src/java/jniICalPeriodType_cxx.h
deleted file mode 100644
index 458e20a198..0000000000
--- a/libical/src/java/jniICalPeriodType_cxx.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-/*======================================================================
- FILE: jniICalPeriodType_cxx.h
- CREATOR: structConverter
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-#ifndef _jni_ICalPeriodType_H
-#define _jni_ICalPeriodType_H
-#include <jni.h>
-
-// I forgot how to do this using a typedef in c++!!!!
-#define ICalPeriodType icalperiodtype
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "ical.h"
-
-static void initICalPeriodTypeFieldIDs(JNIEnv* env, jclass clazz);
-
-void  jni_SetStart_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType);
-void jni_GetStart_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType);
-void  jni_SetEnd_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType);
-void jni_GetEnd_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType);
-void  jni_SetDuration_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType);
-void jni_GetDuration_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv *env, jobject thisICalPeriodType);
-
-void jni_SetAll_in_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv* env, jobject thisICalPeriodType);
-void jni_GetAll_from_ICalPeriodType(struct ICalPeriodType* __ICalPeriodType_, JNIEnv* env, jobject thisICalPeriodType);
-
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalPeriodType_init__J(JNIEnv* env, jobject thisICalPeriodType, jlong data);
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalPeriodType_initFIDs(JNIEnv *env, jclass clazz);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/libical/src/java/jniICalRecurrenceType_cxx.cpp b/libical/src/java/jniICalRecurrenceType_cxx.cpp
deleted file mode 100644
index 48698b90f2..0000000000
--- a/libical/src/java/jniICalRecurrenceType_cxx.cpp
+++ /dev/null
@@ -1,347 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: jniICalRecurrenceType_cxx.cpp
- CREATOR: structConverter
-======================================================================*/
-
-#include <jni.h>
-
-#include "jniICalRecurrenceType_cxx.h"
-#include "jniICalTimeType_cxx.h"
-
-static jfieldID ICalRecurrenceType_Until_FID;
-static jfieldID ICalRecurrenceType_Freq_FID;
-static jfieldID ICalRecurrenceType_Week_start_FID;
-
-static jfieldID ICalRecurrenceType_Count_FID;
-static jfieldID ICalRecurrenceType_Interval_FID;
-static jfieldID ICalRecurrenceType_By_second_FID;
-static jfieldID ICalRecurrenceType_By_minute_FID;
-static jfieldID ICalRecurrenceType_By_hour_FID;
-static jfieldID ICalRecurrenceType_By_day_FID;
-static jfieldID ICalRecurrenceType_By_month_day_FID;
-static jfieldID ICalRecurrenceType_By_year_day_FID;
-static jfieldID ICalRecurrenceType_By_week_no_FID;
-static jfieldID ICalRecurrenceType_By_month_FID;
-static jfieldID ICalRecurrenceType_By_set_pos_FID;
-
-
-void initICalRecurrenceTypeFieldIDs(JNIEnv* env, jclass clazz)
-{
-	ICalRecurrenceType_Until_FID = env->GetFieldID(clazz, "until", "Lnet/cp/jlibical/ICalTimeType;");
-	ICalRecurrenceType_Freq_FID = env->GetFieldID(clazz, "freq", "I");
-	ICalRecurrenceType_Week_start_FID = env->GetFieldID(clazz, "week_start", "I");
-	ICalRecurrenceType_Count_FID = env->GetFieldID(clazz, "count", "I");
-	ICalRecurrenceType_Interval_FID = env->GetFieldID(clazz, "interval", "S");
-	ICalRecurrenceType_By_second_FID = env->GetFieldID(clazz, "by_second", "[S");
-	ICalRecurrenceType_By_minute_FID = env->GetFieldID(clazz, "by_minute", "[S");
-	ICalRecurrenceType_By_hour_FID = env->GetFieldID(clazz, "by_hour", "[S");
-	ICalRecurrenceType_By_day_FID = env->GetFieldID(clazz, "by_day", "[S");
-	ICalRecurrenceType_By_month_day_FID = env->GetFieldID(clazz, "by_month_day", "[S");
-	ICalRecurrenceType_By_year_day_FID = env->GetFieldID(clazz, "by_year_day", "[S");
-	ICalRecurrenceType_By_week_no_FID = env->GetFieldID(clazz, "by_week_no", "[S");
-	ICalRecurrenceType_By_month_FID = env->GetFieldID(clazz, "by_month", "[S");
-	ICalRecurrenceType_By_set_pos_FID = env->GetFieldID(clazz, "by_set_pos", "[S");
-}
-
-void  jni_SetUntil_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	jobject	lcl_jobj0;
-	lcl_jobj0 = env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_Until_FID);
-	jni_SetYear_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_SetMonth_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_SetDay_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_SetHour_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_SetMinute_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_SetSecond_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_SetIs_utc_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_SetIs_date_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_SetZone_in_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-}
-
-void jni_GetUntil_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	jobject	lcl_jobj0;
-	lcl_jobj0 = env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_Until_FID);
-	jni_GetYear_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_GetMonth_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_GetDay_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_GetHour_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_GetMinute_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_GetSecond_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_GetIs_utc_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_GetIs_date_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-	jni_GetZone_from_ICalTimeType(&(__ICalRecurrenceType_->until), env, lcl_jobj0);
-}
-
-void  jni_SetFreq_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	env->SetIntField(thisICalRecurrenceType, ICalRecurrenceType_Freq_FID, (jint) __ICalRecurrenceType_->freq);
-}
-
-void jni_GetFreq_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	__ICalRecurrenceType_->freq = (icalrecurrencetype_frequency) env->GetIntField(thisICalRecurrenceType, ICalRecurrenceType_Freq_FID);
-}
-
-void  jni_SetWeek_start_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	env->SetIntField(thisICalRecurrenceType, ICalRecurrenceType_Week_start_FID, (jint) __ICalRecurrenceType_->week_start);
-}
-
-void jni_GetWeek_start_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	__ICalRecurrenceType_->week_start = (icalrecurrencetype_weekday) env->GetIntField(thisICalRecurrenceType, ICalRecurrenceType_Week_start_FID);
-}
-
-void  jni_SetCount_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	env->SetIntField(thisICalRecurrenceType, ICalRecurrenceType_Count_FID, (jint) __ICalRecurrenceType_->count);
-}
-
-void jni_GetCount_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	__ICalRecurrenceType_->count = env->GetIntField(thisICalRecurrenceType, ICalRecurrenceType_Count_FID);
-}
-
-void  jni_SetInterval_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	env->SetShortField(thisICalRecurrenceType, ICalRecurrenceType_Interval_FID, (jshort) __ICalRecurrenceType_->interval);
-}
-
-void jni_GetInterval_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	__ICalRecurrenceType_->interval = env->GetShortField(thisICalRecurrenceType, ICalRecurrenceType_Interval_FID);
-}
-
-void  jni_SetBy_second_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	jclass	elem_clazz;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_second_FID);
-	env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,61, (jshort*)&(__ICalRecurrenceType_->by_second[0]));
-}
-
-void jni_GetBy_second_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	jclass	elem_clazz;
-	jboolean isCopy;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_second_FID);
-	env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,61, (jshort*)&(__ICalRecurrenceType_->by_second[0]));
-}
-
-void  jni_SetBy_minute_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	jclass	elem_clazz;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_minute_FID);
-	env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,61, (jshort*)&(__ICalRecurrenceType_->by_minute[0]));
-}
-
-void jni_GetBy_minute_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	jclass	elem_clazz;
-	jboolean isCopy;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_minute_FID);
-	env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,61, (jshort*)&(__ICalRecurrenceType_->by_minute[0]));
-}
-
-void  jni_SetBy_hour_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	jclass	elem_clazz;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_hour_FID);
-	env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,25, (jshort*)&(__ICalRecurrenceType_->by_hour[0]));
-}
-
-void jni_GetBy_hour_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	jclass	elem_clazz;
-	jboolean isCopy;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_hour_FID);
-	env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,25, (jshort*)&(__ICalRecurrenceType_->by_hour[0]));
-}
-
-void  jni_SetBy_day_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	jclass	elem_clazz;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_day_FID);
-	env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,364, (jshort*)&(__ICalRecurrenceType_->by_day[0]));
-}
-
-void jni_GetBy_day_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	jclass	elem_clazz;
-	jboolean isCopy;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_day_FID);
-	env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,364, (jshort*)&(__ICalRecurrenceType_->by_day[0]));
-}
-
-void  jni_SetBy_month_day_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	jclass	elem_clazz;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_month_day_FID);
-	env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,32, (jshort*)&(__ICalRecurrenceType_->by_month_day[0]));
-}
-
-void jni_GetBy_month_day_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	jclass	elem_clazz;
-	jboolean isCopy;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_month_day_FID);
-	env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,32, (jshort*)&(__ICalRecurrenceType_->by_month_day[0]));
-}
-
-void  jni_SetBy_year_day_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	jclass	elem_clazz;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_year_day_FID);
-	env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,367, (jshort*)&(__ICalRecurrenceType_->by_year_day[0]));
-}
-
-void jni_GetBy_year_day_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	jclass	elem_clazz;
-	jboolean isCopy;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_year_day_FID);
-	env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,367, (jshort*)&(__ICalRecurrenceType_->by_year_day[0]));
-}
-
-void  jni_SetBy_week_no_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	jclass	elem_clazz;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_week_no_FID);
-	env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,54, (jshort*)&(__ICalRecurrenceType_->by_week_no[0]));
-}
-
-void jni_GetBy_week_no_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	jclass	elem_clazz;
-	jboolean isCopy;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_week_no_FID);
-	env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,54, (jshort*)&(__ICalRecurrenceType_->by_week_no[0]));
-}
-
-void  jni_SetBy_month_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	jclass	elem_clazz;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_month_FID);
-	env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,13, (jshort*)&(__ICalRecurrenceType_->by_month[0]));
-}
-
-void jni_GetBy_month_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	jclass	elem_clazz;
-	jboolean isCopy;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_month_FID);
-	env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,13, (jshort*)&(__ICalRecurrenceType_->by_month[0]));
-}
-
-void  jni_SetBy_set_pos_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	jclass	elem_clazz;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_set_pos_FID);
-	env->SetShortArrayRegion((jshortArray)lcl_jobjA0, 0,367, (jshort*)&(__ICalRecurrenceType_->by_set_pos[0]));
-}
-
-void jni_GetBy_set_pos_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType)
-{
-	jclass	elem_clazz;
-	jboolean isCopy;
-	int ix0;
-	jobject	lcl_jobj0;
-	jarray lcl_jobjA0;
-	lcl_jobjA0 = (jarray) env->GetObjectField(thisICalRecurrenceType, ICalRecurrenceType_By_set_pos_FID);
-	env->GetShortArrayRegion((jshortArray)lcl_jobjA0, 0,367, (jshort*)&(__ICalRecurrenceType_->by_set_pos[0]));
-}
-void jni_SetAll_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv* env, jobject thisICalRecurrenceType)
-{
-	jni_SetUntil_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetFreq_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetWeek_start_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetCount_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetInterval_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetBy_second_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetBy_minute_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetBy_hour_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetBy_day_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetBy_month_day_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetBy_year_day_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetBy_week_no_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetBy_month_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_SetBy_set_pos_in_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-}
-void jni_GetAll_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv* env, jobject thisICalRecurrenceType)
-{
-	jni_GetUntil_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetFreq_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetWeek_start_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetCount_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetInterval_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetBy_second_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetBy_minute_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetBy_hour_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetBy_day_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetBy_month_day_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetBy_year_day_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetBy_week_no_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetBy_month_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	jni_GetBy_set_pos_from_ICalRecurrenceType(__ICalRecurrenceType_, env, thisICalRecurrenceType);
-	
-}
-
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalRecurrenceType_init__J(JNIEnv* env, jobject thisICalRecurrenceType, jlong data) {
-	jni_SetAll_in_ICalRecurrenceType((ICalRecurrenceType*)data,env,thisICalRecurrenceType);
-}
-
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalRecurrenceType_initFIDs(JNIEnv *env, jclass clazz) {
-	initICalRecurrenceTypeFieldIDs(env, clazz);
-}
diff --git a/libical/src/java/jniICalRecurrenceType_cxx.h b/libical/src/java/jniICalRecurrenceType_cxx.h
deleted file mode 100644
index 2f0bf4bae5..0000000000
--- a/libical/src/java/jniICalRecurrenceType_cxx.h
+++ /dev/null
@@ -1,60 +0,0 @@
-
-/*======================================================================
- FILE: jniICalRecurrenceType_cxx.h
- CREATOR: structConverter
-======================================================================*/
-
-#ifndef _jni_ICalRecurrenceType_H_
-#define _jni_ICalRecurrenceType_H_
-#include <jni.h>
-
-#define ICalRecurrenceType icalrecurrencetype
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "ical.h"
-
-static void initICalRecurrenceTypeFieldIDs(JNIEnv* env, jclass clazz);
-
-void  jni_SetUntil_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void jni_GetUntil_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void  jni_SetFreq_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void jni_GetFreq_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void  jni_SetWeek_start_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void jni_GetWeek_start_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void  jni_SetCount_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void jni_GetCount_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void  jni_SetInterval_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void jni_GetInterval_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void  jni_SetBy_second_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void jni_GetBy_second_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void  jni_SetBy_minute_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void jni_GetBy_minute_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void  jni_SetBy_hour_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void jni_GetBy_hour_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void  jni_SetBy_day_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void jni_GetBy_day_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void  jni_SetBy_month_day_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void jni_GetBy_month_day_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void  jni_SetBy_year_day_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void jni_GetBy_year_day_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void  jni_SetBy_week_no_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void jni_GetBy_week_no_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void  jni_SetBy_month_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void jni_GetBy_month_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void  jni_SetBy_set_pos_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void jni_GetBy_set_pos_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv *env, jobject thisICalRecurrenceType);
-void jni_SetAll_in_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv* env, jobject thisICalRecurrenceType);
-
-void jni_GetAll_from_ICalRecurrenceType(struct ICalRecurrenceType* __ICalRecurrenceType_, JNIEnv* env, jobject thisICalRecurrenceType);
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalRecurrenceType_init__J(JNIEnv* env, jobject thisICalRecurrenceType, jlong data);
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalRecurrenceType_initFIDs(JNIEnv *env, jclass clazz);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/libical/src/java/jniICalTimeType_cxx.cpp b/libical/src/java/jniICalTimeType_cxx.cpp
deleted file mode 100644
index 341ded7ed0..0000000000
--- a/libical/src/java/jniICalTimeType_cxx.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: jniICalTimeType_cxx.cpp
- CREATOR: structConverter
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-#include <jni.h>
-
-#ifndef _jni_ICalTimeType_H
-#include "jniICalTimeType_cxx.h"
-#endif
-
-static jfieldID ICalTimeType_Year_FID;
-static jfieldID ICalTimeType_Month_FID;
-static jfieldID ICalTimeType_Day_FID;
-static jfieldID ICalTimeType_Hour_FID;
-static jfieldID ICalTimeType_Minute_FID;
-static jfieldID ICalTimeType_Second_FID;
-static jfieldID ICalTimeType_Is_utc_FID;
-static jfieldID ICalTimeType_Is_date_FID;
-static jfieldID ICalTimeType_Zone_FID;
-
-
-void initICalTimeTypeFieldIDs(JNIEnv* env, jclass clazz)
-{
-	ICalTimeType_Year_FID = env->GetFieldID(clazz, "year", "I");
-	ICalTimeType_Month_FID = env->GetFieldID(clazz, "month", "I");
-	ICalTimeType_Day_FID = env->GetFieldID(clazz, "day", "I");
-	ICalTimeType_Hour_FID = env->GetFieldID(clazz, "hour", "I");
-	ICalTimeType_Minute_FID = env->GetFieldID(clazz, "minute", "I");
-	ICalTimeType_Second_FID = env->GetFieldID(clazz, "second", "I");
-	ICalTimeType_Is_utc_FID = env->GetFieldID(clazz, "is_utc", "I");
-	ICalTimeType_Is_date_FID = env->GetFieldID(clazz, "is_date", "I");
-	ICalTimeType_Zone_FID = env->GetFieldID(clazz, "zone", "Ljava/lang/String;");
-}
-
-void  jni_SetYear_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
-{
-	env->SetIntField(thisICalTimeType, ICalTimeType_Year_FID, (jint) __ICalTimeType_->year);
-}
-
-void jni_GetYear_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
-{
-	__ICalTimeType_->year = env->GetIntField(thisICalTimeType, ICalTimeType_Year_FID);
-}
-
-void  jni_SetMonth_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
-{
-	env->SetIntField(thisICalTimeType, ICalTimeType_Month_FID, (jint) __ICalTimeType_->month);
-}
-
-void jni_GetMonth_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
-{
-	__ICalTimeType_->month = env->GetIntField(thisICalTimeType, ICalTimeType_Month_FID);
-}
-
-void  jni_SetDay_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
-{
-	env->SetIntField(thisICalTimeType, ICalTimeType_Day_FID, (jint) __ICalTimeType_->day);
-}
-
-void jni_GetDay_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
-{
-	__ICalTimeType_->day = env->GetIntField(thisICalTimeType, ICalTimeType_Day_FID);
-}
-
-void  jni_SetHour_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
-{
-	env->SetIntField(thisICalTimeType, ICalTimeType_Hour_FID, (jint) __ICalTimeType_->hour);
-}
-
-void jni_GetHour_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
-{
-	__ICalTimeType_->hour = env->GetIntField(thisICalTimeType, ICalTimeType_Hour_FID);
-}
-
-void  jni_SetMinute_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
-{
-	env->SetIntField(thisICalTimeType, ICalTimeType_Minute_FID, (jint) __ICalTimeType_->minute);
-}
-
-void jni_GetMinute_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
-{
-	__ICalTimeType_->minute = env->GetIntField(thisICalTimeType, ICalTimeType_Minute_FID);
-}
-
-void  jni_SetSecond_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
-{
-	env->SetIntField(thisICalTimeType, ICalTimeType_Second_FID, (jint) __ICalTimeType_->second);
-}
-
-void jni_GetSecond_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
-{
-	__ICalTimeType_->second = env->GetIntField(thisICalTimeType, ICalTimeType_Second_FID);
-}
-
-void  jni_SetIs_utc_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
-{
-	env->SetIntField(thisICalTimeType, ICalTimeType_Is_utc_FID, (jint) __ICalTimeType_->is_utc);
-}
-
-void jni_GetIs_utc_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
-{
-	__ICalTimeType_->is_utc = env->GetIntField(thisICalTimeType, ICalTimeType_Is_utc_FID);
-}
-
-void  jni_SetIs_date_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
-{
-	env->SetIntField(thisICalTimeType, ICalTimeType_Is_date_FID, (jint) __ICalTimeType_->is_date);
-}
-
-void jni_GetIs_date_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
-{
-	__ICalTimeType_->is_date = env->GetIntField(thisICalTimeType, ICalTimeType_Is_date_FID);
-}
-
-void  jni_SetZone_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
-{
-	env->SetObjectField(thisICalTimeType, ICalTimeType_Zone_FID, env->NewStringUTF(icaltime_get_tzid(*__ICalTimeType_)));
-}
-
-void jni_GetZone_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType)
-{
-	__ICalTimeType_->zone = icaltimezone_get_builtin_timezone_from_tzid((char*) env->GetStringUTFChars((jstring) env->GetObjectField(thisICalTimeType, ICalTimeType_Zone_FID), NULL));
-}
-
-// copy all fields from the c struct (__ICalTimeType_) to the java object (thisICalTimeType).
-void jni_SetAll_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv* env, jobject thisICalTimeType)
-{
-	jni_SetYear_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_SetMonth_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_SetDay_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_SetHour_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_SetMinute_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_SetSecond_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_SetIs_utc_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_SetIs_date_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_SetZone_in_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-}
-
-// copy all fields from the java object (thisICalTimeType) to the c struct (__ICalTimeType_).
-void jni_GetAll_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv* env, jobject thisICalTimeType)
-{
-	jni_GetYear_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_GetMonth_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_GetDay_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_GetHour_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_GetMinute_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_GetSecond_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_GetIs_utc_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_GetIs_date_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-	jni_GetZone_from_ICalTimeType(__ICalTimeType_, env, thisICalTimeType);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalTimeType
- * Method:    init
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalTimeType_init__J
-  (JNIEnv* env, jobject thisICalTimeType, jlong data)
-{
-	// copy all fields from the c struct (data) to the java object (thisICalTimeType). 
-	jni_SetAll_in_ICalTimeType((ICalTimeType*)data,env,thisICalTimeType);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalTimeType
- * Method:    initFIDs
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalTimeType_initFIDs(JNIEnv *env, jclass clazz) 
-{
-	initICalTimeTypeFieldIDs(env, clazz);
-}
diff --git a/libical/src/java/jniICalTimeType_cxx.h b/libical/src/java/jniICalTimeType_cxx.h
deleted file mode 100644
index 5d6f84cee7..0000000000
--- a/libical/src/java/jniICalTimeType_cxx.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-/*======================================================================
- FILE: jniICalTimeType_cxx.h
- CREATOR: structConverter
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-#ifndef _jni_ICalTimeType_H
-#define _jni_ICalTimeType_H
-#include <jni.h>
-
-// I forgot how to do this using a typedef in c++!!!!
-#define ICalTimeType icaltimetype
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "ical.h"
-
-static void initICalTimeTypeFieldIDs(JNIEnv* env, jclass clazz);
-
-void  jni_SetYear_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType);
-void jni_GetYear_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType);
-void  jni_SetMonth_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType);
-void jni_GetMonth_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType);
-void  jni_SetDay_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType);
-void jni_GetDay_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType);
-void  jni_SetHour_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType);
-void jni_GetHour_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType);
-void  jni_SetMinute_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType);
-void jni_GetMinute_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType);
-void  jni_SetSecond_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType);
-void jni_GetSecond_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType);
-void  jni_SetIs_utc_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType);
-void jni_GetIs_utc_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType);
-void  jni_SetIs_date_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType);
-void jni_GetIs_date_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType);
-void  jni_SetZone_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType);
-void jni_GetZone_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv *env, jobject thisICalTimeType);
-void jni_SetAll_in_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv* env, jobject thisICalTimeType);
-
-void jni_GetAll_from_ICalTimeType(struct ICalTimeType* __ICalTimeType_, JNIEnv* env, jobject thisICalTimeType);
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalTimeType_initFIDs(JNIEnv *env, jclass clazz);
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalTimeType_init__J(JNIEnv* env, jobject thisICalTimeType, jlong data);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/libical/src/java/jniICalTriggerType_cxx.cpp b/libical/src/java/jniICalTriggerType_cxx.cpp
deleted file mode 100644
index b4140c8f1a..0000000000
--- a/libical/src/java/jniICalTriggerType_cxx.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: jniICalTriggerType_cxx.cpp
- CREATOR: structConverter
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-#include <jni.h>
-
-#include "jniICalTriggerType_cxx.h"
-#include "jniICalTimeType_cxx.h"
-#include "jniICalDurationType_cxx.h"
-
-static jfieldID ICalTriggerType_Time_FID;
-static jfieldID ICalTriggerType_Duration_FID;
-
-
-void initICalTriggerTypeFieldIDs(JNIEnv* env, jclass clazz)
-{
-	ICalTriggerType_Time_FID = env->GetFieldID(clazz, "time", "Lnet/cp/jlibical/ICalTimeType;");
-	ICalTriggerType_Duration_FID = env->GetFieldID(clazz, "duration", "Lnet/cp/jlibical/ICalDurationType;");
-}
-
-void  jni_SetTime_in_ICalTriggerType(struct ICalTriggerType* __ICalTriggerType_, JNIEnv *env, jobject thisICalTriggerType)
-{
-	jobject	lcl_jobj0;
-	lcl_jobj0 = env->GetObjectField(thisICalTriggerType, ICalTriggerType_Time_FID);
-	jni_SetYear_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_SetMonth_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_SetDay_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_SetHour_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_SetMinute_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_SetSecond_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_SetIs_utc_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_SetIs_date_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_SetZone_in_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-}
-
-void jni_GetTime_from_ICalTriggerType(struct ICalTriggerType* __ICalTriggerType_, JNIEnv *env, jobject thisICalTriggerType)
-{
-	jobject	lcl_jobj0;
-	lcl_jobj0 = env->GetObjectField(thisICalTriggerType, ICalTriggerType_Time_FID);
-	jni_GetYear_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_GetMonth_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_GetDay_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_GetHour_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_GetMinute_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_GetSecond_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_GetIs_utc_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_GetIs_date_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-	jni_GetZone_from_ICalTimeType(&(__ICalTriggerType_->time), env, lcl_jobj0);
-}
-
-void  jni_SetDuration_in_ICalTriggerType(struct ICalTriggerType* __ICalTriggerType_, JNIEnv *env, jobject thisICalTriggerType)
-{
-	jobject	lcl_jobj0;
-	lcl_jobj0 = env->GetObjectField(thisICalTriggerType, ICalTriggerType_Duration_FID);
-	jni_SetIs_neg_in_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
-	jni_SetDays_in_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
-	jni_SetWeeks_in_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
-	jni_SetHours_in_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
-	jni_SetMinutes_in_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
-	jni_SetSeconds_in_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
-}
-
-void jni_GetDuration_from_ICalTriggerType(struct ICalTriggerType* __ICalTriggerType_, JNIEnv *env, jobject thisICalTriggerType)
-{
-	jobject	lcl_jobj0;
-	lcl_jobj0 = env->GetObjectField(thisICalTriggerType, ICalTriggerType_Duration_FID);
-	jni_GetIs_neg_from_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
-	jni_GetDays_from_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
-	jni_GetWeeks_from_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
-	jni_GetHours_from_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
-	jni_GetMinutes_from_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
-	jni_GetSeconds_from_ICalDurationType(&(__ICalTriggerType_->duration), env, lcl_jobj0);
-}
-
-// copy all fields from the c struct (__ICalTriggerType_) to the java object (thisICalTriggerType).
-void jni_SetAll_in_ICalTriggerType(struct ICalTriggerType* __ICalTriggerType_, JNIEnv* env, jobject thisICalTriggerType)
-{
-	jni_SetTime_in_ICalTriggerType(__ICalTriggerType_, env, thisICalTriggerType);
-	jni_SetDuration_in_ICalTriggerType(__ICalTriggerType_, env, thisICalTriggerType);
-}
-
-// copy all fields from the java object (thisICalTriggerType) to the c struct (__ICalTriggerType_).
-void jni_GetAll_from_ICalTriggerType(struct ICalTriggerType* __ICalTriggerType_, JNIEnv* env, jobject thisICalTriggerType)
-{
-	jni_GetTime_from_ICalTriggerType(__ICalTriggerType_, env, thisICalTriggerType);
-	jni_GetDuration_from_ICalTriggerType(__ICalTriggerType_, env, thisICalTriggerType);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalTriggerType
- * Method:    init
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalTriggerType_init__J
-  (JNIEnv* env, jobject thisICalTriggerType, jlong data)
-{
-	// copy all fields from the c struct (data) to the java object (thisICalTimeType). 
-	jni_SetAll_in_ICalTriggerType((ICalTriggerType*)data,env,thisICalTriggerType);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalTriggerType
- * Method:    initFIDs
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalTriggerType_initFIDs(JNIEnv *env, jclass clazz) {
-	initICalTriggerTypeFieldIDs(env, clazz);
-}
diff --git a/libical/src/java/jniICalTriggerType_cxx.h b/libical/src/java/jniICalTriggerType_cxx.h
deleted file mode 100644
index 62d6ec3e90..0000000000
--- a/libical/src/java/jniICalTriggerType_cxx.h
+++ /dev/null
@@ -1,39 +0,0 @@
-
-/*======================================================================
- FILE: jniICalTriggerType_cxx.h
- CREATOR: structConverter
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-#ifndef _jni_ICalTriggerType_H
-#define _jni_ICalTriggerType_H
-#include <jni.h>
-
-// I forgot how to do this using a typedef in c++!!!!
-#define ICalTriggerType icaltriggertype
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "ical.h"
-
-static void initICalTriggerTypeFieldIDs(JNIEnv* env, jclass clazz);
-
-void  jni_SetTime_in_ICalTriggerType(struct ICalTriggerType* __ICalTriggerType_, JNIEnv *env, jobject thisICalTriggerType);
-void jni_GetTime_from_ICalTriggerType(struct ICalTriggerType* __ICalTriggerType_, JNIEnv *env, jobject thisICalTriggerType);
-void  jni_SetDuration_in_ICalTriggerType(struct ICalTriggerType* __ICalTriggerType_, JNIEnv *env, jobject thisICalTriggerType);
-void jni_GetDuration_from_ICalTriggerType(struct ICalTriggerType* __ICalTriggerType_, JNIEnv *env, jobject thisICalTriggerType);
-void jni_SetAll_in_ICalTriggerType(struct ICalTriggerType* __ICalTriggerType_, JNIEnv* env, jobject thisICalTriggerType);
-
-void jni_GetAll_from_ICalTriggerType(struct ICalTriggerType* __ICalTriggerType_, JNIEnv* env, jobject thisICalTriggerType);
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalTriggerType_init__J(JNIEnv* env, jobject thisICalTriggerType, jlong data);
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalTriggerType_initFIDs(JNIEnv *env, jclass clazz);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/libical/src/java/net_cp_jlibical_ICalParameter_cxx.cpp b/libical/src/java/net_cp_jlibical_ICalParameter_cxx.cpp
deleted file mode 100644
index 2157473927..0000000000
--- a/libical/src/java/net_cp_jlibical_ICalParameter_cxx.cpp
+++ /dev/null
@@ -1,310 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: net_cp_jlibical_ICalParameter_cxx.cpp
- CREATOR: gnorman 1/10/02
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-#ifndef NET_CP_JLIBICAL_ICALPARAMETER_CXX_H
-#include "net_cp_jlibical_ICalParameter_cxx.h"
-#endif
-
-#ifndef JLIBICAL_CONSTS_CXX_H
-#include "jlibical_consts_cxx.h"
-#endif
-
-#ifndef JLIBICAL_UTILS_CXX_H
-#include "jlibical_utils_cxx.h"
-#endif
-
-#ifndef ICALPARAMETER_CXX_H
-#include "icalparameter_cxx.h"
-#endif
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    as_ical_string
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalParameter_as_1ical_1string
-  (JNIEnv *env, jobject jobj)
-{
-	jstring result = NULL;
-	ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->as_ical_string();
-
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
-
-		result = env->NewStringUTF(icalStr);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    isa
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalParameter_isa
-  (JNIEnv *env, jobject jobj)
-{
-	jint result = 0;
-	ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		result = cObj->isa();
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    isa_parameter
- * Signature: (Ljava/lang/Object;)Z
- */
-JNIEXPORT jboolean JNICALL Java_net_cp_jlibical_ICalParameter_isa_1parameter
-  (JNIEnv *env, jobject jobj, jobject arg)
-{
-	jboolean result = 0;
-
-	// get the c++ object from the jobj
-	ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-	if (cObj != NULL)
-	{
-		// get the c++ object from the arg
-		void* argObjPtr = 0;
-
-		if (arg != NULL)
-		{
-			argObjPtr = getCObjectPtr(env,arg);
-		}
-
-		// get the result from the c++ object (candidateValue can be 0, it's cObj's responsibility to handle this if an error).
-		result = cObj->isa_parameter(argObjPtr) != 0;
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    get_language
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalParameter_get_1language
-  (JNIEnv *env, jobject jobj)
-{
-	jstring result = NULL;
-	ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_language();
-
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
-
-		result = env->NewStringUTF(icalStr);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    set_language
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_set_1language
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-	ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		cObj->set_language((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    get_encoding
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalParameter_get_1encoding
-  (JNIEnv *env, jobject jobj)
-{
-	jint result = 0;
-	ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		result = cObj->get_encoding();
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    set_encoding
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_set_1encoding
-  (JNIEnv *env, jobject jobj, jint value)
-{
-	ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		cObj->set_encoding((icalparameter_encoding)value);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    get_role
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalParameter_get_1role
-  (JNIEnv *env, jobject jobj)
-{
-	jint result = 0;
-	ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		result = cObj->get_role();
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    set_role
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_set_1role
-  (JNIEnv *env, jobject jobj, jint value)
-{
-	ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		cObj->set_role((icalparameter_role)value);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    get_partstat
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalParameter_get_1partstat
-  (JNIEnv *env, jobject jobj)
-{
-	jint result = 0;
-	ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		result = cObj->get_partstat();
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    set_partstat
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_set_1partstat
-  (JNIEnv *env, jobject jobj, jint value)
-{
-	ICalParameter* cObj = getSubjectAsICalParameter(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		cObj->set_partstat((icalparameter_partstat)value);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    init
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_init__
-  (JNIEnv *env, jobject jobj)
-{
-	setCObjectPtr(env,jobj,new ICalParameter());
-}
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    init
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_init__Ljava_lang_String_2
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-	if (str != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		setCObjectPtr(env,jobj,new ICalParameter((char*)szTemp));
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-	else
-	{
-		throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    init
- * Signature: (ILjava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_init__ILjava_lang_String_2
-  (JNIEnv *env, jobject jobj, jint kind, jstring str)
-{
-	if (str != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		setCObjectPtr(env,jobj,new ICalParameter((icalparameter_kind)kind,(char*)szTemp));
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-	else
-	{
-		throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    init
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_init__I
-  (JNIEnv *env, jobject jobj, jint kind)
-{
-	setCObjectPtr(env,jobj,new ICalParameter((icalparameter_kind)kind));
-}
diff --git a/libical/src/java/net_cp_jlibical_ICalParameter_cxx.h b/libical/src/java/net_cp_jlibical_ICalParameter_cxx.h
deleted file mode 100644
index f2fef299a4..0000000000
--- a/libical/src/java/net_cp_jlibical_ICalParameter_cxx.h
+++ /dev/null
@@ -1,143 +0,0 @@
-
-/*======================================================================
- FILE: net_cp_jlibical_ICalParameter_cxx.h
- CREATOR: javah 1/11/02
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-#ifndef _Included_net_cp_jlibical_ICalParameter
-#define _Included_net_cp_jlibical_ICalParameter
-
-#ifndef JNI_H
-#include <jni.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    as_ical_string
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalParameter_as_1ical_1string
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    isa
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalParameter_isa
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    isa_parameter
- * Signature: (Ljava/lang/Object;)Z
- */
-JNIEXPORT jboolean JNICALL Java_net_cp_jlibical_ICalParameter_isa_1parameter
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    get_language
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalParameter_get_1language
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    set_language
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_set_1language
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    get_encoding
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalParameter_get_1encoding
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    set_encoding
- * Signature: (I)V
- */
-
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_set_1encoding
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    get_role
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalParameter_get_1role
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    set_role
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_set_1role
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    get_partstat
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalParameter_get_1partstat
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    set_partstat
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_set_1partstat
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    init
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_init__
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    init
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_init__Ljava_lang_String_2
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    init
- * Signature: (ILjava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_init__ILjava_lang_String_2
-  (JNIEnv *, jobject, jint, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalParameter
- * Method:    init
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalParameter_init__I
-  (JNIEnv *, jobject, jint);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/libical/src/java/net_cp_jlibical_ICalProperty_cxx.cpp b/libical/src/java/net_cp_jlibical_ICalProperty_cxx.cpp
deleted file mode 100644
index 4334354bd8..0000000000
--- a/libical/src/java/net_cp_jlibical_ICalProperty_cxx.cpp
+++ /dev/null
@@ -1,1690 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: net_cp_jlibical_ICalProperty_cxx.cpp
- CREATOR: gnorman 1/10/02
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-#ifndef NET_CP_JLIBICAL_ICALPROPERTY_CXX_H
-#include "net_cp_jlibical_ICalProperty_cxx.h"
-#endif
-
-#ifndef JLIBICAL_CONSTS_CXX_H
-#include "jlibical_consts_cxx.h"
-#endif
-
-#ifndef JLIBICAL_UTILS_CXX_H
-#include "jlibical_utils_cxx.h"
-#endif
-
-#ifndef ICALPROPERTY_CXX_H
-#include "icalproperty_cxx.h"
-#endif
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    as_ical_string
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_as_1ical_1string
-  (JNIEnv *env, jobject jobj)
-{
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->as_ical_string();
-
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
-
-		result = env->NewStringUTF(icalStr);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    isa
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalProperty_isa
-  (JNIEnv *env, jobject jobj)
-{
-	jint result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		result = cObj->isa();
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    isa_property
- * Signature: (Ljava/lang/Object;)I
- */
-JNIEXPORT jboolean JNICALL Java_net_cp_jlibical_ICalProperty_isa_1property
-  (JNIEnv *env, jobject jobj, jobject arg)
-{
-	jboolean result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		void* argObjPtr = 0;
-
-		if (arg != NULL)
-		{
-			argObjPtr = getCObjectPtr(env,arg);
-		}
-
-		// get the result from the c++ object (argObjPtr can be 0, it's cObj's responsibility to handle this if an error).
-		result = cObj->isa_property(argObjPtr) != 0;
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    add_parameter
- * Signature: (Lnet/cp/jlibical/ICalParameter;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_add_1parameter
-  (JNIEnv *env, jobject jobj, jobject arg)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		ICalParameter* icalparameter = getSubjectAsICalParameter(env,arg,JLIBICAL_ERR_ILLEGAL_ARGUMENT);
-
-		if (icalparameter != NULL)
-		{
-			cObj->add_parameter(*icalparameter);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_parameter
- * Signature: (Lnet/cp/jlibical/ICalParameter;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1parameter
-  (JNIEnv *env, jobject jobj, jobject arg)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		ICalParameter* icalparameter = getSubjectAsICalParameter(env,arg,JLIBICAL_ERR_ILLEGAL_ARGUMENT);
-
-		if (icalparameter != NULL)
-		{
-			cObj->set_parameter(*icalparameter);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_parameter_from_string
- * Signature: (Ljava/lang/String;Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1parameter_1from_1string
-  (JNIEnv *env, jobject jobj, jstring name, jstring value)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		const char* szName = env->GetStringUTFChars(name,NULL);
-		const char* szValue = env->GetStringUTFChars(value,NULL);
-
-		if (szName != NULL && szValue != NULL)
-		{
-			cObj->set_parameter_from_string((string)szName, (string)szValue);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_parameter_as_string
- * Signature: (Ljava/lang/String;)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1parameter_1as_1string
-  (JNIEnv *env, jobject jobj, jstring name)
-{
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		const char* szName = env->GetStringUTFChars(name,NULL);
-
-		if (szName != NULL)
-		{
-			char* szValue = cObj->get_parameter_as_string((string)szName);
-
-			if (szValue == NULL)
-			{
-				szValue = "";
-			}
-
-			result = env->NewStringUTF(szValue);
-		}
-	}
-
-	return (result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    remove_parameter
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_remove_1parameter
-  (JNIEnv *env, jobject jobj, jint kind)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		cObj->remove_parameter((icalparameter_kind)kind);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    count_parameters
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalProperty_count_1parameters
-  (JNIEnv *env, jobject jobj)
-{
-	jint result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		result = cObj->count_parameters();
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_first_parameter
- * Signature: (I)Lnet/cp/jlibical/ICalParameter;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1first_1parameter
-  (JNIEnv *env, jobject jobj, jint kind)
-{
-	jobject result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the first parameter from CObj
-		ICalParameter* aParameter = cObj->get_first_parameter((icalparameter_kind)kind);
-
-		// create a new surrogate, using aParameter as the subject (returns NULL if subject is NULL).
-		result = createNewICalParameterSurrogate(env,aParameter);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_next_parameter
- * Signature: (I)Lnet/cp/jlibical/ICalParameter;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1next_1parameter
-  (JNIEnv *env, jobject jobj, jint kind)
-{
-	jobject result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the first parameter from CObj
-		ICalParameter* aParameter = cObj->get_next_parameter((icalparameter_kind)kind);
-
-		// create a new surrogate, using aParameter as the subject (returns NULL if subject is NULL).
-		result = createNewICalParameterSurrogate(env,aParameter);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_value
- * Signature: (Lnet/cp/jlibical/ICalValue;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1value
-  (JNIEnv *env, jobject jobj, jobject arg)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		ICalValue* aValue = getSubjectAsICalValue(env,arg,JLIBICAL_ERR_ILLEGAL_ARGUMENT);
-		cObj->set_value(*aValue);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_value_from_string
- * Signature: (Ljava/lang/String;Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1value_1from_1string
-  (JNIEnv *env, jobject jobj, jstring name, jstring value)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		const char* szName = env->GetStringUTFChars(name,NULL);
-		const char* szValue = env->GetStringUTFChars(value,NULL);
-
-		if (szName != NULL && szValue != NULL)
-		{
-			cObj->set_value_from_string((string)szName, (string)szValue);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_value
- * Signature: ()Lnet/cp/jlibical/ICalValue;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1value
-  (JNIEnv *env, jobject jobj)
-{
-	jobject result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the first value from CObj
-		ICalValue* aValue = cObj->get_value();
-
-		// create a new surrogate, using aValue as the subject (returns NULL if subject is NULL).
-		result = createNewICalValueSurrogate(env,aValue);
-	}
-
-	return (result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_value_as_string
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1value_1as_1string
-  (JNIEnv *env, jobject jobj)
-{
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_value_as_string();
-
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
-
-		result = env->NewStringUTF(icalStr);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_name
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1name
-  (JNIEnv *env, jobject jobj)
-{
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_name();
-
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
-
-		result = env->NewStringUTF(icalStr);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_action
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1action
-  (JNIEnv *env, jobject jobj, jint value)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		cObj->set_action((icalproperty_action)value);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_action
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalProperty_get_1action
-  (JNIEnv *env, jobject jobj)
-{
-	jint result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		result = cObj->get_action();
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_attendee
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1attendee
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		cObj->set_attendee((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_attendee
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1attendee
-  (JNIEnv *env, jobject jobj)
-{
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_attendee();
-
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
-
-		result = env->NewStringUTF(icalStr);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_comment
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1comment
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		cObj->set_comment((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_comment
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1comment
-  (JNIEnv *env, jobject jobj)
-{
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		char* commentStr = cObj->get_comment();
-
-		if (commentStr == NULL)
-		{
-			commentStr = "";
-		}
-
-		result = env->NewStringUTF(commentStr);
-	}
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_description
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1description
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		cObj->set_description((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_description
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1description
-  (JNIEnv *env, jobject jobj)
-{
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_description();
-
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
-
-		result = env->NewStringUTF(icalStr);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_dtend
- * Signature: (Lnet/cp/jlibical/ICalTimeType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1dtend
-  (JNIEnv *env, jobject jobj, jobject arg)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		icaltimetype aTime;
-
-		if (copyObjToicaltimetype(env,arg,&aTime))
-		{
-			cObj->set_dtend(aTime);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_dtend
- * Signature: ()Lnet/cp/jlibical/ICalTimeType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1dtend
-  (JNIEnv *env, jobject jobj)
-{
-	jobject result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the dtend time from CObj
-		icaltimetype aTime = cObj->get_dtend();
-
-		// create a new surrogate, using aTime as the subject.
-		result = createNewICalTimeType(env,&aTime);
-	}
-
-	return (result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_dtstamp
- * Signature: (Lnet/cp/jlibical/ICalTimeType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1dtstamp
-  (JNIEnv *env, jobject jobj, jobject dtstamp)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		icaltimetype aDTStamp;
-
-		if (copyObjToicaltimetype(env,dtstamp,&aDTStamp))
-		{
-			cObj->set_dtstamp(aDTStamp);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_dtstamp
- * Signature: ()Lnet/cp/jlibical/ICalTimeType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1dtstamp
-  (JNIEnv *env, jobject jobj)
-{
-	jobject result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the dtstamp time from CObj
-		icaltimetype aDTStamp = cObj->get_dtstamp();
-
-		// create a new surrogate, using aDTStamp as the subject.
-		result = createNewICalTimeType(env,&aDTStamp);
-	}
-
-	return (result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_dtstart
- * Signature: (Lnet/cp/jlibical/ICalTimeType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1dtstart
-  (JNIEnv *env, jobject jobj, jobject arg)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		icaltimetype aTime;
-
-		if (copyObjToicaltimetype(env,arg,&aTime))
-		{
-			cObj->set_dtstart(aTime);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_dtstart
- * Signature: ()Lnet/cp/jlibical/ICalTimeType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1dtstart
-  (JNIEnv *env, jobject jobj)
-{
-	jobject result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the dtend time from CObj
-		icaltimetype aTime = cObj->get_dtstart();
-
-		// create a new surrogate, using aTime as the subject.
-		result = createNewICalTimeType(env,&aTime);
-	}
-
-	return (result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_due
- * Signature: (Lnet/cp/jlibical/ICalTimeType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1due
-  (JNIEnv *env, jobject jobj, jobject arg)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		icaltimetype aTime;
-
-		if (copyObjToicaltimetype(env,arg,&aTime))
-		{
-			cObj->set_due(aTime);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_due
- * Signature: ()Lnet/cp/jlibical/ICalTimeType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1due
-  (JNIEnv *env, jobject jobj)
-{
-	jobject result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the dtend time from CObj
-		icaltimetype aTime = cObj->get_due();
-
-		// create a new surrogate, using aTime as the subject.
-		result = createNewICalTimeType(env,&aTime);
-	}
-
-	return (result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_duration
- * Signature: (Lnet/cp/jlibical/ICalDurationType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1duration
-  (JNIEnv *env, jobject jobj, jobject arg)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		icaldurationtype aDuration;
-
-		if (copyObjToicaldurationtype(env,arg,&aDuration))
-		{
-			cObj->set_duration(aDuration);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_duration
- * Signature: ()Lnet/cp/jlibical/ICalDurationType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1duration
-  (JNIEnv *env, jobject jobj)
-{
-	jobject result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the dtend time from CObj
-		icaldurationtype aDuration = cObj->get_duration();
-
-		// create a new surrogate, using aTime as the subject.
-		result = createNewICalDurationType(env,&aDuration);
-	}
-
-	return (result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_location
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1location
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		cObj->set_location((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_location
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1location
-  (JNIEnv *env, jobject jobj)
-{
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_location();
-
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
-
-		result = env->NewStringUTF(icalStr);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_method
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1method
-  (JNIEnv *env, jobject jobj, jint value)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		cObj->set_method((icalproperty_method)value);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_method
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalProperty_get_1method
-  (JNIEnv *env, jobject jobj)
-{
-	jint result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		result = cObj->get_method();
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_organizer
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1organizer
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		cObj->set_organizer((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_organizer
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1organizer
-  (JNIEnv *env, jobject jobj)
-{
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		char* organizerStr = cObj->get_organizer();
-
-		if (organizerStr == NULL)
-		{
-			organizerStr = "";
-		}
-
-		result = env->NewStringUTF(organizerStr);
-	}
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_owner
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1owner
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		cObj->set_owner((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_owner
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1owner
-  (JNIEnv *env, jobject jobj)
-{
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_owner();
-
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
-
-		result = env->NewStringUTF(icalStr);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_prodid
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1prodid
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		cObj->set_prodid((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_prodid
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1prodid
-  (JNIEnv *env, jobject jobj)
-{
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_prodid();
-
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
-
-		result = env->NewStringUTF(icalStr);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_query
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1query
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		cObj->set_query((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_query
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1query
-  (JNIEnv *env, jobject jobj)
-{
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_query();
-
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
-
-		result = env->NewStringUTF(icalStr);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_queryname
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1queryname
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		cObj->set_queryname((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_queryname
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1queryname
-  (JNIEnv *env, jobject jobj)
-{
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_queryname();
-
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
-
-		result = env->NewStringUTF(icalStr);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_repeat
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1repeat
-  (JNIEnv *env, jobject jobj, jint value)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		cObj->set_repeat(value);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_repeat
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalProperty_get_1repeat
-  (JNIEnv *env, jobject jobj)
-{
-	jint result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		result = cObj->get_repeat();
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_summary
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1summary
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		cObj->set_summary((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_summary
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1summary
-  (JNIEnv *env, jobject jobj)
-{
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_summary();
-
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
-
-		result = env->NewStringUTF(icalStr);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_target
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1target
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		cObj->set_target((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_target
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1target
-  (JNIEnv *env, jobject jobj)
-{
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_target();
-
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
-
-		result = env->NewStringUTF(icalStr);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_trigger
- * Signature: (Lnet/cp/jlibical/ICalTriggerType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1trigger
-  (JNIEnv *env, jobject jobj, jobject arg)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		icaltriggertype aTrigger;
-
-		if (copyObjToicaltriggertype(env,arg,&aTrigger))
-		{
-			cObj->set_trigger(aTrigger);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_trigger
- * Signature: ()Lnet/cp/jlibical/ICalTriggerType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1trigger
-  (JNIEnv *env, jobject jobj)
-{
-	jobject result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the dtend time from CObj
-		icaltriggertype aTrigger = cObj->get_trigger();
-
-		// create a new surrogate, using aTime as the subject.
-		result = createNewICalTriggerType(env,&aTrigger);
-	}
-
-	return (result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_tzid
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1tzid
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		cObj->set_tzid((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_tzid
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1tzid
-  (JNIEnv *env, jobject jobj)
-{
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_tzid();
-
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
-
-		result = env->NewStringUTF(icalStr);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_uid
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1uid
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		cObj->set_uid((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_uid
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1uid
-  (JNIEnv *env, jobject jobj)
-{
-	jstring result = NULL;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_uid();
-
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
-
-		result = env->NewStringUTF(icalStr);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    init
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_init__
-  (JNIEnv *env, jobject jobj)
-{
-	setCObjectPtr(env,jobj,new ICalProperty());
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    init
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_init__Ljava_lang_String_2
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-	if (str != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		setCObjectPtr(env,jobj,new ICalProperty((char*)szTemp));
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-	else
-	{
-		throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    init
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_init__I
-  (JNIEnv *env, jobject jobj, jint kind)
-{
-	setCObjectPtr(env,jobj,new ICalProperty((icalproperty_kind)kind));
-}
-
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_status
- * Signature: (I)V
- */
-
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1status
-  (JNIEnv *env, jobject jobj, jint value)
-{
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		cObj->set_status((icalproperty_status)value);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_status
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalProperty_get_1status
-  (JNIEnv *env, jobject jobj)
-{
-	jint result = 0;
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		result = cObj->get_status();
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_relcalid
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1relcalid
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-        ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-        if (cObj != NULL)
-        {
-                const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-                cObj->set_relcalid((char *)szTemp);
-
-                env->ReleaseStringUTFChars(str,szTemp);
-        }
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_relcalid
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1relcalid
-  (JNIEnv *env, jobject jobj)
-{
-        jstring result = NULL;
-        ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-        if (cObj != NULL)
-        {
-                char* icalStr = cObj->get_relcalid();
-
-                if (icalStr == NULL)
-                {
-                       icalStr = "";
-                }
-
-                result = env->NewStringUTF(icalStr);
-        }
-
-        return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_exdate
- * Signature: (Lnet/cp/jlibical/ICalTimeType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1exdate
-  (JNIEnv *env, jobject jobj, jobject exdate)
-{
-	// get the ICalProperty c++ object from jobj
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		icaltimetype aExDate;
-
-		if (copyObjToicaltimetype(env,exdate,&aExDate))
-		{
-			cObj->set_exdate(aExDate);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_exdate
- * Signature: ()Lnet/cp/jlibical/ICalTimeType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1exdate
-  (JNIEnv *env, jobject jobj)
-{
-	jobject result = 0;
-	// get the ICalProperty c++ object from jobj
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the exdate from CObj
-		icaltimetype aExDate = cObj->get_exdate();
-
-		// create a new surrogate, using aRecurrenceId as the subject.
-		result = createNewICalTimeType(env,&aExDate);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_exrule
- * Signature: (Lnet/cp/jlibical/ICalRecurrenceType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1exrule
-  (JNIEnv *env, jobject jobj, jobject exrule)
-{
-	// get the ICalProperty c++ object from jobj
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-	if (cObj != NULL)
-	{
-		icalrecurrencetype aExRule;
-		if (copyObjToicalrecurrencetype(env,exrule,&aExRule))
-		{
-			cObj->set_exrule(aExRule);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_exrule
- * Signature: ()Lnet/cp/jlibical/ICalRecurrenceType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1exrule
-  (JNIEnv *env, jobject jobj)
-{
-	jobject result = 0;
-	// get the ICalProperty c++ object from jobj
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the exrule from CObj
-		icalrecurrencetype aExRule = cObj->get_exrule();
-
-		// create a new surrogate, using aExRule as the subject.
-		result = createNewICalRecurrenceType(env,&aExRule);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_freebusy
- * Signature: (Lnet/cp/jlibical/ICalPeriodType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1freebusy
-  (JNIEnv *env, jobject jobj, jobject period)
-{
-	// get the ICalProperty c++ object from jobj
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		icalperiodtype aPeriod;
-
-		if (copyObjToicalperiodtype(env,period,&aPeriod))
-		{
-			cObj->set_freebusy(aPeriod);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_freebusy
- * Signature: ()Lnet/cp/jlibical/ICalPeriodType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1freebusy
-  (JNIEnv *env, jobject jobj)
-{
-	jobject result = 0;
-	// get the ICalProperty c++ object from jobj
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the period from CObj
-		icalperiodtype aPeriod = cObj->get_freebusy();
-
-		// create a new surrogate, using aPeriod as the subject.
-		result = createNewICalPeriodType(env,&aPeriod);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_recurrenceid
- * Signature: (Lnet/cp/jlibical/ICalTimeType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1recurrenceid
-  (JNIEnv *env, jobject jobj, jobject recurrenceid)
-{
-	// get the ICalProperty c++ object from jobj
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		icaltimetype aRecurrenceId;
-
-		if (copyObjToicaltimetype(env,recurrenceid,&aRecurrenceId))
-		{
-			cObj->set_recurrenceid(aRecurrenceId);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_recurrenceid
- * Signature: ()Lnet/cp/jlibical/ICalTimeType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1recurrenceid
-  (JNIEnv *env, jobject jobj)
-{
-	jobject result = 0;
-	// get the ICalProperty c++ object from jobj
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the exdate from CObj
-		icaltimetype aRecurrenceId = cObj->get_recurrenceid();
-
-		// create a new surrogate, using aRecurrenceId as the subject.
-		result = createNewICalTimeType(env,&aRecurrenceId);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_rrule
- * Signature: (Lnet/cp/jlibical/ICalRecurrenceType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1rrule
-  (JNIEnv *env, jobject jobj, jobject rrule)
-{
-	// get the ICalProperty c++ object from jobj
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		icalrecurrencetype aRRule;
-
-		if (copyObjToicalrecurrencetype(env,rrule,&aRRule))
-		{
-			cObj->set_rrule(aRRule);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_rrule
- * Signature: ()Lnet/cp/jlibical/ICalRecurrenceType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1rrule
-  (JNIEnv *env, jobject jobj)
-{
-	jobject result = 0;
-	// get the ICalProperty c++ object from jobj
-	ICalProperty* cObj = getSubjectAsICalProperty(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the rrule from CObj
-		icalrecurrencetype aRRule = cObj->get_rrule();
-
-		// create a new surrogate, using aExRule as the subject.
-		result = createNewICalRecurrenceType(env,&aRRule);
-	}
-
-	return(result);
-}
diff --git a/libical/src/java/net_cp_jlibical_ICalProperty_cxx.h b/libical/src/java/net_cp_jlibical_ICalProperty_cxx.h
deleted file mode 100644
index 686ae9a0e8..0000000000
--- a/libical/src/java/net_cp_jlibical_ICalProperty_cxx.h
+++ /dev/null
@@ -1,654 +0,0 @@
-
-/*======================================================================
- FILE: net_cp_jlibical_ICalProperty_cxx.h
- CREATOR: javah 1/11/02
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-#ifndef _Included_net_cp_jlibical_ICalProperty
-#define _Included_net_cp_jlibical_ICalProperty
-
-#ifndef JNI_H
-#include <jni.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    as_ical_string
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_as_1ical_1string
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    isa
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalProperty_isa
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    isa_property
- * Signature: (Ljava/lang/Object;)I
- */
-JNIEXPORT jboolean JNICALL Java_net_cp_jlibical_ICalProperty_isa_1property
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    add_parameter
- * Signature: (Lnet/cp/jlibical/ICalParameter;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_add_1parameter
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_parameter
- * Signature: (Lnet/cp/jlibical/ICalParameter;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1parameter
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_parameter_from_string
- * Signature: (Ljava/lang/String;Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1parameter_1from_1string
-  (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_parameter_as_string
- * Signature: (Ljava/lang/String;)Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1parameter_1as_1string
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    remove_parameter
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_remove_1parameter
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    count_parameters
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalProperty_count_1parameters
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_first_parameter
- * Signature: (I)Lnet/cp/jlibical/ICalParameter;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1first_1parameter
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_next_parameter
- * Signature: (I)Lnet/cp/jlibical/ICalParameter;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1next_1parameter
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_value
- * Signature: (Lnet/cp/jlibical/ICalValue;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1value
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_value_from_string
- * Signature: (Ljava/lang/String;Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1value_1from_1string
-  (JNIEnv *, jobject, jstring, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_value
- * Signature: ()Lnet/cp/jlibical/ICalValue;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1value
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_value_as_string
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1value_1as_1string
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_name
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1name
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    icalparameter_value_to_value_kind
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalProperty_icalparameter_1value_1to_1value_1kind
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_action
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1action
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_action
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalProperty_get_1action
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_attendee
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1attendee
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_attendee
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1attendee
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_comment
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1comment
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_comment
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1comment
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_description
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1description
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_description
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1description
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_dtend
- * Signature: (Lnet/cp/jlibical/ICalTimeType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1dtend
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_dtend
- * Signature: ()Lnet/cp/jlibical/ICalTimeType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1dtend
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_dtstamp
- * Signature: (Lnet/cp/jlibical/ICalTimeType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1dtstamp
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_dtstamp
- * Signature: ()Lnet/cp/jlibical/ICalTimeType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1dtstamp
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_dtstart
- * Signature: (Lnet/cp/jlibical/ICalTimeType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1dtstart
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_dtstart
- * Signature: ()Lnet/cp/jlibical/ICalTimeType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1dtstart
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_due
- * Signature: (Lnet/cp/jlibical/ICalTimeType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1due
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_due
- * Signature: ()Lnet/cp/jlibical/ICalTimeType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1due
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_duration
- * Signature: (Lnet/cp/jlibical/ICalDurationType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1duration
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_duration
- * Signature: ()Lnet/cp/jlibical/ICalDurationType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1duration
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_location
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1location
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_location
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1location
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_method
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1method
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_method
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalProperty_get_1method
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_organizer
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1organizer
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_organizer
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1organizer
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_owner
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1owner
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_owner
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1owner
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_prodid
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1prodid
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_prodid
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1prodid
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_query
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1query
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_query
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1query
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_queryname
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1queryname
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_queryname
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1queryname
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_repeat
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1repeat
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_repeat
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalProperty_get_1repeat
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_summary
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1summary
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_summary
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1summary
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_target
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1target
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_target
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1target
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_trigger
- * Signature: (Lnet/cp/jlibical/ICalTriggerType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1trigger
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_trigger
- * Signature: ()Lnet/cp/jlibical/ICalTriggerType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1trigger
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_tzid
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1tzid
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_tzid
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1tzid
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_uid
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1uid
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_uid
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1uid
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    init
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_init__
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    init
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_init__Ljava_lang_String_2
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    init
- * Signature: (ILjava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_init__ILjava_lang_String_2
-  (JNIEnv *, jobject, jint, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    init
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_init__I
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_status
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1status
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_status
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalProperty_get_1status
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_relcalid
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1relcalid
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_relcalid
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalProperty_get_1relcalid
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_exdate
- * Signature: (Lnet/cp/jlibical/ICalTimeType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1exdate
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_exdate
- * Signature: ()Lnet/cp/jlibical/ICalTimeType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1exdate
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_exrule
- * Signature: (Lnet/cp/jlibical/ICalRecurrenceType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1exrule
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_exrule
- * Signature: ()Lnet/cp/jlibical/ICalRecurrenceType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1exrule
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_freebusy
- * Signature: (Lnet/cp/jlibical/ICalPeriodType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1freebusy
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_freebusy
- * Signature: ()Lnet/cp/jlibical/ICalPeriodType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1freebusy
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_recurrenceid
- * Signature: (Lnet/cp/jlibical/ICalTimeType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1recurrenceid
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_recurrenceid
- * Signature: ()Lnet/cp/jlibical/ICalTimeType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1recurrenceid
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    set_rrule
- * Signature: (Lnet/cp/jlibical/ICalRecurrenceType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalProperty_set_1rrule
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalProperty
- * Method:    get_rrule
- * Signature: ()Lnet/cp/jlibical/ICalRecurrenceType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalProperty_get_1rrule
-  (JNIEnv *, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/libical/src/java/net_cp_jlibical_ICalValue_cxx.cpp b/libical/src/java/net_cp_jlibical_ICalValue_cxx.cpp
deleted file mode 100644
index de2adac88f..0000000000
--- a/libical/src/java/net_cp_jlibical_ICalValue_cxx.cpp
+++ /dev/null
@@ -1,436 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: net_cp_jlibical_ICalValue_cxx.cpp
- CREATOR: gnorman 1/10/02
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-#ifndef NET_CP_JLIBICAL_ICALVALUE_CXX_H
-#include "net_cp_jlibical_ICalValue_cxx.h"
-#endif
-
-#ifndef JLIBICAL_CONSTS_CXX_H
-#include "jlibical_consts_cxx.h"
-#endif
-
-#ifndef JLIBICAL_UTILS_CXX_H
-#include "jlibical_utils_cxx.h"
-#endif
-
-#ifndef ICALVALUE_CXX_H
-#include "icalvalue_cxx.h"
-#endif
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    as_ical_string
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalValue_as_1ical_1string
-  (JNIEnv *env, jobject jobj)
-{
-	jstring result = NULL;
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->as_ical_string();
-
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
-
-		result = env->NewStringUTF(icalStr);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    isa
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalValue_isa
-  (JNIEnv *env, jobject jobj)
-{
-	jint result = 0;
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		result = cObj->isa();
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    isa_value
- * Signature: (Ljava/lang/Object;)Z
- */
-JNIEXPORT jboolean JNICALL Java_net_cp_jlibical_ICalValue_isa_1value
-  (JNIEnv *env, jobject jobj, jobject arg)
-{
-	jboolean result = 0;
-
-	// get the c++ object from the jobj
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-	if (cObj != NULL)
-	{
-		// get the c++ object from arg
-		void* argObjPtr = 0;
-
-		if (arg != NULL)
-		{
-			argObjPtr = getCObjectPtr(env,jobj);
-		}
-
-		// get the result from the c++ object
-		result = cObj->isa_value(argObjPtr) != 0;
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    set_trigger
- * Signature: (Lnet/cp/jlibical/ICalTriggerType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1trigger
-  (JNIEnv *env, jobject jobj, jobject arg)
-{
-	// get the c++ object from the jobj
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-	if (cObj != NULL)
-	{
-		icaltriggertype aTrigger; 
-
-		if (copyObjToicaltriggertype(env,arg,&aTrigger))
-		{
-			cObj->set_trigger(aTrigger);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    get_trigger
- * Signature: ()Lnet/cp/jlibical/ICalTriggerType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalValue_get_1trigger
-  (JNIEnv *env, jobject jobj)
-{
-	jobject result = 0;
-
-	// get the c++ object from the jobj
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the trigger from CObj
-		icaltriggertype aTrigger = cObj->get_trigger();
-
-		// create a new surrogate, using aTrigger as the subject.
-		result = createNewICalTriggerType(env,&aTrigger);
-	}
-
-	return (result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    get_method
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalValue_get_1method
-  (JNIEnv *env, jobject jobj)
-{
-	jint result = 0;
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		result = cObj->get_method();
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    set_method
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1method
-  (JNIEnv *env, jobject jobj, jint value)
-{
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		cObj->set_method((icalproperty_method)value);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    get_text
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalValue_get_1text
-  (JNIEnv *env, jobject jobj)
-{
-	jstring result = NULL;
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_text();
-
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
-
-		result = env->NewStringUTF(icalStr);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    set_text
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1text
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		cObj->set_text((char*)szTemp);                                                                                                                                                                                                                    
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    get_duration
- * Signature: ()Lnet/cp/jlibical/ICalDurationType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalValue_get_1duration
-  (JNIEnv *env, jobject jobj)
-{
-	jobject result = 0;
-
-	// get the c++ object from the jobj
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the duration from CObj
-		icaldurationtype aDuration = cObj->get_duration();
-
-		// create a new surrogate, using aDuration as the subject.
-		result = createNewICalDurationType(env,&aDuration);
-	}
-
-	return (result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    set_duration
- * Signature: (Lnet/cp/jlibical/ICalDurationType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1duration
-  (JNIEnv *env, jobject jobj, jobject arg)
-{
-	// get the c++ object from the jobj
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		icaldurationtype aDuration;
-
-		if (copyObjToicaldurationtype(env,arg,&aDuration))
-		{
-			cObj->set_duration(aDuration);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    get_query
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalValue_get_1query
-  (JNIEnv *env, jobject jobj)
-{
-	jstring result = NULL;
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_query();
-
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
-
-		result = env->NewStringUTF(icalStr);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    set_query
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1query
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		cObj->set_query((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    get_datetime
- * Signature: ()Lnet/cp/jlibical/ICalTimeType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalValue_get_1datetime
-  (JNIEnv *env, jobject jobj)
-{
-	jobject result = NULL;
-
-	// get the c++ object from the jobj
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		icaltimetype aTime = cObj->get_datetime();
-		result = createNewICalTimeType(env,&aTime);
-	}
-
-	return (result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    set_datetime
- * Signature: (Lnet/cp/jlibical/ICalTimeType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1datetime
-  (JNIEnv *env, jobject jobj, jobject arg)
-{
-	// get the c++ object from the jobj
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		icaltimetype aTime;
-
-		if (copyObjToicaltimetype(env,arg,&aTime))
-		{
-			cObj->set_datetime(aTime);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    get_action
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalValue_get_1action
-  (JNIEnv *env, jobject jobj)
-{
-	jint result = 0;
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		result = cObj->get_action();
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    set_action
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1action
-  (JNIEnv *env, jobject jobj, jint value)
-{
-	ICalValue* cObj = getSubjectAsICalValue(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		cObj->set_action((icalproperty_action)value);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    init
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_init__
-  (JNIEnv *env, jobject jobj)
-{
-	setCObjectPtr(env,jobj,new ICalValue());
-}
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    init
- * Signature: (ILjava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_init__ILjava_lang_String_2
-  (JNIEnv *env, jobject jobj, jint kind, jstring str)
-{
-	if (str != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		setCObjectPtr(env,jobj,new ICalValue((icalvalue_kind)kind,(char*)szTemp));
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-	else
-	{
-		throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    init
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_init__I
-  (JNIEnv *env, jobject jobj, jint kind)
-{
-	setCObjectPtr(env,jobj,new ICalValue((icalvalue_kind)kind));
-}
diff --git a/libical/src/java/net_cp_jlibical_ICalValue_cxx.h b/libical/src/java/net_cp_jlibical_ICalValue_cxx.h
deleted file mode 100644
index 989cf59a99..0000000000
--- a/libical/src/java/net_cp_jlibical_ICalValue_cxx.h
+++ /dev/null
@@ -1,182 +0,0 @@
-
-/*======================================================================
- FILE: net_cp_jlibical_ICalValue_cxx.h
- CREATOR: javah 1/11/02
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-#ifndef _Included_net_cp_jlibical_ICalValue
-#define _Included_net_cp_jlibical_ICalValue
-
-#ifndef JNI_H
-#include <jni.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    as_ical_string
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalValue_as_1ical_1string
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    isa
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalValue_isa
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    isa_value
- * Signature: (Ljava/lang/Object;)Z
- */
-JNIEXPORT jboolean JNICALL Java_net_cp_jlibical_ICalValue_isa_1value
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    set_trigger
- * Signature: (Lnet/cp/jlibical/ICalTriggerType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1trigger
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    get_trigger
- * Signature: ()Lnet/cp/jlibical/ICalTriggerType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalValue_get_1trigger
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    get_method
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalValue_get_1method
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    set_method
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1method
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    get_text
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalValue_get_1text
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    set_text
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1text
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    get_duration
- * Signature: ()Lnet/cp/jlibical/ICalDurationType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalValue_get_1duration
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    set_duration
- * Signature: (Lnet/cp/jlibical/ICalDurationType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1duration
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    get_query
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_ICalValue_get_1query
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    set_query
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1query
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    get_datetime
- * Signature: ()Lnet/cp/jlibical/ICalTimeType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_ICalValue_get_1datetime
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    set_datetime
- * Signature: (Lnet/cp/jlibical/ICalTimeType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1datetime
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    get_action
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_ICalValue_get_1action
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    set_action
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_set_1action
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    init
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_init__
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    init
- * Signature: (ILjava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_init__ILjava_lang_String_2
-  (JNIEnv *, jobject, jint, jstring);
-
-/*
- * Class:     net_cp_jlibical_ICalValue
- * Method:    init
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_ICalValue_init__I
-  (JNIEnv *, jobject, jint);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/libical/src/java/net_cp_jlibical_VComponent_cxx.cpp b/libical/src/java/net_cp_jlibical_VComponent_cxx.cpp
deleted file mode 100644
index e9dc6a4cc8..0000000000
--- a/libical/src/java/net_cp_jlibical_VComponent_cxx.cpp
+++ /dev/null
@@ -1,956 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: net_cp_jlibical_VComponent_cxx.cpp
- CREATOR: gnorman 1/10/02
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-#ifndef NET_CP_JLIBICAL_VCOMPONENT_CXX_H
-#include "net_cp_jlibical_VComponent_cxx.h"
-#endif
-
-#ifndef JLIBICAL_CONSTS_CXX_H
-#include "jlibical_consts_cxx.h"
-#endif
-
-#ifndef JLIBICAL_UTILS_CXX_H
-#include "jlibical_utils_cxx.h"
-#endif
-
-#ifndef VCOMPONENT_CXX_H
-#include "vcomponent.h"
-#endif
-
-#ifndef ICALPROPERTY_CXX_H
-#include "icalproperty_cxx.h"
-#endif
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    as_ical_string
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_VComponent_as_1ical_1string
-  (JNIEnv *env, jobject jobj)
-{
-	jstring result = NULL;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->as_ical_string();
-
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
-
-		result = env->NewStringUTF(icalStr);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    isa
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_VComponent_isa
-  (JNIEnv *env, jobject jobj)
-{
-	jint result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		result = cObj->isa();
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    isa_component
- * Signature: (Ljava/lang/Object;)Z
- */
-JNIEXPORT jboolean JNICALL Java_net_cp_jlibical_VComponent_isa_1component
-  (JNIEnv *env, jobject jobj, jobject candidateObj)
-{
-	jboolean result = 0;
-
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-	if (cObj != NULL)
-	{
-		void* candidateValue = 0;
-
-		if (candidateObj != NULL)
-		{
-			// get the c++ object from candidateObj (as long)
-			candidateValue = getCObjectPtr(env,candidateObj);
-		}
-
-		// get the result from the c++ object (candidateValue can be 0, it's cObj's responsibility to handle this if an error).
-		result = cObj->isa_component(candidateValue) != 0;
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    add_property
- * Signature: (Lnet/cp/jlibical/ICalProperty;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_add_1property
-  (JNIEnv *env, jobject jobj, jobject jprop)
-{
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-	if (cObj != NULL)
-	{
-		// get the ICalProperty c++ object from jprop
-		ICalProperty* icalProperty = getSubjectAsICalProperty(env,jprop,JLIBICAL_ERR_ILLEGAL_ARGUMENT);
-
-		if (icalProperty != NULL)
-		{
-			cObj->add_property(icalProperty);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    remove_property
- * Signature: (Lnet/cp/jlibical/ICalProperty;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_remove_1property
-  (JNIEnv *env, jobject jobj, jobject jprop)
-{
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-	if (cObj != NULL)
-	{
-		// get the ICalProperty c++ object from jprop
-		ICalProperty* icalProperty = getSubjectAsICalProperty(env,jprop,JLIBICAL_ERR_ILLEGAL_ARGUMENT);
-
-		if (icalProperty != NULL)
-		{
-			cObj->remove_property(icalProperty);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    count_properties
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_VComponent_count_1properties
-  (JNIEnv *env, jobject jobj, jint kind)
-{
-	jint result = 0;
-
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-	if (cObj != NULL)
-	{
-		result = cObj->count_properties((icalproperty_kind)kind);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_current_property
- * Signature: ()Lnet/cp/jlibical/ICalProperty;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1current_1property
-  (JNIEnv *env, jobject jobj)
-{
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the current property from CObj
-		ICalProperty* aProperty = cObj->get_current_property();
-
-		// create a new surrogate, using aProperty as the subject (returns NULL if subject is NULL).
-		result = createNewICalPropertySurrogate(env,aProperty);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_first_property
- * Signature: (I)Lnet/cp/jlibical/ICalProperty;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1first_1property
-  (JNIEnv *env, jobject jobj, jint kind)
-{
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the first property from CObj
-		ICalProperty* aProperty = cObj->get_first_property((icalproperty_kind)kind);
-
-		// create a new surrogate, using aProperty as the subject (returns NULL if subject is NULL).
-		result = createNewICalPropertySurrogate(env,aProperty);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_next_property
- * Signature: (I)Lnet/cp/jlibical/ICalProperty;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1next_1property
-  (JNIEnv *env, jobject jobj, jint kind)
-{
-	jobject result = 0;
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the next property from CObj
-		ICalProperty* aProperty = cObj->get_next_property((icalproperty_kind)kind);
-
-		// create a new surrogate, using aProperty as the subject (returns NULL if subject is NULL).
-		result = createNewICalPropertySurrogate(env,aProperty);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_inner
- * Signature: ()Lnet/cp/jlibical/VComponent;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1inner
-  (JNIEnv *env, jobject jobj)
-{
-	jobject result = 0;
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the next property from CObj
-		VComponent* inner = cObj->get_inner();
-
-		// create a new surrogate, using inner as the subject (returns NULL if subject is NULL).
-		result = createNewVComponentSurrogate(env,inner);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    add_component
- * Signature: (Lnet/cp/jlibical/VComponent;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_add_1component
-  (JNIEnv *env, jobject jobj, jobject jcomp)
-{
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-	if (cObj != NULL)
-	{
-		// get the VComponent c++ object from jcomp
-		VComponent* aComponent = getSubjectAsVComponent(env,jcomp,JLIBICAL_ERR_ILLEGAL_ARGUMENT);
-
-		if (aComponent != NULL)
-		{
-			cObj->add_component(aComponent);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    remove_component
- * Signature: (Lnet/cp/jlibical/VComponent;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_remove_1component
-  (JNIEnv *env, jobject jobj, jobject jcomp)
-{
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-	if (cObj != NULL)
-	{
-		// get the VComponent c++ object from jcomp
-		VComponent* aComponent = getSubjectAsVComponent(env,jcomp,JLIBICAL_ERR_ILLEGAL_ARGUMENT);
-
-		if (aComponent != NULL)
-		{
-			cObj->remove_component(aComponent);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    count_components
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_VComponent_count_1components
-  (JNIEnv *env, jobject jobj, jint kind)
-{
-	jint result = 0;
-
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-	if (cObj != NULL)
-	{
-		result = cObj->count_components((icalcomponent_kind)kind);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_current_component
- * Signature: ()Lnet/cp/jlibical/VComponent;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1current_1component
-  (JNIEnv *env, jobject jobj)
-{
-	jobject result = 0;
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the next property from CObj
-		VComponent* aComponent = cObj->get_current_component();
-
-		// create a new surrogate, using aComponent as the subject (returns NULL if subject is NULL).
-		result = createNewVComponentSurrogate(env,aComponent);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_first_component
- * Signature: (I)Lnet/cp/jlibical/VComponent;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1first_1component
-  (JNIEnv *env, jobject jobj, jint kind)
-{
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the first component from CObj
-		VComponent* aComponent = cObj->get_first_component((icalcomponent_kind)kind);
-
-		// create a new surrogate, using aComponent as the subject (returns NULL if subject is NULL).
-		result = createNewVComponentSurrogate(env,aComponent);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_next_component
- * Signature: (I)Lnet/cp/jlibical/VComponent;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1next_1component
-  (JNIEnv *env, jobject jobj, jint kind)
-{
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the first component from CObj
-		VComponent* aComponent = cObj->get_next_component((icalcomponent_kind)kind);
-
-		// create a new surrogate, using aComponent as the subject (returns NULL if subject is NULL).
-		result = createNewVComponentSurrogate(env,aComponent);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_dtstart
- * Signature: ()Lnet/cp/jlibical/ICalTimeType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1dtstart
-  (JNIEnv *env, jobject jobj)
-{
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the dtstart time from CObj
-		icaltimetype aTime = cObj->get_dtstart();
-
-                // create a new surrogate, using aTime as the subject.
-		result = createNewICalTimeType(env,&aTime);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    set_dtstart
- * Signature: (Lnet/cp/jlibical/ICalTimeType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1dtstart
-  (JNIEnv *env, jobject jobj, jobject dtstart)
-{
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		icaltimetype aStartTime;
-
-		if (copyObjToicaltimetype(env,dtstart,&aStartTime))
-		{
-			cObj->set_dtstart(aStartTime);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_dtend
- * Signature: ()Lnet/cp/jlibical/ICalTimeType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1dtend
-  (JNIEnv *env, jobject jobj)
-{
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the dtend time from CObj
-		icaltimetype aTime = cObj->get_dtend();
-
-		// create a new surrogate, using aTime as the subject.
-		result = createNewICalTimeType(env,&aTime);
-
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    set_dtend
- * Signature: (Lnet/cp/jlibical/ICalTimeType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1dtend
-  (JNIEnv *env, jobject jobj, jobject dtend)
-{
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		icaltimetype anEndTime;
-
-		if (copyObjToicaltimetype(env,dtend,&anEndTime))
-		{
-			cObj->set_dtend(anEndTime);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_duration
- * Signature: ()Lnet/cp/jlibical/ICalDurationType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1duration
-  (JNIEnv *env, jobject jobj)
-{
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the duration time from CObj
-		icaldurationtype aDuration = cObj->get_duration();
-
-		// create a new surrogate, using aDuration as the subject.
-		result = createNewICalDurationType(env,&aDuration);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    set_duration
- * Signature: (Lnet/cp/jlibical/ICalDurationType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1duration
-  (JNIEnv *env, jobject jobj, jobject duration)
-{
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		icaldurationtype aDuration;
-
-		if (copyObjToicaldurationtype(env,duration,&aDuration))
-		{
-			cObj->set_duration(aDuration);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_method
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_VComponent_get_1method
-  (JNIEnv *env, jobject jobj)
-{
-	jint result = 0;
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		result = cObj->get_method();
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    set_method
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1method
-  (JNIEnv *env, jobject jobj, jint value)
-{
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		cObj->set_method((icalproperty_method)value);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_summary
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_VComponent_get_1summary
-  (JNIEnv *env, jobject jobj)
-{
-	jstring result = NULL;
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_summary();
-
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
-
-		result = env->NewStringUTF(icalStr);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    set_summary
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1summary
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		cObj->set_summary((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_dtstamp
- * Signature: ()Lnet/cp/jlibical/ICalTimeType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1dtstamp
-  (JNIEnv *env, jobject jobj)
-{
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the recurrenceid from CObj
-		icaltimetype aDTStamp = cObj->get_dtstamp();
-
-        // create a new surrogate, using aRecurrenceId as the subject.
-		result = createNewICalTimeType(env,&aDTStamp);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    set_dtstamp
- * Signature: (Lnet/cp/jlibical/ICalTimeType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1dtstamp
-  (JNIEnv *env, jobject jobj, jobject dtstamp)
-{
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		icaltimetype aDTStamp;
-
-		if (copyObjToicaltimetype(env,dtstamp,&aDTStamp))
-		{
-			cObj->set_dtstamp(aDTStamp);
-		}
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_location
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_VComponent_get_1location
-  (JNIEnv *env, jobject jobj)
-{
-        jstring result = NULL;
-        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-        if (cObj != NULL)
-        {
-                char* icalStr = cObj->get_location();
-
-                if (icalStr == NULL)
-                {
-                        icalStr = "";
-                }
-
-                result = env->NewStringUTF(icalStr);
-        }
-
-        return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    set_location
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1location
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-        if (cObj != NULL)
-        {
-                const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-                cObj->set_summary((char*)szTemp);
-                env->ReleaseStringUTFChars(str,szTemp);
-        }
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_description
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_VComponent_get_1description
-  (JNIEnv *env, jobject jobj)
-{
-        jstring result = NULL;
-        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-        if (cObj != NULL)
-        {
-                char* icalStr = cObj->get_description();
-
-                if (icalStr == NULL)
-                {
-                        icalStr = "";
-                }
-
-                result = env->NewStringUTF(icalStr);
-        }
-
-        return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    set_description
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1description
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-        if (cObj != NULL)
-        {
-                const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-                cObj->set_summary((char*)szTemp);
-                env->ReleaseStringUTFChars(str,szTemp);
-        }
-}
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_uid
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_VComponent_get_1uid
-  (JNIEnv *env, jobject jobj)
-{
-	jstring result = NULL;
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		char* icalStr = cObj->get_uid();
-
-		if (icalStr == NULL)
-		{
-			icalStr = "";
-		}
-
-		result = env->NewStringUTF(icalStr);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    set_uid
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1uid
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		cObj->set_uid((char*)szTemp);
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_first_real_component
- * Signature: ()Lnet/cp/jlibical/VComponent;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1first_1real_1component
-  (JNIEnv *env, jobject jobj)
-{
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the first component from CObj
-		VComponent* aComponent = cObj->get_first_real_component();
-
-		// create a new surrogate, using aComponent as the subject (returns NULL if subject is NULL).
-		result = createNewVComponentSurrogate(env,aComponent);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    init
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_init__
-  (JNIEnv *env, jobject jobj)
-{
-	setCObjectPtr(env,jobj,new VComponent());
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    init
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_init__Ljava_lang_String_2
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-	if (str != NULL)
-	{
-		const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-		setCObjectPtr(env,jobj,new VComponent((char*)szTemp));
-		env->ReleaseStringUTFChars(str,szTemp);
-	}
-	else
-	{
-		throwException( env, JLIBICAL_ERR_ILLEGAL_ARGUMENT );
-	}
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    init
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_init__I
-  (JNIEnv *env, jobject jobj, jint kind)
-{
-	setCObjectPtr(env,jobj,new VComponent((icalcomponent_kind)kind));
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    set_relcalid
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1relcalid
-  (JNIEnv *env, jobject jobj, jstring str)
-{
-        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-        if (cObj != NULL)
-        {
-                const char* szTemp = env->GetStringUTFChars(str,NULL);
-
-                cObj->set_relcalid((char*)szTemp);
-                env->ReleaseStringUTFChars(str,szTemp);
-        }
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_relcalid
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_VComponent_get_1relcalid
-  (JNIEnv *env, jobject jobj)
-{
-        jstring result = NULL;
-        VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-        if (cObj != NULL)
-        {
-                char* icalStr = cObj->get_relcalid();
-
-                if (icalStr == NULL)
-                {
-                        icalStr = "";
-                }
-
-                result = env->NewStringUTF(icalStr);
-        }
-
-        return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_recurrenceid
- * Signature: ()Lnet/cp/jlibical/ICalTimeType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1recurrenceid
-  (JNIEnv *env, jobject jobj)
-{
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		// get the recurrenceid from CObj
-		icaltimetype aRecurrenceId = cObj->get_recurrenceid();
-
-        // create a new surrogate, using aRecurrenceId as the subject.
-		result = createNewICalTimeType(env,&aRecurrenceId);
-	}
-
-	return(result);
-}
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    set_recurrenceid
- * Signature: (Lnet/cp/jlibical/ICalTimeType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1recurrenceid
-  (JNIEnv *env, jobject jobj, jobject recurrenceid)
-{
-	jobject result = 0;
-	// get the VComponent c++ object from jobj
-	VComponent* cObj = getSubjectAsVComponent(env,jobj,JLIBICAL_ERR_CLIENT_INTERNAL);
-
-	if (cObj != NULL)
-	{
-		icaltimetype aRecurrenceId;
-
-		if (copyObjToicaltimetype(env,recurrenceid,&aRecurrenceId))
-		{
-			cObj->set_recurrenceid(aRecurrenceId);
-		}
-	}
-}
diff --git a/libical/src/java/net_cp_jlibical_VComponent_cxx.h b/libical/src/java/net_cp_jlibical_VComponent_cxx.h
deleted file mode 100644
index ad2dfb60a4..0000000000
--- a/libical/src/java/net_cp_jlibical_VComponent_cxx.h
+++ /dev/null
@@ -1,358 +0,0 @@
-
-/*======================================================================
- FILE: net_cp_jlibical_VComponent_cxx.h
- CREATOR: javah 1/11/02
- (C) COPYRIGHT 2002, Critical Path
-======================================================================*/
-
-#ifndef _Included_net_cp_jlibical_VComponent
-#define _Included_net_cp_jlibical_VComponent
-
-#ifndef JNI_H
-#include <jni.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    as_ical_string
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_VComponent_as_1ical_1string
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    isa
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_VComponent_isa
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    isa_component
- * Signature: (Ljava/lang/Object;)Z
- */
-JNIEXPORT jboolean JNICALL Java_net_cp_jlibical_VComponent_isa_1component
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    add_property
- * Signature: (Lnet/cp/jlibical/ICalProperty;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_add_1property
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    remove_property
- * Signature: (Lnet/cp/jlibical/ICalProperty;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_remove_1property
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    count_properties
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_VComponent_count_1properties
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_current_property
- * Signature: ()Lnet/cp/jlibical/ICalProperty;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1current_1property
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_first_property
- * Signature: (I)Lnet/cp/jlibical/ICalProperty;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1first_1property
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_next_property
- * Signature: (I)Lnet/cp/jlibical/ICalProperty;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1next_1property
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_inner
- * Signature: ()Lnet/cp/jlibical/VComponent;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1inner
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    add_component
- * Signature: (Lnet/cp/jlibical/VComponent;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_add_1component
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    remove_component
- * Signature: (Lnet/cp/jlibical/VComponent;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_remove_1component
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    count_components
- * Signature: (I)I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_VComponent_count_1components
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_current_component
- * Signature: ()Lnet/cp/jlibical/VComponent;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1current_1component
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_first_component
- * Signature: (I)Lnet/cp/jlibical/VComponent;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1first_1component
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_next_component
- * Signature: (I)Lnet/cp/jlibical/VComponent;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1next_1component
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_dtstart
- * Signature: ()Lnet/cp/jlibical/ICalTimeType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1dtstart
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    set_dtstart
- * Signature: (Lnet/cp/jlibical/ICalTimeType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1dtstart
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_dtend
- * Signature: ()Lnet/cp/jlibical/ICalTimeType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1dtend
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    set_dtend
- * Signature: (Lnet/cp/jlibical/ICalTimeType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1dtend
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_duration
- * Signature: ()Lnet/cp/jlibical/ICalDurationType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1duration
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    set_duration
- * Signature: (Lnet/cp/jlibical/ICalDurationType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1duration
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_method
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL Java_net_cp_jlibical_VComponent_get_1method
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    set_method
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1method
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_summary
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_VComponent_get_1summary
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    set_summary
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1summary
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_dtstamp
- * Signature: ()Lnet/cp/jlibical/ICalTimeType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1dtstamp
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    set_dtstamp
- * Signature: (Lnet/cp/jlibical/ICalTimeType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1dtstamp
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_location
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_VComponent_get_1location
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    set_location
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1location
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_description
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_VComponent_get_1description
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    set_description
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1description
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_uid
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_VComponent_get_1uid
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    set_uid
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1uid
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_first_real_component
- * Signature: ()Lnet/cp/jlibical/VComponent;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1first_1real_1component
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    init
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_init__
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    init
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_init__Ljava_lang_String_2
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    init
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_init__I
-  (JNIEnv *, jobject, jint);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_relcalid
- * Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_net_cp_jlibical_VComponent_get_1relcalid
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    set_relcalid
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1relcalid
-  (JNIEnv *, jobject, jstring);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    get_recurrenceid
- * Signature: ()Lnet/cp/jlibical/ICalTimeType;
- */
-JNIEXPORT jobject JNICALL Java_net_cp_jlibical_VComponent_get_1recurrenceid
-  (JNIEnv *, jobject);
-
-/*
- * Class:     net_cp_jlibical_VComponent
- * Method:    set_recurrenceid
- * Signature: (Lnet/cp/jlibical/ICalTimeType;)V
- */
-JNIEXPORT void JNICALL Java_net_cp_jlibical_VComponent_set_1recurrenceid
-  (JNIEnv *, jobject, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/libical/src/java/testjni.java b/libical/src/java/testjni.java
deleted file mode 100644
index a7eb5886a1..0000000000
--- a/libical/src/java/testjni.java
+++ /dev/null
@@ -1,377 +0,0 @@
-package net.cp.jlibical;
-
-import java.lang.String;
-
-public class testjni
-{
-	static final String content = "BEGIN:VCALENDAR\nVERSION:2.1\nBEGIN:VEVENT\nUID:abcd12345\nDTSTART:20020307T180000Z\nDTEND:20020307T190000Z\nSUMMARY:Important Meeting\nEND:VEVENT\nEND:VCALENDAR";
-	public static void main(String[] args)
-	{
-                // VAGENDA test case
-
-                ICalProperty calidProp = new ICalProperty(ICalProperty.ICalPropertyKind.ICAL_RELCALID_PROPERTY);
-                ICalProperty ownerProp = new ICalProperty(ICalProperty.ICalPropertyKind.ICAL_OWNER_PROPERTY);
-
-                calidProp.set_relcalid("1212");
-                ownerProp.set_owner("Bill Smith");
-
-                VAgenda vAgenda = new VAgenda();
-                vAgenda.add_property(calidProp);
-                vAgenda.add_property(ownerProp);
-
-                System.out.println("VAgenda:\n" + vAgenda.as_ical_string());
-
-                // VEVENT test case
-
-		ICalProperty summProp  = new ICalProperty(ICalProperty.ICalPropertyKind.ICAL_SUMMARY_PROPERTY);
-		ICalProperty startProp = new ICalProperty(ICalProperty.ICalPropertyKind.ICAL_DTSTART_PROPERTY);
-		ICalProperty endProp   = new ICalProperty(ICalProperty.ICalPropertyKind.ICAL_DTEND_PROPERTY);
-
-        	ICalProperty locationProp = new ICalProperty(ICalProperty.ICalPropertyKind.ICAL_LOCATION_PROPERTY);
-        	ICalProperty descProp = new ICalProperty(ICalProperty.ICalPropertyKind.ICAL_DESCRIPTION_PROPERTY);
-
-		ICalTimeType starttime = new ICalTimeType();
-		starttime.setYear(2001);
-		starttime.setMonth(12);
-		starttime.setDay(21);
-		starttime.setHour(18);
-		starttime.setMinute(0);
-		starttime.setSecond(0);
-		starttime.setIs_utc(true);
-		System.out.println("done creating starttime");
-
-		ICalTimeType endtime = new ICalTimeType();
-		endtime.setYear(2002);
-		endtime.setMonth(1);
-		endtime.setDay(1);
-		endtime.setHour(8);
-		endtime.setMinute(0);
-		endtime.setSecond(0);
-		endtime.setIs_utc(true);
-		System.out.println("done creating endtime");
-
-
-		// START - get, set_exdate
-		ICalProperty property_tma = new ICalProperty(ICalProperty.ICalPropertyKind.ICAL_EXDATE_PROPERTY);
-		property_tma.set_exdate(starttime);
-		ICalTimeType starttime_return = property_tma.get_exdate();
-		System.out.println("****** property - exdate ******");
-		System.out.println("setYear=" + starttime_return.getYear());
-		System.out.println("setMonth=" + starttime_return.getMonth());
-		System.out.println("setDay=" + starttime_return.getDay());
-		System.out.println("setHour=" + starttime_return.getHour());
-		System.out.println("setMinute=" + starttime_return.getMinute());
-		System.out.println("setSecond=" + starttime_return.getSecond());
-		System.out.println("******* property - exdate *****");
-
-		// END - get, set exdate
-
-		// START - get, set exrule
-		ICalProperty property_exrule_tma = new ICalProperty(ICalProperty.ICalPropertyKind.ICAL_EXRULE_PROPERTY);
-		ICalRecurrenceType exrule_tma = new ICalRecurrenceType();
-		exrule_tma.setUntil(starttime);
-		exrule_tma.setFreq(ICalRecurrenceType.ICalRecurrenceTypeFrequency.ICAL_MINUTELY_RECURRENCE);
-		exrule_tma.setWeek_start(ICalRecurrenceType.ICalRecurrenceTypeWeekday.ICAL_SUNDAY_WEEKDAY);
-		short test_tma[] = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61};
-
-		exrule_tma.setBy_second(test_tma);
-		exrule_tma.setBy_minute(test_tma);
-		property_exrule_tma.set_exrule(exrule_tma);
-
-		ICalRecurrenceType recurence_tma_return = property_exrule_tma.get_exrule();
-		System.out.println("****** property - exrule ******");
-		System.out.println("setFreq=" + recurence_tma_return.getFreq());
-		System.out.println("setWeek_start=" + recurence_tma_return.getWeek_start());
-		System.out.println("setBy_second[30]=" + recurence_tma_return.getBy_secondIndexed(30));
-		System.out.println("setBy_minute[28]=" + recurence_tma_return.getBy_minuteIndexed(28));
-		System.out.println("****** property - exrule ******");
-
-		// END - get, set exrule
-
-		// START - get, set recurrenceid
-		ICalProperty property_recurrenceid_tma = new ICalProperty(ICalProperty.ICalPropertyKind.ICAL_RECURRENCEID_PROPERTY);
-		property_recurrenceid_tma.set_recurrenceid(starttime);
-		ICalTimeType recurrenceid_return = property_recurrenceid_tma.get_recurrenceid();
-		System.out.println("****** property - recurrenceid ******");
-		System.out.println("setYear=" + recurrenceid_return.getYear());
-		System.out.println("setMonth=" + recurrenceid_return.getMonth());
-		System.out.println("setDay=" + recurrenceid_return.getDay());
-		System.out.println("setHour=" + recurrenceid_return.getHour());
-		System.out.println("setMinute=" + recurrenceid_return.getMinute());
-		System.out.println("setSecond=" + recurrenceid_return.getSecond());
-		System.out.println("******* property - recurrenceid *****");
-
-		// END - get, set recurrenceid
-
-		// START - get, set rrule
-		ICalProperty property_rrule_tma = new ICalProperty(ICalProperty.ICalPropertyKind.ICAL_RRULE_PROPERTY);
-		ICalRecurrenceType rrule_tma = new ICalRecurrenceType();
-		rrule_tma.setUntil(starttime);
-		rrule_tma.setFreq(ICalRecurrenceType.ICalRecurrenceTypeFrequency.ICAL_MINUTELY_RECURRENCE);
-		rrule_tma.setWeek_start(ICalRecurrenceType.ICalRecurrenceTypeWeekday.ICAL_SUNDAY_WEEKDAY);
-		short test_hour_tma[] = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25};
-		rrule_tma.setBy_hour(test_hour_tma);
-		property_rrule_tma.set_rrule(rrule_tma);
-
-		ICalRecurrenceType rrule_tma_return = property_rrule_tma.get_rrule();
-		System.out.println("****** property - rrule ******");
-		System.out.println("setFreq=" + rrule_tma_return.getFreq());
-		System.out.println("setWeek_start=" + rrule_tma_return.getWeek_start());
-		System.out.println("setBy_hour[11]=" + rrule_tma_return.getBy_hourIndexed(11));
-		System.out.println("****** property - rrule ******");
-		// END - get, set rrule
-
-		// START - get, set freebusy
-		ICalProperty property_freebusy_tma = new ICalProperty(ICalProperty.ICalPropertyKind.ICAL_FREEBUSY_PROPERTY);
-		ICalPeriodType period_tma = new ICalPeriodType();
-		ICalDurationType duration_tma = new ICalDurationType();
-		duration_tma.setDays((long) 0);
-		duration_tma.setHours((long) 10);
-		duration_tma.setMinutes((long) 15);
-
-		period_tma.setStart(starttime);
-		period_tma.setEnd(endtime);
-		period_tma.setDuration(duration_tma);
-
-		property_freebusy_tma.set_freebusy(period_tma);
-
-		ICalPeriodType period_tma_return = property_freebusy_tma.get_freebusy();
-		ICalTimeType start_tma_return = period_tma_return.getStart();
-		ICalTimeType end_tma_return = period_tma_return.getEnd();
-		ICalDurationType duration_tma_return = period_tma_return.getDuration();
-
-		System.out.println("****** property - freebusy - start ******");
-		System.out.println("setYear=" + start_tma_return.getYear());
-		System.out.println("setMonth=" + start_tma_return.getMonth());
-		System.out.println("setDay=" + start_tma_return.getDay());
-		System.out.println("setHour=" + start_tma_return.getHour());
-		System.out.println("setMinute=" + start_tma_return.getMinute());
-		System.out.println("setSecond=" + start_tma_return.getSecond());
-		System.out.println("******* property - freebusy - start *****");
-
-		System.out.println("****** property - freebusy - end ******");
-		System.out.println("setYear=" + end_tma_return.getYear());
-		System.out.println("setMonth=" + end_tma_return.getMonth());
-		System.out.println("setDay=" + end_tma_return.getDay());
-		System.out.println("setHour=" + end_tma_return.getHour());
-		System.out.println("setMinute=" + end_tma_return.getMinute());
-		System.out.println("setSecond=" + end_tma_return.getSecond());
-		System.out.println("******* property - freebusy - end *****");
-
-		System.out.println("****** property - freebusy - duration ******");
-		System.out.println("setYear=" + duration_tma_return.getDays());
-		System.out.println("setMonth=" + duration_tma_return.getHours());
-		System.out.println("setDay=" + duration_tma_return.getMinutes());
-		System.out.println("******* property - freebusy - duration *****");
-
-		// END - get, set freebusy
-
-		// START - get, set dtstamp
-		ICalProperty property_dtstamp_tma = new ICalProperty(ICalProperty.ICalPropertyKind.ICAL_DTSTAMP_PROPERTY);
-		property_dtstamp_tma.set_dtstamp(starttime);
-		ICalTimeType dtstamp_tma_return = property_dtstamp_tma.get_dtstamp();
-		System.out.println("****** property - dtstamp ******");
-		System.out.println("setYear=" + dtstamp_tma_return.getYear());
-		System.out.println("setMonth=" + dtstamp_tma_return.getMonth());
-		System.out.println("setDay=" + dtstamp_tma_return.getDay());
-		System.out.println("setHour=" + dtstamp_tma_return.getHour());
-		System.out.println("setMinute=" + dtstamp_tma_return.getMinute());
-		System.out.println("setSecond=" + dtstamp_tma_return.getSecond());
-		System.out.println("******* property - dtstamp *****");
-		// END - get, set dtstamp
-		// START - get, set attendee
-		ICalProperty property_attendee_tma = new ICalProperty(ICalProperty.ICalPropertyKind.ICAL_ATTENDEE_PROPERTY);
-		property_attendee_tma.set_attendee("John");
-		String attendee_tma_return = property_attendee_tma.get_attendee();
-		System.out.println("****** property - attendee ******");
-		System.out.println("setAttendee=" + attendee_tma_return);
-		System.out.println("****** property - attendee ******");
-		// END - get, set attendee
-		// START - get, set comment
-		ICalProperty property_comment_tma = new ICalProperty(ICalProperty.ICalPropertyKind.ICAL_COMMENT_PROPERTY);
-		property_comment_tma.set_comment("John");
-		String comment_tma_return = property_comment_tma.get_comment();
-		System.out.println("****** property - comment ******");
-		System.out.println("setComment=" + comment_tma_return);
-		System.out.println("****** property - comment ******");
-		// END - get, set comment
-		// START - get, set organizer
-		ICalProperty property_organizer_tma = new ICalProperty(ICalProperty.ICalPropertyKind.ICAL_ORGANIZER_PROPERTY);
-		property_organizer_tma.set_organizer("John");
-		String organizer_tma_return = property_organizer_tma.get_organizer();
-		System.out.println("****** property - organizer ******");
-		System.out.println("setOrganizer=" + organizer_tma_return);
-		System.out.println("****** property - organizer ******");
-		// END - get, set organizer
-
-		summProp.set_summary("New Year's Eve Party, and more");
-		System.out.println("done setting summProp");
-		startProp.set_dtstart(starttime);
-		System.out.println("done setting startProp");
-		endProp.set_dtend(endtime);
-		System.out.println("done setting endProp");
-		locationProp.set_location("Bothin, Marin County, CA, USA");
-		System.out.println("done setting locationProp\n");
-                descProp.set_description("Drive carefully; come to have fun!");
-                System.out.println("done setting descProp\n");
-
-		VEvent vEvent = new VEvent();
-		vEvent.add_property(summProp);
-		vEvent.add_property(startProp);
-		vEvent.add_property(endProp);
-		vEvent.add_property(locationProp);
-                vEvent.add_property(descProp);
-
-                ICalTimeType sTime = vEvent.get_dtstart();
-                ICalTimeType eTime = vEvent.get_dtend();
-
-		//System.out.println("VEvent:\n" + vEvent.as_ical_string());
-                System.out.println("Summary: \n" + vEvent.get_summary());
-                System.out.println("DTSTART: \n" + sTime.getYear() + sTime.getMonth() + sTime.getDay() +
-                                                   sTime.getHour() + sTime.getMinute() + sTime.getSecond());
-                System.out.println("DTEND: \n"   + eTime.getYear() + eTime.getMonth() + eTime.getDay() +
-                                                   eTime.getHour() + eTime.getMinute() + eTime.getSecond());
-                System.out.println("Location: \n" + vEvent.get_location());
-                System.out.println("Description: \n" +vEvent.get_description());
-
-		VComponent ic = new VComponent(content);
-		if (ic == null)
-			System.err.println("Failed to parse component");
-		System.out.println("VComponent:\n" + ic.as_ical_string());
-
-		// component is wrapped within BEGIN:VCALENDAR END:VCALENDAR
-		// we need to unwrap it.
-		VEvent sub_ic = (VEvent)ic.get_first_component(VComponent.ICalComponentKind.ICAL_VEVENT_COMPONENT);
-		if (sub_ic == null)
-			System.out.println("Failed to get subcomponent");
-		while (sub_ic != null)
-		{
-			System.out.println("subcomponent:\n" + sub_ic.as_ical_string());
-			sub_ic = (VEvent)ic.get_next_component(VComponent.ICalComponentKind.ICAL_VEVENT_COMPONENT);
-		}
-
-		// START - get, set recurrenceid
-		ICalTimeType time_tma = new ICalTimeType();
-		time_tma.setYear(2002);
-		time_tma.setMonth(2);
-		time_tma.setDay(2);
-		time_tma.setHour(2);
-		time_tma.setMinute(2);
-		time_tma.setSecond(2);
-		time_tma.setIs_utc(true);
-
-		ic.set_recurrenceid(time_tma);
-
-		ICalTimeType time_tma_return = new ICalTimeType();
-		time_tma_return = ic.get_recurrenceid();
-		System.out.println("****** vcomponent - recurrenceid ******");
-		System.out.println("setYear=" + time_tma_return.getYear());
-		System.out.println("setMonth=" + time_tma_return.getMonth());
-		System.out.println("setDay=" + time_tma_return.getDay());
-		System.out.println("setHour=" + time_tma_return.getHour());
-		System.out.println("setMinute=" + time_tma_return.getMinute());
-		System.out.println("setSecond=" + time_tma_return.getSecond());
-		System.out.println("****** vcomponent - recurrenceid ******");
-		// END - get, set recurrenceid
-		// START - get, set dtstamp
-		ic.set_dtstamp(time_tma);
-		ICalTimeType vcomponent_dtstamp_tma_return = ic.get_dtstamp();
-		System.out.println("****** vcomponent - dtstamp ******");
-		System.out.println("setYear=" + vcomponent_dtstamp_tma_return.getYear());
-		System.out.println("setMonth=" + vcomponent_dtstamp_tma_return.getMonth());
-		System.out.println("setDay=" + vcomponent_dtstamp_tma_return.getDay());
-		System.out.println("setHour=" + vcomponent_dtstamp_tma_return.getHour());
-		System.out.println("setMinute=" + vcomponent_dtstamp_tma_return.getMinute());
-		System.out.println("setSecond=" + vcomponent_dtstamp_tma_return.getSecond());
-		System.out.println("****** vcomponent - dtstamp ******");
-
-		// END - get, set dtstamp
-
-           	// VTODO test cases
-
-		ICalProperty statusProp = new ICalProperty(ICalProperty.ICalPropertyKind.ICAL_STATUS_PROPERTY);
-                ICalProperty dueProp = new ICalProperty(ICalProperty.ICalPropertyKind.ICAL_DUE_PROPERTY);
-
-                ICalTimeType duetime = new ICalTimeType();
-                duetime.setYear(2002);
-                duetime.setMonth(12);
-                duetime.setDay(21);
-                duetime.setHour(18);
-                duetime.setMinute(0);
-                duetime.setSecond(0);
-                duetime.setIs_utc(true);
-                System.out.println("done creating duetime");
-
-                statusProp.set_status(ICalProperty.ICalPropertyStatus.ICAL_STATUS_COMPLETED);
-                dueProp.set_due(duetime);
-
-		VToDo vtodo = new VToDo();
-
-		vtodo.add_property(statusProp);
-		vtodo.add_property(dueProp);
-
-		System.out.println("VToDo:\n" + vtodo.as_ical_string());
-
-                // VALARM test cases
-
-                VAlarm valarm = new VAlarm();
-                System.out.println("created valarm");
-
-                // 1. Create a ICAL_DURATION_PROPERTY using the TimePeriod.
-                ICalDurationType duration = new ICalDurationType();
-                duration.setDays((long) 0);
-                duration.setHours((long) 0);
-                duration.setMinutes((long) 15);
-                System.out.println("created duration object");
-
-                // Since we want to trigger before the event or task,
-                // we always want to set this to 1. If we say this is not
-                // a negative duration, that means the alarm will trigger
-                // AFTER the event or task start or due date, which is useless.
-                duration.setIs_neg(1);
-
-                // 2. Create a ICalTriggerType oject and set the duration on it.
-                ICalTriggerType trigger = new ICalTriggerType();
-                trigger.setDuration(duration);
-                System.out.println("set trigger to duration object");
-
-                // 3. Create a trigger ICalProperty and set the trigger on it.
-                ICalProperty triggerProp = new ICalProperty(ICalProperty.ICalPropertyKind.ICAL_TRIGGER_PROPERTY);
-                System.out.println("created trigger property");
-                triggerProp.set_trigger(trigger);
-                System.out.println("set trigger property");
-		trigger = triggerProp.get_trigger();
-                System.out.println("get trigger property");
-
-                // 4. set the trigger property on the Valarm object.
-                valarm.add_property(triggerProp);
-                System.out.println("VAlarm:\n" + valarm.as_ical_string());
-
-		// 5. create attendee property
-		String userEmail = "userid@domain";
-		ICalProperty attendeeProp = new ICalProperty(ICalProperty.ICalPropertyKind.ICAL_ATTENDEE_PROPERTY);
-		attendeeProp.set_attendee("MAILTO:" + userEmail);
-                System.out.println("set attendee property");
-		userEmail = attendeeProp.get_attendee();
-                System.out.println("get attendee property");
-		valarm.add_property(attendeeProp);
-                System.out.println("VAlarm:\n" + valarm.as_ical_string());
-
-		// START - get, set_role
-		ICalParameter parameter_role_tma = new ICalParameter(ICalParameter.ICalParameterKind.ICAL_ROLE_PARAMETER);
-		parameter_role_tma.set_role(ICalParameter.ICalParameterRole.ICAL_ROLE_REQPARTICIPANT);
-		int role_tma_return = parameter_role_tma.get_role();
-		System.out.println("******* parameter - role *****");
-		System.out.println("setRole=" + role_tma_return);
-		System.out.println("******* parameter - role *****");
-		// END - get, set_role
-		// START - get, set_partstat
-		ICalParameter parameter_partstat_tma = new ICalParameter(ICalParameter.ICalParameterKind.ICAL_PARTSTAT_PARAMETER);
-		parameter_partstat_tma.set_partstat(ICalParameter.ICalParameterPartStat.ICAL_PARTSTAT_DECLINED);
-		int partstat_tma_return = parameter_partstat_tma.get_partstat();
-		System.out.println("******* parameter - partstat *****");
-		System.out.println("setPartstat=" + partstat_tma_return);
-		System.out.println("******* parameter - partstat *****");
-		// END - get, set_partstat
-	}
-}
diff --git a/libical/src/libical/.cvsignore b/libical/src/libical/.cvsignore
deleted file mode 100644
index f02a2d1fd6..0000000000
--- a/libical/src/libical/.cvsignore
+++ /dev/null
@@ -1,28 +0,0 @@
-icalyacc.h
-icalyacc.c
-icallexer.c
-y.output
-Makefile
-Makefile.in
-icalversion.h
-.deps
-.libs
-*.lo
-*.la
-ical.h
-icalyacc.output
-icalproperty.c
-icalproperty.h
-icalvalue.h
-icalvalue.c
-icalparameter.h
-icalparameter.c
-icalrestriction.c
-icalderivedparameter.c
-icalderivedparameter.h
-icalderivedproperty.c
-icalderivedproperty.h
-icalderivedvalue.c
-icalderivedvalue.h
-icallexer.c
-y.output
diff --git a/libical/src/libical/Makefile.am b/libical/src/libical/Makefile.am
deleted file mode 100644
index ddf1f6987f..0000000000
--- a/libical/src/libical/Makefile.am
+++ /dev/null
@@ -1,287 +0,0 @@
-#======================================================================
-#  FILE: Makefile.am
-#  CREATOR: eric 
-#  
-#  $Id: Makefile.am,v 1.44 2003/11/05 22:47:34 jpr Exp $
-#
-#
-# (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either: 
-#
-#    The LGPL as published by the Free Software Foundation, version
-#    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-#
-#  Or:
-#
-#    The Mozilla Public License Version 1.0. You may obtain a copy of
-#    the License at http://www.mozilla.org/MPL/
-#
-#  
-#
-#======================================================================
-
-
-DESIGNDATA = $(top_srcdir)/design-data
-ICALSCRIPTS = $(top_srcdir)/scripts
-
-if WITH_CXX_BINDINGS
-cxx_lib=libical-evolution_cxx.la
-cxx_headers=vcomponent.h icalparameter_cxx.h icalproperty_cxx.h icalvalue_cxx.h icptrholder.h
-else
-cxx_lib=
-cxx_headers=
-endif
-
-noinst_LTLIBRARIES = libical-evolution.la $(cxx_lib)
-
-AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\""$(privdatadir)"\"
-
-# CFLAGS = -g
-
-INCLUDES =			\
-	-I$(top_builddir)	\
-	-I$(top_srcdir)/src	\
-	-I$(top_builddir)/src	\
-	-I$(srcdir)
-
-libical_evolution_la_LDFLAGS = -version-info 0:0:0
-
-
-libical_evolution_la_SOURCES =		\
-	$(BUILT_SOURCES)	\
-	icalarray.c		\
-	icalarray.h		\
-	icalattach.h		\
-	icalattachimpl.h	\
-	icalattach.c		\
-	icalcomponent.c		\
-	icalcomponent.h		\
-	icalenums.c		\
-	icalenums.h		\
-	icalerror.c		\
-	icalerror.h		\
-	icalmemory.c		\
-	icalmemory.h		\
-	icalmime.c		\
-	icalmime.h		\
-	icalparameter.c		\
-	icalparameter.h		\
-	icalparameterimpl.h	\
-	icalparser.c		\
-	icalparser.h		\
-	icalproperty.c		\
-	icalproperty.h		\
-	icalrecur.c		\
-	icalrecur.h		\
-	icalrestriction.h	\
-	icaltime.c		\
-	icaltime.h		\
-	icaltimezone.c		\
-	icaltimezone.h		\
-	icalduration.h		\
-	icalduration.c		\
-	icalperiod.h		\
-	icalperiod.c		\
-	icaltypes.c		\
-	icaltypes.h		\
-	icalvalue.c		\
-	icalvalue.h		\
-	icalvalueimpl.h		\
-	pvl.c			\
-	pvl.h			\
-	sspm.c			\
-	sspm.h			\
-	vsnprintf.c		\
-	icallangbind.h		\
-	icallangbind.c \
-	caldate.c \
-	astime.h 
-
-if WITH_CXX_BINDINGS
-libical_evolution_cxx_la_SOURCES =	\
-	$(libical_evolution_la_SOURCES)	\
-	vcomponent.h		\
-	vcomponent.cpp		\
-	icalproperty_cxx.h	\
-	icalproperty_cxx.cpp	\
-	icalparameter_cxx.h	\
-	icalparameter_cxx.cpp	\
-	icalvalue_cxx.h		\
-	icalvalue_cxx.cpp       \
-	icptrholder.h
-endif
-
-libical_evolutionincludedir = $(privincludedir)/libical
-
-libical_evolutioninclude_HEADERS = \
-	ical.h			\
-	icalarray.h		\
-	icalattach.h		\
-	icalcomponent.h		\
-	icalderivedparameter.h	\
-	icalderivedproperty.h	\
-	icalderivedvalue.h	\
-	icalduration.h		\
-	icalenums.h		\
-	icalerror.h		\
-	icallangbind.h		\
-	icalmemory.h		\
-	icalmime.h		\
-	icalparameter.h		\
-	icalparser.h		\
-	icalperiod.h		\
-	icalproperty.h		\
-	icalrecur.h		\
-	icalrestriction.h	\
-	icaltime.h		\
-	icaltimezone.h		\
-	icaltypes.h		\
-	icalvalue.h		\
-	pvl.h			\
-	sspm.h			\
-	$(cxx_headers)
-
-# ORDERING OF HEADERS IS SIGNIFICANT. Don't change this ordering. It
-# is required to make the combined header ical.h properly
-COMBINEDHEADERS =					\
-        $(top_builddir)/config.h                        \
-	$(top_builddir)/src/libical/icalversion.h	\
-	$(top_srcdir)/src/libical/icaltime.h		\
-	$(top_srcdir)/src/libical/icalduration.h	\
-	$(top_srcdir)/src/libical/icalperiod.h		\
-	$(top_srcdir)/src/libical/icalenums.h		\
-	$(top_srcdir)/src/libical/icaltypes.h		\
-	$(top_srcdir)/src/libical/icalrecur.h		\
-	$(top_srcdir)/src/libical/icalattach.h		\
-	icalderivedvalue.h				\
-	icalderivedparameter.h				\
-	$(top_srcdir)/src/libical/icalvalue.h		\
-	$(top_srcdir)/src/libical/icalparameter.h	\
-	icalderivedproperty.h				\
-	$(top_srcdir)/src/libical/icalproperty.h	\
-	$(top_srcdir)/src/libical/pvl.h			\
-	$(top_srcdir)/src/libical/icalarray.h		\
-	$(top_srcdir)/src/libical/icalcomponent.h	\
-	$(top_srcdir)/src/libical/icaltimezone.h	\
-	$(top_srcdir)/src/libical/icalparser.h		\
-	$(top_srcdir)/src/libical/icalmemory.h		\
-	$(top_srcdir)/src/libical/icalerror.h		\
-	$(top_srcdir)/src/libical/icalrestriction.h	\
-	$(top_srcdir)/src/libical/sspm.h		\
-	$(top_srcdir)/src/libical/icalmime.h 		\
-	$(top_srcdir)/src/libical/icallangbind.h	
-
-BUILT_COMBINEDHEADERS = 	\
-	icalderivedparameter.h	\
-	icalderivedproperty.h	\
-	icalderivedvalue.h
-
-BUILT_SOURCES =			\
-	$(BUILT_COMBINEDHEADERS)\
-	icalderivedparameter.c	\
-	icalderivedproperty.c	\
-	icalrestriction.c	\
-	icalderivedvalue.c
-
-# parameters
-
-PARAMETERDEPS =	\
-	$(ICALSCRIPTS)/mkderivedparameters.pl \
-	$(DESIGNDATA)/parameters.csv	\
-	icalderivedparameter.c.in \
-	icalderivedparameter.h.in
-
-icalderivedparameter.h: $(PARAMETERDEPS) 
-	$(PERL) -I $(ICALSCRIPTS) $(ICALSCRIPTS)/mkderivedparameters.pl -i $(srcdir)/icalderivedparameter.h.in -h $(DESIGNDATA)/parameters.csv > icalderivedparameter.h 
-
-icalderivedparameter.c: $(PARAMETERDEPS) $(BUILT_COMBINEDHEADERS)
-	$(PERL) -I $(ICALSCRIPTS) $(ICALSCRIPTS)/mkderivedparameters.pl -i $(srcdir)/icalderivedparameter.c.in -c $(DESIGNDATA)/parameters.csv > icalderivedparameter.c
-
-# properties
-
-PROPERTYDEPS =					\
-	$(ICALSCRIPTS)/mkderivedproperties.pl	\
-	$(DESIGNDATA)/properties.csv		\
-	$(DESIGNDATA)/value-types.csv		\
-	icalderivedproperty.c.in		\
-	icalderivedproperty.h.in
-
-
-icalderivedproperty.h: $(PROPERTYDEPS)
-	$(PERL)  -I$(ICALSCRIPTS) $(ICALSCRIPTS)/mkderivedproperties.pl \
-		-i $(srcdir)/icalderivedproperty.h.in -h $(DESIGNDATA)/properties.csv\
-		${DESIGNDATA}/value-types.csv > icalderivedproperty.h 
-
-icalderivedproperty.c: $(PROPERTYDEPS) $(BUILT_COMBINEDHEADERS)
-	$(PERL)  -I$(ICALSCRIPTS) $(ICALSCRIPTS)/mkderivedproperties.pl \
-		-i $(srcdir)/icalderivedproperty.c.in -c $(DESIGNDATA)/properties.csv \
-		${DESIGNDATA}/value-types.csv > icalderivedproperty.c
-
-# restrictions
-
-RESTRICTIONDEPS =				\
-	$(ICALSCRIPTS)/mkrestrictiontable.pl	\
-	$(DESIGNDATA)/restrictions.csv		\
-	icalrestriction.c.in
-
-icalrestriction.c: $(RESTRICTIONDEPS)
-	$(PERL) $(ICALSCRIPTS)/mkrestrictiontable.pl  -i $(srcdir)/icalrestriction.c.in \
-		$(DESIGNDATA)/restrictions.csv > icalrestriction.c
-
-# values
-
-VALUEDEPS =					\
-	$(ICALSCRIPTS)/mkderivedvalues.pl  	\
-	$(DESIGNDATA)/value-types.csv		\
-	icalderivedvalue.c.in				\
-	icalderivedvalue.h.in
-
-icalderivedvalue.h: $(VALUEDEPS)
-	$(PERL) -I$(ICALSCRIPTS)  $(ICALSCRIPTS)/mkderivedvalues.pl \
-	         -i $(srcdir)/icalderivedvalue.h.in -h $(DESIGNDATA)/value-types.csv > icalderivedvalue.h
-
-icalderivedvalue.c: $(VALUEDEPS) $(BUILT_COMBINEDHEADERS)
-	$(PERL)  -I$(ICALSCRIPTS) $(ICALSCRIPTS)/mkderivedvalues.pl \
-		-i $(srcdir)/icalderivedvalue.c.in -c $(DESIGNDATA)/value-types.csv > icalderivedvalue.c
-
-# c++ needs ical.h auto-generated.
-icalparameter_cxx.lo: ical.h
-icalproperty_cxx.lo: ical.h
-icalvalue_cxx.lo: ical.h
-vcomponent.lo: ical.h
-
-
-# housekeeping
-CONFIG_CLEAN_FILES = y.output
-
-CLEANFILES = $(BUILT_SOURCES) $(BUILT_COMBINEDHEADERS)
-
-dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
-	cd $(distdir); rm -f icalversion.h 
-
-EXTRA_DIST =			\
-	icalderivedparameter.c.in \
-	icalderivedparameter.h.in \
-	icalderivedproperty.c.in \
-	icalderivedproperty.h.in \
-	icalrestriction.c.in	\
-	icalderivedvalue.c.in	\
-	icalderivedvalue.h.in	\
-	icalversion.h.in
-
-$(srcdir)/icalcomponent.c: icalderivedvalue.h icalderivedproperty.h icalderivedparameter.h
-icalderivedparameter.c: icalderivedvalue.h icalderivedproperty.h icalderivedparameter.h
-icalderivedproperty.c: icalderivedvalue.h icalderivedproperty.h icalderivedparameter.h
-icalderivedvalue.c: icalderivedvalue.h icalderivedproperty.h icalderivedparameter.h
-$(srcdir)/icalduration.c: icalderivedvalue.h icalderivedproperty.h icalderivedparameter.h
-$(srcdir)/icallangbind.c: icalderivedvalue.h icalderivedproperty.h icalderivedparameter.h
-$(srcdir)/icalmime.c: icalderivedvalue.h icalderivedproperty.h icalderivedparameter.h
-$(srcdir)/icalparameter.c: icalderivedvalue.h icalderivedproperty.h icalderivedparameter.h
-$(srcdir)/icalparser.c: icalderivedvalue.h icalderivedproperty.h icalderivedparameter.h
-$(srcdir)/icalproperty.c: icalderivedvalue.h icalderivedproperty.h icalderivedparameter.h
-$(srcdir)/icalrestriction.c: icalderivedvalue.h icalderivedproperty.h icalderivedparameter.h
-$(srcdir)/icaltime.c: icalderivedvalue.h icalderivedproperty.h icalderivedparameter.h
-$(srcdir)/icalvalue.c: icalderivedvalue.h icalderivedproperty.h icalderivedparameter.h
diff --git a/libical/src/libical/astime.h b/libical/src/libical/astime.h
deleted file mode 100644
index 6962c060a8..0000000000
--- a/libical/src/libical/astime.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *	Copyright (c) 1986-2000, Hiram Clawson 
- *	All rights reserved.
- *
- *	Redistribution and use in source and binary forms, with or
- *	without modification, are permitted provided that the following
- *	conditions are met:
- *
- *		Redistributions of source code must retain the above
- *		copyright notice, this list of conditions and the
- *		following disclaimer.
- *
- *		Redistributions in binary form must reproduce the
- *		above copyright notice, this list of conditions and
- *		the following disclaimer in the documentation and/or
- *		other materials provided with the distribution.
- *
- *		Neither name of The Museum of Hiram nor the names of
- *		its contributors may be used to endorse or promote products
- *		derived from this software without specific prior
- *		written permission. 
- *
- *	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- *	CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- *	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *	MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- *	IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *	INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- *	OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- *	STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- *	IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- *	THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-/**
- *	@file astime.h
- *      @brief contains definitions of structures used for time calculations.
- */
-
-#ifndef	_astime_h_
-#define _astime_h_
-
-typedef struct ut_instant {
-	double	j_date; /**< julian decimal date, 0 = 01 Jan 4713 BC 12 HR UT */
-	long year;      /**< year, valid range [-4,713, +2,147,483,647] */
-	int	month;	/**<	[1-12]	*/
-	int	day;	/**<	[1-31]	*/
-	int	i_hour;	/**<	[0-23]	*/
-	int	i_minute;	/**<	[0-59]	*/
-	int	i_second;	/**<	[0-59]	*/
-	double	d_hour;		/**< [0.0-23.9999] includes minute and second */
-	double	d_minute;	/**<	[0.0-59.9999] includes second	*/
-	double	d_second;	/**<	[0.0-59.9999]	*/
-	int	weekday;	/**<	[0-6]	*/
-	int	day_of_year;	/**<	[1-366]	*/
-} UTinstant, * UTinstantPtr;
-
-/*	Functions in caldate.c	*/
-
-long caldat( UTinstantPtr );	/** converts julian date to year,mo,da */
-double juldat( UTinstantPtr );	/** returns julian day from year,mo,da */
-
-#endif	/*	_astime_h_	*/
diff --git a/libical/src/libical/caldate.c b/libical/src/libical/caldate.c
deleted file mode 100644
index f5554f66f8..0000000000
--- a/libical/src/libical/caldate.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- *	Copyright (c) 1986-2000, Hiram Clawson 
- *	All rights reserved.
- *
- *	Redistribution and use in source and binary forms, with or
- *	without modification, are permitted provided that the following
- *	conditions are met:
- *
- *		Redistributions of source code must retain the above
- *		copyright notice, this list of conditions and the
- *		following disclaimer.
- *
- *		Redistributions in binary form must reproduce the
- *		above copyright notice, this list of conditions and
- *		the following disclaimer in the documentation and/or
- *		other materials provided with the distribution.
- *
- *		Neither name of The Museum of Hiram nor the names of
- *		its contributors may be used to endorse or promote products
- *		derived from this software without specific prior
- *		written permission. 
- *
- *	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- *	CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- *	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- *	MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- *	IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *	INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- *	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- *	OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- *	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- *	STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- *	IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- *	THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include "astime.h"	/*	time structures	*/
-
-/**
- *	caldat computes the day of the week, the day of the year
- *	the gregorian (or julian) calendar date and the universal
- *	time from the julian decimal date.
- *	for astronomical purposes, The Gregorian calendar reform occurred
- *	on 15 Oct. 1582.  This is 05 Oct 1582 by the julian calendar.
-
- *	Input:	a ut_instant structure pointer, where the j_date element
- *		has been set. ( = 0 for 01 Jan 4713 B.C. 12 HR UT )
- *
- *	output:  will set all the other elements of the structure.
- *		As a convienence, the function will also return the year.
- *
- *	Reference: Astronomial formulae for calculators, meeus, p 23
- *	from fortran program by F. Espenak - April 1982 Page 277,
- *	50 Year canon of solar eclipses: 1986-2035
- *
- */
-
-long caldat( date )
-struct ut_instant * date;
-{
-	double frac;
-	long jd;
-	long ka;
-	long kb;
-	long kc;
-	long kd;
-	long ke;
-	long ialp;
-
-	jd = (long) (date->j_date + 0.5);	/* integer julian date */
-	frac = date->j_date + 0.5 - (double) jd + 1.0e-10; /* day fraction */
-	ka = (long) jd;
-	if ( jd >= 2299161L )
-	{
-		ialp = ( (double) jd - 1867216.25 ) / ( 36524.25 );
-		ka = jd + 1L + ialp - ( ialp >> 2 );
-	}
-	kb = ka + 1524L;
-	kc =  ( (double) kb - 122.1 ) / 365.25;
-	kd = (double) kc * 365.25;
-	ke = (double) ( kb - kd ) / 30.6001;
-	date->day = kb - kd - ((long) ( (double) ke * 30.6001 ));
-	if ( ke > 13L )
-		date->month = ke - 13L;
-	else
-		date->month = ke - 1L;
-	if ( (date->month == 2) && (date->day > 28) )
-		date->day = 29;
-	if ( (date->month == 2) && (date->day == 29) && (ke == 3L) )
-		date->year = kc - 4716L;
-	else if ( date->month > 2 )
-		date->year = kc - 4716L;
-	else
-		date->year = kc - 4715L;
-	date->i_hour = date->d_hour = frac * 24.0;	/* hour */
-	date->i_minute = date->d_minute =
-		( date->d_hour - (double) date->i_hour ) * 60.0; /* minute */
-	date->i_second = date->d_second =
-		( date->d_minute - (double) date->i_minute ) * 60.0;/* second */
-	date->weekday = (jd + 1L) % 7L;	/* day of week */
-	if ( date->year == ((date->year >> 2) << 2) )
-		date->day_of_year =
-			( ( 275 * date->month ) / 9)
-			- ((date->month + 9) / 12)
-			+ date->day - 30;
-	else
-		date->day_of_year =
-			( ( 275 * date->month ) / 9)
-			- (((date->month + 9) / 12) << 1)
-			+ date->day - 30;
-	return( date->year );
-}
-
-/**
- *	juldat computes the julian decimal date (j_date) from
- *	the gregorian (or Julian) calendar date.
- *	for astronomical purposes, The Gregorian calendar reform occurred
- *	on 15 Oct. 1582.  This is 05 Oct 1582 by the julian calendar.
- *	Input:  a ut_instant structure pointer where Day, Month, Year and
- *		i_hour, i_minute, d_second have been set for the date
- *		in question.
- *
- *	Output: the j_date and weekday elements of the structure will be set.
- *		Also, the return value of the function will be the j_date too.
- *
- *	Reference: Astronomial formulae for calculators, meeus, p 23
- *	from fortran program by F. Espenak - April 1982 Page 276,
- *	50 Year canon of solar eclipses: 1986-2035
- */
-
-double juldat( date )
-struct ut_instant * date;
-{
-	double frac, gyr;
-	long iy0, im0;
-	long ia, ib;
-	long jd;
-
-	/* decimal day fraction	*/
-	frac = (( double)date->i_hour/ 24.0)
-		+ ((double) date->i_minute / 1440.0)
-		+ (date->d_second / 86400.0);
-	/* convert date to format YYYY.MMDDdd	*/
-	gyr = (double) date->year
-		+ (0.01 * (double) date->month)
-		+ (0.0001 * (double) date->day)
-		+ (0.0001 * frac) + 1.0e-9;
-	/* conversion factors */
-	if ( date->month <= 2 )
-	{
-		iy0 = date->year - 1L;
-		im0 = date->month + 12;
-	}
-	else
-	{
-		iy0 = date->year;
-		im0 = date->month;
-	}
-	ia = iy0 / 100L;
-	ib = 2L - ia + (ia >> 2);
-	/* calculate julian date	*/
-	if ( date->year < 0L )
-		jd = (long) ((365.25 * (double) iy0) - 0.75)
-			+ (long) (30.6001 * (im0 + 1L) )
-			+ (long) date->day + 1720994L;
-	else
-		jd = (long) (365.25 * (double) iy0)
-			+ (long) (30.6001 * (double) (im0 + 1L))
-			+ (long) date->day + 1720994L;
-	if ( gyr >= 1582.1015 )	/* on or after 15 October 1582	*/
-		jd += ib;
-	date->j_date = (double) jd + frac + 0.5;
-	jd = (long) (date->j_date + 0.5);
-	date->weekday = (jd + 1L) % 7L;
-	return( date->j_date );
-}	/*	end of	double juldat( date )	*/
diff --git a/libical/src/libical/ical.h b/libical/src/libical/ical.h
deleted file mode 100644
index adbe751bd0..0000000000
--- a/libical/src/libical/ical.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <libical/icaltime.h>
-#include <libical/icalduration.h>
-#include <libical/icalperiod.h>
-#include <libical/icalenums.h>
-#include <libical/icaltypes.h>
-#include <libical/icalrecur.h>
-#include <libical/icalattach.h>
-#include <libical/icalvalue.h>
-#include <libical/icalparameter.h>
-#include <libical/icalderivedproperty.h>
-#include <libical/icalproperty.h>
-#include <libical/pvl.h>
-#include <libical/icalarray.h>
-#include <libical/icalcomponent.h>
-#include <libical/icaltimezone.h>
-#include <libical/icalparser.h>
-#include <libical/icalmemory.h>
-#include <libical/icalerror.h>
-#include <libical/icalrestriction.h>
-#include <libical/sspm.h>
-#include <libical/icalmime.h>
-#include <libical/icallangbind.h>
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
diff --git a/libical/src/libical/icalarray.c b/libical/src/libical/icalarray.c
deleted file mode 100644
index 896efc35be..0000000000
--- a/libical/src/libical/icalarray.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*-
-  ======================================================================
-  FILE: icalarray.c
-  CREATOR: Damon Chaplin 07 March 2001
-  
-  $Id$
-  $Locker$
-    
- (C) Copyright 2001, Ximian, Inc.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
- ======================================================================*/
-
-/** @file icalarray.c
- *
- *  @brief An array of arbitrarily-sized elements which grows
- *  dynamically as elements are added. 
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "icalarray.h"
-#include "icalerror.h"
-
-
-static void icalarray_expand		(icalarray	*array,
-					 int		 space_needed);
-
-/** @brief Constructor
- */
-
-icalarray*
-icalarray_new			(int		 element_size,
-				 int		 increment_size)
-{
-    icalarray *array;
-
-    array = (icalarray*) malloc (sizeof (icalarray));
-    if (!array) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return NULL;
-    }
-
-    array->element_size = element_size;
-    array->increment_size = increment_size;
-    array->num_elements = 0;
-    array->space_allocated = 0;
-    array->data = NULL;
-
-    return array;
-}
-
-/** @brief Destructor
- */
-
-void
-icalarray_free			(icalarray	*array)
-{
-    if (array->data)
-	free (array->data);
-    free (array);
-}
-
-
-void
-icalarray_append		(icalarray	*array,
-				 void		*element)
-{
-    if (array->num_elements >= array->space_allocated)
-	icalarray_expand (array, 1);
-
-    memcpy ((char *)(array->data) + ( array->num_elements * array->element_size ), element,
-	    array->element_size);
-    array->num_elements++;
-}
-
-
-void*
-icalarray_element_at		(icalarray	*array,
-				 int		 position)
-{
-    assert (position >= 0);
-    assert (position < array->num_elements);
-
-    return (char *)(array->data) + (position * array->element_size);
-}
-
-
-void
-icalarray_remove_element_at	(icalarray	*array,
-				 int		 position)
-{
-    void *dest;
-    int elements_to_move;
-
-    assert (position >= 0);
-    assert (position < array->num_elements);
-
-    dest = (char *)array->data + (position * array->element_size);
-    elements_to_move = array->num_elements - position - 1;
-
-    if (elements_to_move > 0)
-	memmove (dest, (char *)dest + array->element_size,
-		 elements_to_move * array->element_size);
-
-    array->num_elements--;
-}
-
-
-void
-icalarray_sort			(icalarray	*array,
-				 int	       (*compare) (const void *,
-							   const void *))
-{
-    qsort (array->data, array->num_elements, array->element_size, compare);
-}
-
-
-static void
-icalarray_expand		(icalarray	*array,
-				 int		 space_needed)
-{
-    int new_space_allocated;
-    void *new_data;
-
-    new_space_allocated = array->space_allocated + array->increment_size;
-
-    if (space_needed > array->increment_size) 
-	new_space_allocated += space_needed;
-
-	/*
-    new_data = realloc (array->data,
-			new_space_allocated * array->element_size);
-	*/
-	new_data = malloc(new_space_allocated * array->element_size);
-	memcpy(new_data,array->data,array->element_size*array->space_allocated);
-	free(array->data);
-
-    if (new_data) {
-	array->data = new_data;
-	array->space_allocated = new_space_allocated;
-    } else {
-	icalerror_set_errno(ICAL_ALLOCATION_ERROR);
-    }
-}
-
-
diff --git a/libical/src/libical/icalarray.h b/libical/src/libical/icalarray.h
deleted file mode 100644
index aee8046305..0000000000
--- a/libical/src/libical/icalarray.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*======================================================================
- FILE: icalarray.h
- CREATOR: Damon Chaplin 07 March 2001
-
-
- $Id$
- $Locker$
-
- (C) Copyright 2001, Ximian, Inc.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
-======================================================================*/
-
-
-#ifndef ICALARRAY_H
-#define ICALARRAY_H
-
-/** @file icalarray.h 
- *
- *  @brief An array of arbitrarily-sized elements which grows
- *  dynamically as elements are added. 
- */
-
-typedef struct _icalarray icalarray;
-struct _icalarray {
-    unsigned int	 element_size;
-    unsigned int	 increment_size;
-    unsigned int	 num_elements;
-    unsigned int	 space_allocated;
-    void		*data;
-};
-
-
-
-icalarray *icalarray_new		(int		 element_size,
-					 int		 increment_size);
-void	   icalarray_free		(icalarray	*array);
-
-void	   icalarray_append		(icalarray	*array,
-					 void		*element);
-void	   icalarray_remove_element_at	(icalarray	*array,
-					 int		 position);
-
-void	  *icalarray_element_at		(icalarray	*array,
-					 int		 position);
-
-void	   icalarray_sort		(icalarray	*array,
-					 int	       (*compare) (const void *, const void *));
-
-
-#endif /* ICALARRAY_H */
diff --git a/libical/src/libical/icalattach.c b/libical/src/libical/icalattach.c
deleted file mode 100644
index 8da9d4320d..0000000000
--- a/libical/src/libical/icalattach.c
+++ /dev/null
@@ -1,139 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalattach.c
-  CREATOR: acampi 28 May 02
-  
-  $Id$
-  $Locker$
-    
-
- (C) COPYRIGHT 2000, Andrea Campi
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icaltypes.c
-
- ======================================================================*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "icaltypes.h"
-#include "icalerror.h"
-#include "icalmemory.h"
-#include "icalattachimpl.h"
-#include <stdlib.h> /* for malloc and abs() */
-#include <errno.h> /* for errno */
-#include <string.h> /* for icalmemory_strdup */
-#include <assert.h>
-
-icalattach *
-icalattach_new_from_url (const char *url)
-{
-    icalattach *attach;
-    char *url_copy;
-
-    icalerror_check_arg_rz ((url != NULL), "url");
-
-    if ((attach = malloc (sizeof (icalattach))) == NULL) {
-	errno = ENOMEM;
-	return NULL;
-    }
-
-    if ((url_copy = strdup (url)) == NULL) {
-	free (attach);
-	errno = ENOMEM;
-	return NULL;
-    }
-
-    attach->refcount = 1;
-    attach->is_url = 1;
-    attach->u.url.url = url_copy;
-
-    return attach;
-}
-
-icalattach *
-icalattach_new_from_data (unsigned char *data, icalattach_free_fn_t free_fn,
-			  void *free_fn_data)
-{
-    icalattach *attach;
-
-    icalerror_check_arg_rz ((data != NULL), "data");
-
-    if ((attach = malloc (sizeof (icalattach))) == NULL) {
-	errno = ENOMEM;
-	return NULL;
-    }
-
-    attach->refcount = 1;
-    attach->is_url = 0;
-    attach->u.data.data = data;
-    attach->u.data.free_fn = free_fn;
-    attach->u.data.free_fn_data = free_fn_data;
-
-    return attach;
-}
-
-void
-icalattach_ref (icalattach *attach)
-{
-    icalerror_check_arg_rv ((attach != NULL), "attach");
-    icalerror_check_arg_rv ((attach->refcount > 0), "attach->refcount > 0");
-
-    attach->refcount++;
-}
-
-void
-icalattach_unref (icalattach *attach)
-{
-    icalerror_check_arg_rv ((attach != NULL), "attach");
-    icalerror_check_arg_rv ((attach->refcount > 0), "attach->refcount > 0");
-
-    attach->refcount--;
-
-    if (attach->refcount != 0)
-	return;
-
-    if (attach->is_url)
-	free (attach->u.url.url);
-    else if (attach->u.data.free_fn)
-	(* attach->u.data.free_fn) (attach->u.data.data, attach->u.data.free_fn_data);
-
-    free (attach);
-}
-
-int
-icalattach_get_is_url (icalattach *attach)
-{
-    icalerror_check_arg_rz ((attach != NULL), "attach");
-
-    return attach->is_url ? 1 : 0;
-}
-
-const char *
-icalattach_get_url (icalattach *attach)
-{
-    icalerror_check_arg_rz ((attach != NULL), "attach");
-    icalerror_check_arg_rz ((attach->is_url), "attach->is_url");
-
-    return attach->u.url.url;
-}
-
-unsigned char *
-icalattach_get_data (icalattach *attach)
-{
-    icalerror_check_arg_rz ((attach != NULL), "attach");
-    icalerror_check_arg_rz ((!attach->is_url), "!attach->is_url");
-
-    return attach->u.data.data;
-}
diff --git a/libical/src/libical/icalattach.h b/libical/src/libical/icalattach.h
deleted file mode 100644
index ba4488dd2d..0000000000
--- a/libical/src/libical/icalattach.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalattach.h
- CREATOR: acampi 28 May 02
-
-
- (C) COPYRIGHT 2002, Andrea Campi
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalattach.h
-
-======================================================================*/
-
-#ifndef ICALATTACH_H
-#define ICALATTACH_H
-
-
-typedef struct icalattach_impl icalattach;
-
-typedef void (* icalattach_free_fn_t) (unsigned char *data, void *user_data);
-
-icalattach *icalattach_new_from_url (const char *url);
-icalattach *icalattach_new_from_data (unsigned char *data,
-	icalattach_free_fn_t free_fn, void *free_fn_data);
-
-void icalattach_ref (icalattach *attach);
-void icalattach_unref (icalattach *attach);
-
-int icalattach_get_is_url (icalattach *attach);
-const char *icalattach_get_url (icalattach *attach);
-unsigned char *icalattach_get_data (icalattach *attach);
-
-struct icalattachtype* icalattachtype_new(void);
-void  icalattachtype_add_reference(struct icalattachtype* v);
-void icalattachtype_free(struct icalattachtype* v);
-
-void icalattachtype_set_url(struct icalattachtype* v, char* url);
-char* icalattachtype_get_url(struct icalattachtype* v);
-
-void icalattachtype_set_base64(struct icalattachtype* v, char* base64,
-				int owns);
-char* icalattachtype_get_base64(struct icalattachtype* v);
-
-void icalattachtype_set_binary(struct icalattachtype* v, char* binary,
-				int owns);
-void* icalattachtype_get_binary(struct icalattachtype* v);
-
-
-
-#endif /* !ICALATTACH_H */
diff --git a/libical/src/libical/icalattachimpl.h b/libical/src/libical/icalattachimpl.h
deleted file mode 100644
index b8abe6396b..0000000000
--- a/libical/src/libical/icalattachimpl.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
-  FILE: icalattachimpl.h
-  CREATOR: acampi 28 May 02
-  
-  $Id$
-
-
- (C) COPYRIGHT 2000, Andrea Campi
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalattachimpl.h
-
-
-======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifndef ICALATTACHIMPL_H
-#define ICALATTACHIMPL_H
-
-#include "icalattach.h"
-
-/* Private structure for ATTACH values */
-struct icalattach_impl {
-	/* Reference count */
-	int refcount;
-
-	union {
-		/* URL attachment data */
-		struct {
-			char *url;
-		} url;
-
-		/* Inline data */
-		struct {
-			unsigned char *data;
-			icalattach_free_fn_t free_fn;
-			void *free_fn_data;
-		} data;
-	} u;
-
-	/* TRUE if URL, FALSE if inline data */
-	unsigned int is_url : 1;
-};
-
-#endif
diff --git a/libical/src/libical/icalattendee.c b/libical/src/libical/icalattendee.c
deleted file mode 100644
index 30cb949c40..0000000000
--- a/libical/src/libical/icalattendee.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalattendee.c
-  CREATOR: eric 08 Mar 01
-  
-  $Id$
-  $Locker$
-    
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icaltypes.c
-
- ======================================================================*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "icalattendee.h"
diff --git a/libical/src/libical/icalattendee.h b/libical/src/libical/icalattendee.h
deleted file mode 100644
index 023b30734c..0000000000
--- a/libical/src/libical/icalattendee.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalattendee.h
- CREATOR: eric 8 Mar 01
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icaltypes.h
-
-======================================================================*/
-
-#ifndef ICALATTENDEE_H
-#define ICALATTENDEE_H
-
-#include <time.h>
-#include "icalenums.h"
-#include "icaltime.h"
-#include "icalduration.h"
-#include "icalperiod.h"
-#include "icalderivedparameter.h"
-#include "icalderivedvalue.h"
-
-struct icalorganizertype {
-    const char* value;
-    const char* common_name;
-    const char* dir;
-    const char* sentby;
-    const char* language;
-
-};
-
-/* Create a copy of the given organizer. Libical will not own the
-   memory for the strings in the copy; the call must free them */
-struct icalorganizertype icalorganizertype_new_clone(struct icalorganizertype a);
-
-
-struct icalattendeetype {
-    const char* cuid; /* Cal user id, contents of the property value */
-    /*icalparameter_cutype cutype;*/
-    const char* member;
-    /*icalparameter_role role;*/
-    int rsvp;
-    const char* delto;
-    const char* delfrom;
-    const char* sentby;
-    const char* cn;
-    const char* dir;
-    const char* language;
-};
-
-/* Create a copy of the given attendee. Libical will not own the
-   memory for the strings in the copy; the call must free them */
-struct icalattendeetype icalattendeetype_new_clone(struct icalattendeetype a);
-
-
-#endif /* !ICALATTENDEE_H */
diff --git a/libical/src/libical/icalcomponent.c b/libical/src/libical/icalcomponent.c
deleted file mode 100644
index a892128a0e..0000000000
--- a/libical/src/libical/icalcomponent.c
+++ /dev/null
@@ -1,2611 +0,0 @@
-/*======================================================================
-  FILE: icalcomponent.c
-  CREATOR: eric 28 April 1999
-  
-  $Id$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalcomponent.c
-
-======================================================================*/
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "icalcomponent.h"
-#include "pvl.h" /* "Pointer-to-void list" */
-#include "icalerror.h"
-#include "icalmemory.h"
-#include "icalenums.h"
-#include "icaltime.h"
-#include "icalarray.h"
-#include "icaltimezone.h"
-#include "icalduration.h"
-#include "icalperiod.h"
-#include "icalparser.h"
-#include "icalrestriction.h"
-
-#include <stdlib.h>  /* for malloc */
-#include <stdarg.h> /* for va_list, etc */
-#include <errno.h>
-#include <assert.h>
-#include <stdio.h> /* for fprintf */
-#include <string.h> /* for strdup */
-#include <limits.h> /* for INT_MAX */
-
-struct icalcomponent_impl 
-{
-	char id[5];
-	icalcomponent_kind kind;
-	char* x_name;
-	pvl_list properties;
-	pvl_elem property_iterator;
-	pvl_list components;
-	pvl_elem component_iterator;
-	icalcomponent* parent;
-
-	/** An array of icaltimezone structs. We use this so we can do fast
-	   lookup of timezones using binary searches. timezones_sorted is
-	   set to 0 whenever we add a timezone, so we remember to sort the
-	   array before doing a binary search. */
-	icalarray* timezones;
-	int timezones_sorted;
-};
-
-/* icalproperty functions that only components get to use */
-void icalproperty_set_parent(icalproperty* property,
-			     icalcomponent* component);
-icalcomponent* icalproperty_get_parent(icalproperty* property);
-void icalcomponent_add_children(icalcomponent *impl,va_list args);
-static icalcomponent* icalcomponent_new_impl (icalcomponent_kind kind);
-
-static void icalcomponent_merge_vtimezone (icalcomponent *comp,
-					   icalcomponent *vtimezone,
-					   icalarray *tzids_to_rename);
-static void icalcomponent_handle_conflicting_vtimezones (icalcomponent *comp,
-							 icalcomponent *vtimezone,
-							 icalproperty *tzid_prop,
-							 const char *tzid,
-							 icalarray *tzids_to_rename);
-static unsigned int icalcomponent_get_tzid_prefix_len (const char *tzid);
-static void icalcomponent_rename_tzids(icalcomponent* comp,
-				       icalarray* rename_table);
-static void icalcomponent_rename_tzids_callback(icalparameter *param,
-						void *data);
-static int icalcomponent_compare_vtimezones (icalcomponent	*vtimezone1,
-					     icalcomponent	*vtimezone2);
-static int icalcomponent_compare_timezone_fn	(const void	*elem1,
-						 const void	*elem2);
-
-
-void icalcomponent_add_children(icalcomponent *impl, va_list args)
-{
-    void* vp;
-    
-    while((vp = va_arg(args, void*)) != 0) {
-
-	assert (icalcomponent_isa_component(vp) != 0 ||
-		icalproperty_isa_property(vp) != 0 ) ;
-
-	if (icalcomponent_isa_component(vp) != 0 ){
-	  icalcomponent_add_component(impl, (icalcomponent*)vp);
-
-	} else if (icalproperty_isa_property(vp) != 0 ){
-	    icalcomponent_add_property(impl, (icalproperty*)vp);
-	}
-    }    
-}
-
-static icalcomponent*
-icalcomponent_new_impl (icalcomponent_kind kind)
-{
-    icalcomponent* comp;
-
-    if (!icalcomponent_kind_is_valid(kind))
-	return NULL;
-
-    if ( ( comp = (icalcomponent*) malloc(sizeof(icalcomponent))) == 0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-    
-    strcpy(comp->id,"comp");
-
-    comp->kind = kind;
-    comp->properties = pvl_newlist();
-    comp->property_iterator = 0;
-    comp->components = pvl_newlist();
-    comp->component_iterator = 0;
-    comp->x_name = 0;
-    comp->parent = 0;
-    comp->timezones = NULL;
-    comp->timezones_sorted = 1;
-
-    return comp;
-}
-
-/** @brief Constructor
- */
-icalcomponent*
-icalcomponent_new (icalcomponent_kind kind)
-{
-   return icalcomponent_new_impl(kind);
-}
-
-/** @brief Constructor
- */
-icalcomponent*
-icalcomponent_vanew (icalcomponent_kind kind, ...)
-{
-   va_list args;
-
-   icalcomponent *impl = icalcomponent_new_impl(kind);
-
-    if (impl == 0){
-	return 0;
-    }
-
-   va_start(args,kind);
-   icalcomponent_add_children(impl, args);
-   va_end(args);
-
-   return impl;
-}
-
-/** @brief Constructor
- */
-icalcomponent* icalcomponent_new_from_string(char* str)
-{
-    return icalparser_parse_string(str);
-}
-
-/** @brief Constructor
- */
-icalcomponent* icalcomponent_new_clone(icalcomponent* old)
-{
-    icalcomponent *new;
-    icalproperty *p;
-    icalcomponent *c;
-    pvl_elem itr;
-
-    icalerror_check_arg_rz( (old!=0), "component");
-
-    new = icalcomponent_new_impl(old->kind);
-
-    if (new == 0){
-	return 0;
-    }
-
-    
-    for( itr = pvl_head(old->properties);
-	 itr != 0;
-	 itr = pvl_next(itr))
-    {	
-	p = (icalproperty*)pvl_data(itr);
-	icalcomponent_add_property(new,icalproperty_new_clone(p));
-    }
-   
-   
-    for( itr = pvl_head(old->components);
-	 itr != 0;
-	 itr = pvl_next(itr))
-    {	
-	c = (icalcomponent*)pvl_data(itr);
-	icalcomponent_add_component(new,icalcomponent_new_clone(c));
-    }
-
-   return new;
-
-}
-
-/*** @brief Destructor
- */
-void
-icalcomponent_free (icalcomponent* c)
-{
-    icalproperty* prop;
-    icalcomponent* comp;
-
-    icalerror_check_arg_rv( (c!=0), "component");
-
-#ifdef ICAL_FREE_ON_LIST_IS_ERROR
-    icalerror_assert( (c->parent ==0),"Tried to free a component that is still attached to a parent component");
-#else
-    if(c->parent != 0){
-	return;
-    }
-#endif
-
-    if(c != 0 ){
-       
-		if ( c->properties != 0 )
-		{
-		   while( (prop=pvl_pop(c->properties)) != 0){
-		   assert(prop != 0);
-			   icalproperty_set_parent(prop,0);
-		   icalproperty_free(prop);
-		   }
-	        pvl_free(c->properties);
-		}
-      
-
-       while( (comp=pvl_data(pvl_head(c->components))) != 0){
-	   assert(comp!=0);
-	   icalcomponent_remove_component(c,comp);
-	   icalcomponent_free(comp);
-       }
-       
-       pvl_free(c->components);
-
-	if (c->x_name != 0) {
-	    free(c->x_name);
-	}
-
-	if (c->timezones)
-	    icaltimezone_array_free (c->timezones);
-
-	c->kind = ICAL_NO_COMPONENT;
-	c->properties = 0;
-	c->property_iterator = 0;
-	c->components = 0;
-	c->component_iterator = 0;
-	c->x_name = 0;	
-	c->id[0] = 'X';
-	c->timezones = NULL;
-
-	free(c);
-    }
-}
-
-char*
-icalcomponent_as_ical_string (icalcomponent* impl)
-{
-   char* buf, *out_buf;
-   const char* tmp_buf;
-   size_t buf_size = 1024;
-   char* buf_ptr = 0;
-    pvl_elem itr;
-
-/* WIN32 automatically adds the \r, Anybody else need it?
-#ifdef ICAL_UNIX_NEWLINE    
-*/
-    char newline[] = "\n";
-/*
-#else
-    char newline[] = "\r\n";
-#endif
-*/
-   
-   icalcomponent *c;
-   icalproperty *p;
-   icalcomponent_kind kind = icalcomponent_isa(impl);
-
-   const char* kind_string;
-
-   buf = icalmemory_new_buffer(buf_size);
-   buf_ptr = buf; 
-
-   icalerror_check_arg_rz( (impl!=0), "component");
-   icalerror_check_arg_rz( (kind!=ICAL_NO_COMPONENT), "component kind is ICAL_NO_COMPONENT");
-   
-   kind_string  = icalcomponent_kind_to_string(kind);
-
-   icalerror_check_arg_rz( (kind_string!=0),"Unknown kind of component");
-
-   icalmemory_append_string(&buf, &buf_ptr, &buf_size, "BEGIN:");
-   icalmemory_append_string(&buf, &buf_ptr, &buf_size, kind_string);
-   icalmemory_append_string(&buf, &buf_ptr, &buf_size, newline);
-   
-
-
-   for( itr = pvl_head(impl->properties);
-	 itr != 0;
-	 itr = pvl_next(itr))
-    {	
-	p = (icalproperty*)pvl_data(itr);
-	
-	icalerror_assert((p!=0),"Got a null property");
-	tmp_buf = icalproperty_as_ical_string(p);
-	
-	icalmemory_append_string(&buf, &buf_ptr, &buf_size, tmp_buf);
-    }
-   
-   
-   for( itr = pvl_head(impl->components);
-	itr != 0;
-	itr = pvl_next(itr))
-   {	
-       c = (icalcomponent*)pvl_data(itr);
-       
-       tmp_buf = icalcomponent_as_ical_string(c);
-       
-       icalmemory_append_string(&buf, &buf_ptr, &buf_size, tmp_buf);
-       
-   }
-   
-   icalmemory_append_string(&buf, &buf_ptr, &buf_size, "END:");
-   icalmemory_append_string(&buf, &buf_ptr, &buf_size, 
-			    icalcomponent_kind_to_string(kind));
-   icalmemory_append_string(&buf, &buf_ptr, &buf_size, newline);
-
-   out_buf = icalmemory_tmp_copy(buf);
-   free(buf);
-
-   return out_buf;
-}
-
-
-int
-icalcomponent_is_valid (icalcomponent* component)
-{
-    if ( (strcmp(component->id,"comp") == 0) &&
-	 component->kind != ICAL_NO_COMPONENT){
-	return 1;
-    } else {
-	return 0;
-    }
-
-}
-
-
-icalcomponent_kind
-icalcomponent_isa (const icalcomponent* component)
-{
-   icalerror_check_arg_rx( (component!=0), "component", ICAL_NO_COMPONENT);
-
-   if(component != 0)
-   {
-       return component->kind;
-   }
-
-   return ICAL_NO_COMPONENT;
-}
-
-
-int
-icalcomponent_isa_component (void* component)
-{
-    icalcomponent *impl = component;
-
-    icalerror_check_arg_rz( (component!=0), "component");
-
-    if (strcmp(impl->id,"comp") == 0) {
-	return 1;
-    } else {
-	return 0;
-    }
-
-}
-
-void
-icalcomponent_add_property (icalcomponent* component, icalproperty* property)
-{
-    icalerror_check_arg_rv( (component!=0), "component");
-    icalerror_check_arg_rv( (property!=0), "property");
-
-    icalerror_assert( (!icalproperty_get_parent(property)),"The property has already been added to a component. Remove the property with icalcomponent_remove_property before calling icalcomponent_add_property");
-
-    icalproperty_set_parent(property,component);
-
-    pvl_push(component->properties,property);
-}
-
-
-void
-icalcomponent_remove_property (icalcomponent* component, icalproperty* property)
-{
-    pvl_elem itr, next_itr;
-
-    icalerror_check_arg_rv( (component!=0), "component");
-    icalerror_check_arg_rv( (property!=0), "property");
-    
-    icalerror_assert( (icalproperty_get_parent(property)),"The property is not a member of a component");
-
-    
-    for( itr = pvl_head(component->properties);
-	 itr != 0;
-	 itr = next_itr)
-    {
-	next_itr = pvl_next(itr);
-	
-	if( pvl_data(itr) == (void*)property ){
-
-	   if (component->property_iterator == itr){
-	       component->property_iterator = pvl_next(itr);
-	   }
-
-	   pvl_remove( component->properties, itr); 
-	  icalproperty_set_parent(property,0);
-	}
-    }	
-}
-
-int
-icalcomponent_count_properties (icalcomponent* component, 
-				icalproperty_kind kind)
-{
-    int count=0;
-    pvl_elem itr;
-
-    icalerror_check_arg_rz( (component!=0), "component");
-
-    for( itr = pvl_head(component->properties);
-	 itr != 0;
-	 itr = pvl_next(itr))
-    {	
-	if(kind == icalproperty_isa((icalproperty*)pvl_data(itr)) ||
-	    kind == ICAL_ANY_PROPERTY){
-	    count++;
-	}
-    }
-
-
-    return count;
-
-}
-
-icalproperty* icalcomponent_get_current_property (icalcomponent* component)
-{
-   icalerror_check_arg_rz( (component!=0),"component");
-
-   if ((component->property_iterator==0)){
-       return 0;
-   }
-
-   return (icalproperty*) pvl_data(component->property_iterator);
-}
-
-icalproperty*
-icalcomponent_get_first_property (icalcomponent* c, icalproperty_kind kind)
-{
-   icalerror_check_arg_rz( (c!=0),"component");
-  
-   for( c->property_iterator = pvl_head(c->properties);
-	c->property_iterator != 0;
-	c->property_iterator = pvl_next(c->property_iterator)) {
-	    
-       icalproperty *p =  (icalproperty*) pvl_data(c->property_iterator);
-	
-	   if (icalproperty_isa(p) == kind || kind == ICAL_ANY_PROPERTY) {
-	       
-	       return p;
-	   }
-   }
-   return 0;
-}
-
-icalproperty*
-icalcomponent_get_next_property (icalcomponent* c, icalproperty_kind kind)
-{
-   icalerror_check_arg_rz( (c!=0),"component");
-
-   if (c->property_iterator == 0){
-       return 0;
-   }
-
-   for( c->property_iterator = pvl_next(c->property_iterator);
-	c->property_iterator != 0;
-	c->property_iterator = pvl_next(c->property_iterator)) {
-	    
-       icalproperty *p =  (icalproperty*) pvl_data(c->property_iterator);
-	   
-       if (icalproperty_isa(p) == kind || kind == ICAL_ANY_PROPERTY) {
-	   
-	   return p;
-       }
-   }
-
-   return 0;
-}
-
-
-icalproperty**
-icalcomponent_get_properties (icalcomponent* component, icalproperty_kind kind);
-
-
-void
-icalcomponent_add_component (icalcomponent* parent, icalcomponent* child)
-{
-    icalerror_check_arg_rv( (parent!=0), "parent");
-    icalerror_check_arg_rv( (child!=0), "child");
-    
-    if (child->parent !=0) {
-        icalerror_set_errno(ICAL_USAGE_ERROR);
-    }
-
-    child->parent = parent;
-
-    pvl_push(parent->components,child);
-
-    /* If the new component is a VTIMEZONE, add it to our array. */
-    if (child->kind == ICAL_VTIMEZONE_COMPONENT) {
-	/* FIXME: Currently we are also creating this array when loading in
-	   a builtin VTIMEZONE, when we don't need it. */
-	if (!parent->timezones)
-	    parent->timezones = icaltimezone_array_new ();
-
-	icaltimezone_array_append_from_vtimezone (parent->timezones, child);
-
-	/* Flag that we need to sort it before doing any binary searches. */
-	parent->timezones_sorted = 0;
-    }
-}
-
-
-void
-icalcomponent_remove_component (icalcomponent* parent, icalcomponent* child)
-{
-   pvl_elem itr, next_itr;
-
-   icalerror_check_arg_rv( (parent!=0), "parent");
-   icalerror_check_arg_rv( (child!=0), "child");
-   
-    /* If the component is a VTIMEZONE, remove it from our array as well. */
-    if (child->kind == ICAL_VTIMEZONE_COMPONENT) {
-	icaltimezone *zone;
-	int i, num_elements;
-
-	num_elements = parent->timezones ? parent->timezones->num_elements : 0;
-        for (i = 0; i < num_elements; i++) {
-	    zone = icalarray_element_at (parent->timezones, i);
-	    if (icaltimezone_get_component (zone) == child) {
-		icaltimezone_free (zone, 0);
-	        icalarray_remove_element_at (parent->timezones, i);
-		break;
-	    }
-	}
-    }
-
-   for( itr = pvl_head(parent->components);
-	itr != 0;
-	itr = next_itr)
-   {
-       next_itr = pvl_next(itr);
-       
-       if( pvl_data(itr) == (void*)child ){
-
-	   if (parent->component_iterator == itr){
-	       /* Don't let the current iterator become invalid */
-
-	       /* HACK. The semantics for this are troubling. */
-	       parent->component_iterator = 
-		   pvl_next(parent->component_iterator);
-	          
-	   }
-	   pvl_remove( parent->components, itr); 
-	   child->parent = 0;
-	   break;
-       }
-   }	
-}
-
-
-int
-icalcomponent_count_components (icalcomponent* component, 
-				icalcomponent_kind kind)
-{
-    int count=0;
-    pvl_elem itr;
-
-    icalerror_check_arg_rz( (component!=0), "component");
-
-    for( itr = pvl_head(component->components);
-	 itr != 0;
-	 itr = pvl_next(itr))
-    {
-	if(kind == icalcomponent_isa((icalcomponent*)pvl_data(itr)) ||
-	    kind == ICAL_ANY_COMPONENT){
-	    count++;
-	}
-    }
-
-    return count;
-}
-
-icalcomponent*
-icalcomponent_get_current_component(icalcomponent* component)
-{
-   icalerror_check_arg_rz( (component!=0),"component");
-
-   if (component->component_iterator == 0){
-       return 0;
-   }
-
-   return (icalcomponent*) pvl_data(component->component_iterator);
-}
-
-icalcomponent*
-icalcomponent_get_first_component (icalcomponent* c, 
-				   icalcomponent_kind kind)
-{
-   icalerror_check_arg_rz( (c!=0),"component");
-  
-   for( c->component_iterator = pvl_head(c->components);
-	c->component_iterator != 0;
-	c->component_iterator = pvl_next(c->component_iterator)) {
-	    
-       icalcomponent *p =  (icalcomponent*) pvl_data(c->component_iterator);
-	
-	   if (icalcomponent_isa(p) == kind || kind == ICAL_ANY_COMPONENT) {
-	       
-	       return p;
-	   }
-   }
-
-   return 0;
-}
-
-
-icalcomponent*
-icalcomponent_get_next_component (icalcomponent* c, icalcomponent_kind kind)
-{
-   icalerror_check_arg_rz( (c!=0),"component");
-  
-   if (c->component_iterator == 0){
-       return 0;
-   }
-
-   for( c->component_iterator = pvl_next(c->component_iterator);
-	c->component_iterator != 0;
-	c->component_iterator = pvl_next(c->component_iterator)) {
-	    
-       icalcomponent *p =  (icalcomponent*) pvl_data(c->component_iterator);
-	
-	   if (icalcomponent_isa(p) == kind || kind == ICAL_ANY_COMPONENT) {
-	       
-	       return p;
-	   }
-   }
-
-   return 0;
-}
-
-icalcomponent* icalcomponent_get_first_real_component(icalcomponent *c)
-{
-    icalcomponent *comp;
-
-    for(comp = icalcomponent_get_first_component(c,ICAL_ANY_COMPONENT);
-	comp != 0;
-	comp = icalcomponent_get_next_component(c,ICAL_ANY_COMPONENT)){
-
-	icalcomponent_kind kind = icalcomponent_isa(comp);
-
-	if(kind == ICAL_VEVENT_COMPONENT ||
-	   kind == ICAL_VTODO_COMPONENT ||
-	   kind == ICAL_VJOURNAL_COMPONENT ||
-	   kind == ICAL_VFREEBUSY_COMPONENT ||
-	   kind == ICAL_VQUERY_COMPONENT ||
-	   kind == ICAL_VREPLY_COMPONENT ||
-	   kind == ICAL_VAGENDA_COMPONENT){
-	    return comp;
-	}
-    }
-    return 0;
-}
-
-
-/**	@brief Get the timespan covered by this component, in UTC
- *	(deprecated)
- *
- *      see icalcomponent_foreach_recurrence() for a better way to
- *      extract spans from an component.
- *
- *	This method can be called on either a VCALENDAR or any real
- *	component. If the VCALENDAR contains no real component, but
- *	contains a VTIMEZONE, we return that span instead.
- *	This might not be a desirable behavior; we keep it for now
- *	for backward compatibility, but it might be deprecated at a
- *	future time.
- *
- *	FIXME this API needs to be clarified. DTEND is defined as the
- *	first available time after the end of this event, so the span
- *	should actually end 1 second before DTEND.
- */
-
-icaltime_span icalcomponent_get_span(icalcomponent* comp)
-{
-    icalcomponent *inner;
-    icalcomponent_kind kind;
-    icaltime_span span;
-    struct icaltimetype start, end;
-
-    span.start = 0;
-    span.end = 0;
-    span.is_busy= 1;
-
-    /* initial Error checking */
-    if (comp == NULL) {
-	return span;
-    }
-
-    /* FIXME this might go away */
-    kind  = icalcomponent_isa(comp);
-    if(kind == ICAL_VCALENDAR_COMPONENT){
-	inner = icalcomponent_get_first_real_component(comp);
-
-	/* Maybe there is a VTIMEZONE in there */
-	if (inner == 0){
-	    inner = icalcomponent_get_first_component(comp,
-			       ICAL_VTIMEZONE_COMPONENT);
-	}
-
-    } else {
-	inner = comp;
-    }
-
-    if (inner == 0){
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	/*icalerror_warn("icalcomponent_get_span: no component specified, or empty VCALENDAR component");*/
-	return span; 
-    }
-    
-    kind  = icalcomponent_isa(inner);
-
-    if( !( kind == ICAL_VEVENT_COMPONENT ||
-	   kind == ICAL_VJOURNAL_COMPONENT ||
-	   kind == ICAL_VTODO_COMPONENT ||	   
-	   kind == ICAL_VFREEBUSY_COMPONENT )) {
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	/*icalerror_warn("icalcomponent_get_span: no component specified, or empty VCALENDAR component");*/
-	return span; 
-	
-    }
-
-    /* Get to work. starting with DTSTART */
-    start = icalcomponent_get_dtstart(comp);
-    if (icaltime_is_null_time(start)) {
-	return span;
-    }
-    span.start = icaltime_as_timet_with_zone(start,
-	icaltimezone_get_utc_timezone());
-
-    /* The end time could be specified as either a DTEND or a DURATION */
-    /* icalcomponent_get_dtend takes care of these cases. */
-    end = icalcomponent_get_dtend(comp);
-    if (icaltime_is_null_time(end)) {
-	if (!icaltime_is_date(start)) {
-	    /* If dtstart is a DATE-TIME and there is no DTEND nor DURATION
-	       it takes no time */
-	    span.start = 0;
-	    return span;
-	} else {
-	    end = start;
-	}
-    }
-
-    span.end = icaltime_as_timet_with_zone(end,
-	icaltimezone_get_utc_timezone());
-    if (icaltime_is_date(start)) {
-	/* Until the end of the day*/
-	span.end += 60*60*24 - 1;
-    }
-
-    return span;
-
-}
-
-/**
- * Decide if this recurrance is acceptable
- * 
- * @param comp       A valid icalcomponent.
- * @param dtstart    The base dtstart value for this component.
- * @param recurtime  The time to test against.
- *
- * @return true if the recurrence value is excluded, false otherwise.
- *
- * This function decides if a specific recurrence value is
- * excluded by EXRULE or EXDATE properties.
- *
- * It's not the most efficient code.  You might get better performance
- * if you assume that recurtime is always increasing for each
- * call. Then you could:
- *
- *   - sort the EXDATE values
- *   - save the state of each EXRULE iterator for the next call.
- * 
- * In this case though you don't need to worry how you call this
- * function.  It will always return the correct result.
- */
-
-int icalproperty_recurrence_is_excluded(icalcomponent *comp,
-				       struct icaltimetype *dtstart,
-				       struct icaltimetype *recurtime) {
-  icalproperty *exdate, *exrule;
-
-  if (comp == NULL || 
-      dtstart == NULL || 
-      recurtime == NULL ||
-      icaltime_is_null_time(*recurtime))
-    /* BAD DATA */
-    return 1;	
-
-  /** first test against the exdate values **/
-  for (exdate = icalcomponent_get_first_property(comp,ICAL_EXDATE_PROPERTY);
-       exdate != NULL;
-       exdate = icalcomponent_get_next_property(comp,ICAL_EXDATE_PROPERTY)) {
-	 
-    struct icaltimetype exdatetime = icalproperty_get_exdate(exdate);
-
-    if (icaltime_compare(*recurtime, exdatetime) == 0) {
-      /** MATCHED **/
-      return 1;
-    }
-  }
-
-  /** Now test against the EXRULEs **/
-  for (exrule = icalcomponent_get_first_property(comp,ICAL_EXRULE_PROPERTY);
-       exdate != NULL;
-       exdate = icalcomponent_get_next_property(comp,ICAL_EXRULE_PROPERTY)) {
-	 
-    struct icalrecurrencetype recur = icalproperty_get_exrule(exrule);
-    icalrecur_iterator *exrule_itr  = icalrecur_iterator_new(recur, *dtstart);
-    struct icaltimetype exrule_time;
-
-    while (1) {
-      int result;
-      exrule_time = icalrecur_iterator_next(exrule_itr);
-
-      if (icaltime_is_null_time(exrule_time))
-	break;
-
-      result = icaltime_compare(*recurtime, exrule_time);
-      if (result == 0) {
-	icalrecur_iterator_free(exrule_itr);
-	return 1; /** MATCH **/
-      }
-      if (result == 1)
-	break;    /** exrule_time > recurtime **/
-    }
-
-    icalrecur_iterator_free(exrule_itr);
-  }
-
-  return 0;  /** no matches **/
-}
-
-/**
- * @brief Return the busy status based on the TRANSP property.
- *
- * @param comp   A valid icalcomponent.
- *
- * @return 1 if the event is a busy item, 0 if it is not.
- */
-
-static int icalcomponent_is_busy(icalcomponent *comp) {
-  icalproperty *transp;
-  enum icalproperty_status status;
-  int ret = 1;
-
-  /** @todo check access control here, converting busy->free if the
-     permissions do not allow access... */
-
-  /* Is this a busy time?  Check the TRANSP property */
-  transp = icalcomponent_get_first_property(comp, ICAL_TRANSP_PROPERTY);
-  
-  if (transp) {
-    icalvalue *transp_val = icalproperty_get_value(transp);
-
-    switch (icalvalue_get_transp(transp_val)) {
-    case ICAL_TRANSP_OPAQUE:
-    case ICAL_TRANSP_OPAQUENOCONFLICT:
-    case ICAL_TRANSP_NONE:
-      ret = 1;
-      break;
-    case ICAL_TRANSP_TRANSPARENT:
-    case ICAL_TRANSP_TRANSPARENTNOCONFLICT:
-      ret = 0;
-      break;
-    default:
-      ret = 0;
-      break;
-    }
-  }
-  status = icalcomponent_get_status(comp);
-  if (ret && status) {
-     switch (status) {
-     case ICAL_STATUS_CANCELLED:
-     case ICAL_STATUS_TENTATIVE:
-        ret = 0;
-	break;
-    default:
-	break;
-    }
-  }
-  return(ret);
-}
-
-
-
-
-/**
- * @brief cycle through all recurrances of an event
- *
- * @param comp           A valid VEVENT component
- * @param start          Ignore timespans before this
- * @param end            Ignore timespans after this
- * @param callback       Function called for each timespan within the range
- * @param callback_data  Pointer passed back to the callback function
- *
- * This function will call the specified callback function for once
- * for the base value of DTSTART, and foreach recurring date/time
- * value.
- *
- * It will filter out events that are specified as an EXDATE or an EXRULE.
- *
- * @todo We do not filter out duplicate RRULES/RDATES
- * @todo We do not handle RDATEs with explicit periods
- */
-
-void icalcomponent_foreach_recurrence(icalcomponent* comp,
-				      struct icaltimetype start,
-				      struct icaltimetype end,
-			void (*callback)(icalcomponent *comp, 
-                                         struct icaltime_span *span, 
-                                         void *data),
-				void *callback_data)
-{
-  struct icaltimetype dtstart, dtend;
-  icaltime_span recurspan, basespan, limit_span;
-  time_t limit_start, limit_end;
-  int dtduration;
-  icalproperty *rrule, *rdate;
-  struct icaldurationtype dur;
-  pvl_elem property_iterator;	/* for saving the iterator */
-  
-  if (comp == NULL || callback == NULL)
-    return;
-  
-  dtstart = icalcomponent_get_dtstart(comp);
-  
-  if (icaltime_is_null_time(dtstart))
-    return;			
-
-
-  /* The end time could be specified as either a DTEND or a DURATION */
-  /* icalcomponent_get_dtend takes care of these cases. */
-  dtend = icalcomponent_get_dtend(comp);
-
-  /* Now set up the base span for this item, corresponding to the 
-     base DTSTART and DTEND */
-  basespan = icaltime_span_new(dtstart, dtend, 1);
-
-  basespan.is_busy = icalcomponent_is_busy(comp);
-
-
-  /** Calculate the ceiling and floor values.. **/
-  limit_start = icaltime_as_timet_with_zone(start, icaltimezone_get_utc_timezone());
-  if (!icaltime_is_null_time(end))
-    limit_end   = icaltime_as_timet_with_zone(end, icaltimezone_get_utc_timezone());
-  else
-    limit_end   = INT_MAX;  /* max 32 bit time_t */
-
-  limit_span.start = limit_start;
-  limit_span.end   = limit_end;
-
-
-  /* Do the callback for the initial DTSTART entry */
-
-  if (!icalproperty_recurrence_is_excluded(comp, &dtstart, &dtstart)) {
-    /** call callback action **/
-    if (icaltime_span_overlaps(&basespan, &limit_span))
-    (*callback) (comp, &basespan, callback_data);
-  }
-
-  recurspan = basespan;
-  dtduration = basespan.end - basespan.start;
-  
-  /* Now cycle through the rrule entries */
-  for (rrule = icalcomponent_get_first_property(comp,ICAL_RRULE_PROPERTY);
-       rrule != NULL;
-       rrule = icalcomponent_get_next_property(comp,ICAL_RRULE_PROPERTY)) {
-
-    struct icalrecurrencetype recur = icalproperty_get_rrule(rrule);
-    icalrecur_iterator *rrule_itr  = icalrecur_iterator_new(recur, dtstart);
-    struct icaltimetype rrule_time;
-    
-    while (1) {
-      rrule_time = icalrecur_iterator_next(rrule_itr);
-
-      if (icaltime_is_null_time(rrule_time)) 
-	break;
-
-      if (!icaltime_compare(rrule_time, dtstart))
-	continue;
-
-      dur = icaltime_subtract(rrule_time, dtstart);
-
-      recurspan.start = basespan.start + icaldurationtype_as_int(dur);
-      recurspan.end   = recurspan.start + dtduration;
-
-      /** save the iterator ICK! **/
-      property_iterator = comp->property_iterator;
-
-      if (!icalproperty_recurrence_is_excluded(comp, &dtstart, &rrule_time)) {
-	/** call callback action **/
-	if (icaltime_span_overlaps(&recurspan, &limit_span))
-	(*callback) (comp, &recurspan, callback_data);
-      }
-      comp->property_iterator = property_iterator;
-    } /* end of iteration over a specific RRULE */
-
-    icalrecur_iterator_free(rrule_itr);
-  } /* end of RRULE loop */
-
-
-  /** Now process RDATE entries **/
-  for (rdate = icalcomponent_get_first_property(comp,ICAL_RDATE_PROPERTY);
-       rdate != NULL;
-       rdate = icalcomponent_get_next_property(comp,ICAL_RDATE_PROPERTY)) {
-
-    struct icaldatetimeperiodtype rdate_period = icalproperty_get_rdate(rdate);
-
-    /** RDATES can specify raw datetimes, periods, or dates.
-	we only support raw datetimes for now.. 
-
-        @todo Add support for other types **/
-    
-    if (icaltime_is_null_time(rdate_period.time)) 
-      continue;
-
-    dur = icaltime_subtract(rdate_period.time, dtstart);
-
-    recurspan.start = basespan.start + icaldurationtype_as_int(dur);
-    recurspan.end   = recurspan.start + dtduration;
-
-    /** save the iterator ICK! **/
-    property_iterator = comp->property_iterator;
-
-    if (!icalproperty_recurrence_is_excluded(comp, &dtstart, &rdate_period.time)) {
-      /** call callback action **/
-      (*callback) (comp, &recurspan, callback_data);
-    }
-    comp->property_iterator = property_iterator;
-  }
-}
-
-
-
-int icalcomponent_check_restrictions(icalcomponent* comp){
-    icalerror_check_arg_rz(comp!=0,"comp");
-    return icalrestriction_check(comp);
-}
-
-/** @brief returns the number of errors encountered parsing the data
- *
- * This function counts the number times the X-LIC-ERROR occurs
- * in the data structure.
- */
-
-int icalcomponent_count_errors(icalcomponent* component)
-{
-    int errors = 0;
-    icalproperty *p;
-    icalcomponent *c;
-    pvl_elem itr;
-
-    for( itr = pvl_head(component->properties);
-	 itr != 0;
-	 itr = pvl_next(itr))
-    {	
-	p = (icalproperty*)pvl_data(itr);
-	
-	if(icalproperty_isa(p) == ICAL_XLICERROR_PROPERTY)
-	{
-	    errors++;
-	}
-    }
-
-
-    for( itr = pvl_head(component->components);
-	 itr != 0;
-	 itr = pvl_next(itr))
-    {	
-	c = (icalcomponent*)pvl_data(itr);
-	
-	errors += icalcomponent_count_errors(c);
-	
-    }
-
-    return errors;
-}
-
-
-void icalcomponent_strip_errors(icalcomponent* component)
-{
-    icalproperty *p;
-    icalcomponent *c;
-    pvl_elem itr, next_itr;
-
-   for( itr = pvl_head(component->properties);
-	 itr != 0;
-	 itr = next_itr)
-    {	
-	p = (icalproperty*)pvl_data(itr);
-	next_itr = pvl_next(itr);
-
-	if(icalproperty_isa(p) == ICAL_XLICERROR_PROPERTY)
-	{
-	    icalcomponent_remove_property(component,p);
-	}
-    }
-    
-    for( itr = pvl_head(component->components);
-	 itr != 0;
-	 itr = pvl_next(itr))
-    {	
-	c = (icalcomponent*)pvl_data(itr);
-	icalcomponent_strip_errors(c);
-    }
-}
-
-/* Hack. This will change the state of the iterators */
-void icalcomponent_convert_errors(icalcomponent* component)
-{
-    icalproperty *p, *next_p;
-    icalcomponent *c;
-
-    for(p = icalcomponent_get_first_property(component,ICAL_ANY_PROPERTY);
-	p != 0;
-	p = next_p){
-	
-	next_p = icalcomponent_get_next_property(component,ICAL_ANY_PROPERTY);
-
-	if(icalproperty_isa(p) == ICAL_XLICERROR_PROPERTY)
-	{
-	    struct icalreqstattype rst;
-	    icalparameter *param  = icalproperty_get_first_parameter
-		(p,ICAL_XLICERRORTYPE_PARAMETER);
-
-	    rst.code = ICAL_UNKNOWN_STATUS;
-	    rst.desc = 0;
-
-	    switch(icalparameter_get_xlicerrortype(param)){
-
-		case  ICAL_XLICERRORTYPE_PARAMETERNAMEPARSEERROR: {
-		    rst.code = ICAL_3_2_INVPARAM_STATUS;
-		    break;
-		}
-		case  ICAL_XLICERRORTYPE_PARAMETERVALUEPARSEERROR: {
-		    rst.code = ICAL_3_3_INVPARAMVAL_STATUS;
-		    break;
-		}
-		case  ICAL_XLICERRORTYPE_PROPERTYPARSEERROR: {		    
-		    rst.code = ICAL_3_0_INVPROPNAME_STATUS;
-		    break;
-		}
-		case  ICAL_XLICERRORTYPE_VALUEPARSEERROR: {
-		    rst.code = ICAL_3_1_INVPROPVAL_STATUS;
-		    break;
-		}
-		case  ICAL_XLICERRORTYPE_COMPONENTPARSEERROR: {
-		    rst.code = ICAL_3_4_INVCOMP_STATUS;
-		    break;
-		}
-
-		default: {
-		    break;
-		}
-	    }
-	    if (rst.code != ICAL_UNKNOWN_STATUS){
-		
-		rst.debug = icalproperty_get_xlicerror(p);
-		icalcomponent_add_property(component,
-					   icalproperty_new_requeststatus(rst));
-		
-		icalcomponent_remove_property(component,p);
-	    }
-	}
-    }
-
-    for(c = icalcomponent_get_first_component(component,ICAL_ANY_COMPONENT);
-	c != 0;
-	c = icalcomponent_get_next_component(component,ICAL_ANY_COMPONENT)){
-	
-	icalcomponent_convert_errors(c);
-    }
-}
-
-
-icalcomponent* icalcomponent_get_parent(icalcomponent* component)
-{
-   return component->parent;
-}
-
-void icalcomponent_set_parent(icalcomponent* component, icalcomponent* parent)
-{
-   component->parent = parent;
-}
-
-icalcompiter icalcompiter_null = {ICAL_NO_COMPONENT,0};
-
-
-struct icalcomponent_kind_map {
-	icalcomponent_kind kind;
-	char name[20];
-};
-
-  
-
-static struct icalcomponent_kind_map component_map[] = 
-{
-    { ICAL_VEVENT_COMPONENT, "VEVENT" },
-    { ICAL_VTODO_COMPONENT, "VTODO" },
-    { ICAL_VJOURNAL_COMPONENT, "VJOURNAL" },
-    { ICAL_VCALENDAR_COMPONENT, "VCALENDAR" },
-    { ICAL_VAGENDA_COMPONENT, "VAGENDA" },
-    { ICAL_VFREEBUSY_COMPONENT, "VFREEBUSY" },
-    { ICAL_VTIMEZONE_COMPONENT, "VTIMEZONE" },
-    { ICAL_VALARM_COMPONENT, "VALARM" },
-    { ICAL_XSTANDARD_COMPONENT, "STANDARD" }, /*These are part of RFC2445 */
-    { ICAL_XDAYLIGHT_COMPONENT, "DAYLIGHT" }, /*but are not really components*/
-    { ICAL_X_COMPONENT, "X" },
-    { ICAL_VSCHEDULE_COMPONENT, "SCHEDULE" },
-
-    /* CAP components */
-    { ICAL_VCAR_COMPONENT, "VCAR" },  
-    { ICAL_VCOMMAND_COMPONENT, "VCOMMAND" },  
-    { ICAL_VQUERY_COMPONENT, "VQUERY" },  
-    { ICAL_VREPLY_COMPONENT, "VREPLY" },  
-
-    /* libical private components */
-    { ICAL_XLICINVALID_COMPONENT, "X-LIC-UNKNOWN" },  
-    { ICAL_XLICMIMEPART_COMPONENT, "X-LIC-MIME-PART" },  
-    { ICAL_ANY_COMPONENT, "ANY" },  
-    { ICAL_XROOT_COMPONENT, "XROOT" },  
-
-    /* End of list */
-    { ICAL_NO_COMPONENT, "" },
-};
-
-
-int icalcomponent_kind_is_valid(const icalcomponent_kind kind)
-{
-    int i = 0;
-    do {
-      if (component_map[i].kind == kind)
-	return 1;
-    } while (component_map[i++].kind != ICAL_NO_COMPONENT);
-
-    return 0;
-}
-
-const char* icalcomponent_kind_to_string(icalcomponent_kind kind)
-{
-    int i;
-
-    for (i=0; component_map[i].kind != ICAL_NO_COMPONENT; i++) {
-	if (component_map[i].kind == kind) {
-	    return component_map[i].name;
-	}
-    }
-
-    return 0;
-
-}
-
-icalcomponent_kind icalcomponent_string_to_kind(const char* string)
-{
-    int i;
-
-    if (string ==0 ) { 
-	return ICAL_NO_COMPONENT;
-    }
-
-    for (i=0; component_map[i].kind  != ICAL_NO_COMPONENT; i++) {
-	if (strcmp(component_map[i].name, string) == 0) {
-	    return component_map[i].kind;
-	}
-    }
-
-    return ICAL_NO_COMPONENT;
-}
-
-
-
-icalcompiter 
-icalcomponent_begin_component(icalcomponent* component,icalcomponent_kind kind)
-{
-    icalcompiter itr;
-    pvl_elem i;
-
-    itr.kind = kind;
-    itr.iter = NULL;
-
-    icalerror_check_arg_re(component!=0,"component",icalcompiter_null);
-
-    for( i = pvl_head(component->components); i != 0; i = pvl_next(i)) {
-	
-	icalcomponent *c =  (icalcomponent*) pvl_data(i);
-	
-	if (icalcomponent_isa(c) == kind || kind == ICAL_ANY_COMPONENT) {
-	    
-	    itr.iter = i;
-
-	    return itr;
-	}
-    }
-
-    return icalcompiter_null;
-}
-
-icalcompiter
-icalcomponent_end_component(icalcomponent* component,icalcomponent_kind kind)
-{
-    icalcompiter itr; 
-    pvl_elem i;
-
-    itr.kind = kind;
-
-    icalerror_check_arg_re(component!=0,"component",icalcompiter_null);
-
-    for( i = pvl_tail(component->components); i != 0; i = pvl_prior(i)) {
-	
-	icalcomponent *c =  (icalcomponent*) pvl_data(i);
-	
-	if (icalcomponent_isa(c) == kind || kind == ICAL_ANY_COMPONENT) {
-	    
-	    itr.iter = pvl_next(i);
-
-	    return itr;
-	}
-    }
-
-    return icalcompiter_null;;
-}
-
-
-icalcomponent* icalcompiter_next(icalcompiter* i)
-{
-   if (i->iter == 0){
-       return 0;
-   }
-
-   icalerror_check_arg_rz( (i!=0),"i");
-
-   for( i->iter = pvl_next(i->iter);
-	i->iter != 0;
-	i->iter = pvl_next(i->iter)) {
-	    
-       icalcomponent *c =  (icalcomponent*) pvl_data(i->iter);
-	
-	   if (icalcomponent_isa(c) == i->kind 
-	       || i->kind == ICAL_ANY_COMPONENT) {
-	       
-	       return icalcompiter_deref(i);;
-	   }
-   }
-
-   return 0;
-
-}
-
-icalcomponent* icalcompiter_prior(icalcompiter* i)
-{
-   if (i->iter == 0){
-       return 0;
-   }
-
-   for( i->iter = pvl_prior(i->iter);
-	i->iter != 0;
-	i->iter = pvl_prior(i->iter)) {
-	    
-       icalcomponent *c =  (icalcomponent*) pvl_data(i->iter);
-	
-	   if (icalcomponent_isa(c) == i->kind 
-	       || i->kind == ICAL_ANY_COMPONENT) {
-	       
-	       return icalcompiter_deref(i);;
-	   }
-   }
-
-   return 0;
-
-}
-icalcomponent* icalcompiter_deref(icalcompiter* i)
-{
-    if(i->iter ==0){
-	return 0;
-    }
-
-    return pvl_data(i->iter);
-}
-
-icalcomponent* icalcomponent_get_inner(icalcomponent* comp)
-{
-    if (icalcomponent_isa(comp) == ICAL_VCALENDAR_COMPONENT){
-	return icalcomponent_get_first_real_component(comp);
-    } else {
-	return comp;
-    }
-}
-
-/** @brief sets the METHOD property to the given method
- */
-
-void icalcomponent_set_method(icalcomponent* comp, icalproperty_method method)
-{
-    icalproperty *prop 
-	= icalcomponent_get_first_property(comp, ICAL_METHOD_PROPERTY);
-
-
-    if (prop == 0){
-	prop = icalproperty_new_method(method);
-	icalcomponent_add_property(comp, prop);
-    }
-    
-    icalproperty_set_method(prop,method);
-
-}
-
-/** @brief returns the METHOD property 
- */
-
-icalproperty_method icalcomponent_get_method(icalcomponent* comp)
-{
-    icalproperty *prop 
-	= icalcomponent_get_first_property(comp,ICAL_METHOD_PROPERTY);
-
-    if (prop == 0){
-	return ICAL_METHOD_NONE;
-    }
-    
-    return icalproperty_get_method(prop);
-}
-
-#define ICALSETUPSET(p_kind) \
-    icalcomponent *inner; \
-    icalproperty *prop; \
-    icalerror_check_arg_rv(comp!=0,"comp");\
-    inner = icalcomponent_get_inner(comp); \
-    if(inner == 0){\
-        icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);\
-        return;\
-    }\
-    prop = icalcomponent_get_first_property(inner, p_kind);
- 
-
-/**	@brief Set DTSTART property to given icaltime
- *
- *	This method respects the icaltime type (DATE vs DATE-TIME) and
- *	timezone (or lack thereof).
- */
-void icalcomponent_set_dtstart(icalcomponent* comp, struct icaltimetype v)
-{
-    char *tzid;
-    ICALSETUPSET(ICAL_DTSTART_PROPERTY);
-
-    if (prop == 0){
-	prop = icalproperty_new_dtstart(v);
-	icalcomponent_add_property(inner, prop);
-    } else {
-        icalproperty_remove_parameter_by_kind(prop, ICAL_TZID_PARAMETER);
-    }
-    
-    icalproperty_set_dtstart(prop,v);
-
-    if ((tzid = icaltime_get_tzid(v)) != NULL && !icaltime_is_utc(v)) {
-	icalproperty_add_parameter(prop, icalparameter_new_tzid(tzid));
-    }
-}
-
-/**	@brief Get a DATE or DATE-TIME property as an icaltime
- *
- *	If the property is a DATE-TIME with a timezone parameter and a
- *	corresponding VTIMEZONE is present in the component, the
- *	returned component will already be in the correct timezone;
- *	otherwise the caller is responsible for converting it.
- *
- *	FIXME this is useless until we can flag the failure
- */
-static struct icaltimetype
-icalcomponent_get_datetime(icalcomponent *comp, icalproperty *prop) {
-
-    icalcomponent      *c;
-    icalparameter      *param;
-    struct icaltimetype	ret;
-
-    ret = icalvalue_get_datetime(icalproperty_get_value(prop));
-
-    if ((param = icalproperty_get_first_parameter(prop, ICAL_TZID_PARAMETER))
-	!= NULL) {
-	const char     *tzid = icalparameter_get_tzid(param);
-	icaltimezone   *tz = NULL;
-
-	for (c = comp; c != NULL; c = icalcomponent_get_parent(c)) {
-	    tz = icalcomponent_get_timezone(c, tzid);
-	    if (tz != NULL)
-		break;
-	}
-
-	if (tz == NULL)
-	    tz = icaltimezone_get_builtin_timezone(tzid);
-
-	if (tz != NULL)
-	    ret = icaltime_set_timezone(&ret, tz);
-    }
-
-    return ret;
-}
-
-/**	@brief Get DTSTART property as an icaltime
- *
- *	If DTSTART is a DATE-TIME with a timezone parameter and a
- *	corresponding VTIMEZONE is present in the component, the
- *	returned component will already be in the correct timezone;
- *	otherwise the caller is responsible for converting it.
- *
- *	FIXME this is useless until we can flag the failure
- */
-struct icaltimetype icalcomponent_get_dtstart(icalcomponent* comp)
-{
-    icalcomponent *inner = icalcomponent_get_inner(comp); 
-    icalproperty *prop;
-
-    prop = icalcomponent_get_first_property(inner,ICAL_DTSTART_PROPERTY);
-    if (prop == 0){
-	return icaltime_null_time();
-    }
-
-    return icalcomponent_get_datetime(comp, prop);
-}
-
-/**	@brief Get DTEND property as an icaltime
- *
- *	If a DTEND property is not present but a DURATION is, we use
- *	that to determine the proper end.
- *
- *	If DTSTART is a DATE-TIME with a timezone parameter and a
- *	corresponding VTIMEZONE is present in the component, the
- *	returned component will already be in the correct timezone;
- *	otherwise the caller is responsible for converting it.
- *
- *	FIXME this is useless until we can flag the failure
- */
-struct icaltimetype icalcomponent_get_dtend(icalcomponent* comp)
-{
-    icalcomponent *inner = icalcomponent_get_inner(comp); 
-    icalproperty *end_prop 
-	= icalcomponent_get_first_property(inner,ICAL_DTEND_PROPERTY);
-    icalproperty *dur_prop 
-	= icalcomponent_get_first_property(inner, ICAL_DURATION_PROPERTY);
-    struct icaltimetype	ret = icaltime_null_time();
-
-    if ( end_prop != 0) {
-	ret = icalcomponent_get_datetime(comp, end_prop);
-    } else if ( dur_prop != 0) { 
-
-	struct icaltimetype start = 
-	    icalcomponent_get_dtstart(inner);
-	struct icaldurationtype duration = 
-	    icalproperty_get_duration(dur_prop);
-
-	struct icaltimetype end = icaltime_add(start,duration);
-
-	ret = end;
-    }
-
-    return ret;
-}
-
-/**	@brief Set DTEND property to given icaltime
- *
- *	This method respects the icaltime type (DATE vs DATE-TIME) and
- *	timezone (or lack thereof).
- *
- *	This also checks that a DURATION property isn't already there,
- *	and returns an error if it is. It's the caller's responsibility
- *	to remove it.
- */
-void icalcomponent_set_dtend(icalcomponent* comp, struct icaltimetype v)
-{
-    char *tzid;
-    ICALSETUPSET(ICAL_DTEND_PROPERTY);
-
-    if (icalcomponent_get_first_property(inner,ICAL_DURATION_PROPERTY)
-	!= NULL) {
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	return;
-    }
-
-    if (prop == 0) {
-	prop = icalproperty_new_dtend(v);
-	icalcomponent_add_property(inner, prop);
-    } else {
-        icalproperty_remove_parameter_by_kind(prop, ICAL_TZID_PARAMETER);
-    }
-
-    icalproperty_set_dtend(prop,v);
-
-    if ((tzid = icaltime_get_tzid(v)) != NULL && !icaltime_is_utc(v)) {
-	icalproperty_add_parameter(prop, icalparameter_new_tzid(tzid));
-    }
-}
-
-/**	@brief Set DURATION property to given icalduration
- *
- *	This method respects the icaltime type (DATE vs DATE-TIME) and
- *	timezone (or lack thereof).
- *
- *	This also checks that a DTEND property isn't already there,
- *	and returns an error if it is. It's the caller's responsibility
- *	to remove it.
- */
-void icalcomponent_set_duration(icalcomponent* comp, 
-				struct icaldurationtype v)
-{
-    ICALSETUPSET(ICAL_DURATION_PROPERTY);
-
-    if (icalcomponent_get_first_property(inner,ICAL_DTEND_PROPERTY) != NULL) {
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	return;
-    }
-
-    if (prop == 0) {
-	prop = icalproperty_new_duration(v);
-	icalcomponent_add_property(inner, prop);
-    } else {
-	icalproperty_set_duration(prop,v);
-    }
-}
-
-/**	@brief Get DURATION property as an icalduration
- *
- *	If a DURATION property is not present but a DTEND is, we use
- *	that to determine the proper end.
- */
-struct icaldurationtype icalcomponent_get_duration(icalcomponent* comp)
-{
-    icalcomponent *inner = icalcomponent_get_inner(comp); 
-
-    icalproperty *end_prop 
-	= icalcomponent_get_first_property(inner,ICAL_DTEND_PROPERTY);
-
-    icalproperty *dur_prop 
-	= icalcomponent_get_first_property(inner,ICAL_DURATION_PROPERTY);
-
-    struct icaldurationtype ret = icaldurationtype_null_duration();
-
-    if ( dur_prop != 0 && end_prop == 0) { 
-	ret = icalproperty_get_duration(dur_prop);
-
-    } else if ( end_prop != 0 && dur_prop == 0) {
-	/**
-	 * FIXME
-	 * We assume DTSTART and DTEND are not in different time zones.
-	 * Does the standard actually guarantee this?
-	 */
-	struct icaltimetype start = 
-	    icalcomponent_get_dtstart(inner);
-	struct icaltimetype end = 
-	    icalcomponent_get_dtend(inner);
-
-	ret = icaltime_subtract(end, start);
-    } else {
-	/* Error, both duration and dtend have been specified */
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-    }
-    return ret;
-}
-
-void icalcomponent_set_dtstamp(icalcomponent* comp, struct icaltimetype v)
-{
-
-    ICALSETUPSET(ICAL_DTSTAMP_PROPERTY);
-
-    if (prop == 0){
-	prop = icalproperty_new_dtstamp(v);
-	icalcomponent_add_property(inner, prop);
-    }
-    
-    icalproperty_set_dtstamp(prop,v);
-
-}
-
-
-struct icaltimetype icalcomponent_get_dtstamp(icalcomponent* comp)
-{
-    icalcomponent *inner = icalcomponent_get_inner(comp); 
-    icalproperty *prop 
-	= icalcomponent_get_first_property(inner,ICAL_DTSTAMP_PROPERTY);
-
-    if (prop == 0){
-	return icaltime_null_time();
-    }
-    
-    return icalproperty_get_dtstamp(prop);
-}
-
-
-void icalcomponent_set_summary(icalcomponent* comp, const char* v)
-{
-    ICALSETUPSET(ICAL_SUMMARY_PROPERTY)
- 
-    if (prop == 0){
-	prop = icalproperty_new_summary(v);
-	icalcomponent_add_property(inner, prop);
-    }
-    
-    icalproperty_set_summary(prop,v);
-}
-
-
-const char* icalcomponent_get_summary(icalcomponent* comp)
-{
-    icalcomponent *inner;
-    icalproperty *prop;
-    icalerror_check_arg_rz(comp!=0,"comp");
-
-    inner = icalcomponent_get_inner(comp); 
-
-    if(inner == 0){
-        icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-        return 0;
-    }
-
-    prop= icalcomponent_get_first_property(inner,ICAL_SUMMARY_PROPERTY);
-
-    if (prop == 0){
-	return 0;
-    }
-    
-    return icalproperty_get_summary(prop);
-
-}
-
-void icalcomponent_set_comment(icalcomponent* comp, const char* v)
-{
-    ICALSETUPSET(ICAL_COMMENT_PROPERTY);
-
-    if (prop == 0){
-	prop = icalproperty_new_comment(v);
-	icalcomponent_add_property(inner, prop);
-    }
-
-    icalproperty_set_summary(prop,v);
-
-}
-const char* icalcomponent_get_comment(icalcomponent* comp){
-    icalcomponent *inner;
-    icalproperty *prop;
-    icalerror_check_arg_rz(comp!=0,"comp");
-
-    inner = icalcomponent_get_inner(comp); 
-
-    if(inner == 0){
-        icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-        return 0;
-    }
-
-    prop= icalcomponent_get_first_property(inner,ICAL_COMMENT_PROPERTY);
-
-    if (prop == 0){
-	return 0;
-    }
-    
-    return icalproperty_get_comment(prop);
-}
-
-void icalcomponent_set_uid(icalcomponent* comp, const char* v)
-{
-    ICALSETUPSET(ICAL_UID_PROPERTY);
-
-    if (prop == 0){
-	prop = icalproperty_new_uid(v);
-	icalcomponent_add_property(inner, prop);
-    }
-
-    icalproperty_set_summary(prop,v);
-
-}
-const char* icalcomponent_get_uid(icalcomponent* comp){
-    icalcomponent *inner;
-    icalproperty *prop;
-    icalerror_check_arg_rz(comp!=0,"comp");
-
-    inner = icalcomponent_get_inner(comp); 
-
-    if(inner == 0){
-        icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-        return 0;
-    }
-
-    prop= icalcomponent_get_first_property(inner,ICAL_UID_PROPERTY);
-
-    if (prop == 0){
-	return 0;
-    }
-    
-    return icalproperty_get_uid(prop);
-}
-
-void icalcomponent_set_recurrenceid(icalcomponent* comp, struct icaltimetype v)
-{
-    ICALSETUPSET(ICAL_RECURRENCEID_PROPERTY);
-
-    if (prop == 0){
-        prop = icalproperty_new_recurrenceid(v);
-        icalcomponent_add_property(inner, prop);
-    }
-
-    icalproperty_set_recurrenceid(prop,v);
-}
-struct icaltimetype icalcomponent_get_recurrenceid(icalcomponent* comp)
-{
-    icalcomponent *inner;
-    icalproperty *prop;
-    if (comp == 0) {
-	icalerror_set_errno(ICAL_BADARG_ERROR);
-        return icaltime_null_time();
-    }
-
-    inner = icalcomponent_get_inner(comp); 
-
-    if(inner == 0){
-        icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-        return icaltime_null_time();
-    }
-
-    prop= icalcomponent_get_first_property(inner, ICAL_RECURRENCEID_PROPERTY);
-
-    if (prop == 0){
-        return icaltime_null_time();
-    }
-
-    return icalproperty_get_recurrenceid(prop);
-}
-
-void icalcomponent_set_description(icalcomponent* comp, const char* v)
-{
-    ICALSETUPSET(ICAL_DESCRIPTION_PROPERTY);
-
-    if (prop == 0){
-        prop = icalproperty_new_description(v);
-        icalcomponent_add_property(inner, prop);
-    }
-
-    icalproperty_set_description(prop,v);
-}
-const char* icalcomponent_get_description(icalcomponent* comp)
-{
-    icalcomponent *inner;
-    icalproperty *prop;
-    icalerror_check_arg_rz(comp!=0,"comp");
-
-    inner = icalcomponent_get_inner(comp); 
-
-    if(inner == 0){
-        icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-        return 0;
-    }
-
-    prop= icalcomponent_get_first_property(inner,ICAL_DESCRIPTION_PROPERTY);
-
-    if (prop == 0){
-        return 0;
-    }
-
-    return icalproperty_get_description(prop);
-}
-
-void icalcomponent_set_location(icalcomponent* comp, const char* v)
-{
-    ICALSETUPSET(ICAL_LOCATION_PROPERTY)
-
-    if (prop == 0){
-        prop = icalproperty_new_location(v);
-        icalcomponent_add_property(inner, prop);
-    }
-
-    icalproperty_set_location(prop,v);
-}
-const char* icalcomponent_get_location(icalcomponent* comp)
-{
-    icalcomponent *inner;
-    icalproperty *prop;
-    icalerror_check_arg_rz(comp!=0,"comp");
-
-    inner = icalcomponent_get_inner(comp); 
-
-    if(inner == 0){
-        icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-        return 0;
-    }
-
-    prop= icalcomponent_get_first_property(inner,ICAL_LOCATION_PROPERTY);
-
-    if (prop == 0){
-        return 0;
-    }
-
-    return icalproperty_get_location(prop);
-}
-
-void icalcomponent_set_sequence(icalcomponent* comp, int v)
-{
-    ICALSETUPSET(ICAL_SEQUENCE_PROPERTY);
-
-    if (prop == 0){
-        prop = icalproperty_new_sequence(v);
-        icalcomponent_add_property(inner, prop);
-    }
-
-    icalproperty_set_sequence(prop,v);
-
-}
-int icalcomponent_get_sequence(icalcomponent* comp){
-    icalcomponent *inner;
-    icalproperty *prop;
-    icalerror_check_arg_rz(comp!=0,"comp");
-
-    inner = icalcomponent_get_inner(comp);
-
-    if(inner == 0){
-        icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-        return 0;
-    }
-
-    prop= icalcomponent_get_first_property(inner,ICAL_SEQUENCE_PROPERTY);
-
-    if (prop == 0){
-        return 0;
-    }
-
-    return icalproperty_get_sequence(prop);
-}
-
-
-void icalcomponent_set_status(icalcomponent* comp, enum icalproperty_status v)
-{
-    ICALSETUPSET(ICAL_STATUS_PROPERTY);
-
-    if (prop == 0){
-        prop = icalproperty_new_status(v);
-        icalcomponent_add_property(inner, prop);
-    }
-
-    icalproperty_set_status(prop,v);
-
-}
-enum icalproperty_status icalcomponent_get_status(icalcomponent* comp){
-    icalcomponent *inner;
-    icalproperty *prop;
-    icalerror_check_arg_rz(comp!=0,"comp");
-
-    inner = icalcomponent_get_inner(comp);
-
-    if(inner == 0){
-        icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-        return 0;
-    }
-
-    prop= icalcomponent_get_first_property(inner,ICAL_STATUS_PROPERTY);
-
-    if (prop == 0){
-        return 0;
-    }
-
-    return icalproperty_get_status(prop);
-}
-
-icalcomponent* icalcomponent_new_vcalendar()
-{
-    return icalcomponent_new(ICAL_VCALENDAR_COMPONENT);
-}
-icalcomponent* icalcomponent_new_vevent()
-{
-    return icalcomponent_new(ICAL_VEVENT_COMPONENT);
-}
-icalcomponent* icalcomponent_new_vtodo()
-{
-    return icalcomponent_new(ICAL_VTODO_COMPONENT);
-}
-icalcomponent* icalcomponent_new_vjournal()
-{
-    return icalcomponent_new(ICAL_VJOURNAL_COMPONENT);
-}
-icalcomponent* icalcomponent_new_valarm()
-{
-    return icalcomponent_new(ICAL_VALARM_COMPONENT);
-}
-icalcomponent* icalcomponent_new_vfreebusy()
-{
-    return icalcomponent_new(ICAL_VFREEBUSY_COMPONENT);
-}
-icalcomponent* icalcomponent_new_vtimezone()
-{
-    return icalcomponent_new(ICAL_VTIMEZONE_COMPONENT);
-}
-icalcomponent* icalcomponent_new_xstandard()
-{
-    return icalcomponent_new(ICAL_XSTANDARD_COMPONENT);
-}
-icalcomponent* icalcomponent_new_xdaylight()
-{
-    return icalcomponent_new(ICAL_XDAYLIGHT_COMPONENT);
-}
-icalcomponent* icalcomponent_new_vagenda()
-{
-    return icalcomponent_new(ICAL_VAGENDA_COMPONENT);
-}
-icalcomponent* icalcomponent_new_vquery()
-{
-    return icalcomponent_new(ICAL_VQUERY_COMPONENT);
-}
-icalcomponent* icalcomponent_new_vreply()
-{
-    return icalcomponent_new(ICAL_VREPLY_COMPONENT);
-}
-
-/*
- * Timezone stuff.
- */
-
-
-/**
- *  This takes 2 VCALENDAR components and merges the second one into the first,
- *  resolving any problems with conflicting TZIDs. comp_to_merge will no
- *  longer exist after calling this function.
- */
-void icalcomponent_merge_component(icalcomponent* comp,
-				   icalcomponent* comp_to_merge)
-{
-  icalcomponent *subcomp, *next_subcomp;
-  icalarray *tzids_to_rename;
-  int i;
-
-  /* Check that both components are VCALENDAR components. */
-  assert (icalcomponent_isa(comp) == ICAL_VCALENDAR_COMPONENT);
-  assert (icalcomponent_isa(comp_to_merge) == ICAL_VCALENDAR_COMPONENT);
-
-  /* Step through each subcomponent of comp_to_merge, looking for VTIMEZONEs.
-     For each VTIMEZONE found, check if we need to add it to comp and if we
-     need to rename it and all TZID references to it. */
-  tzids_to_rename = icalarray_new (sizeof (char*), 16);
-  subcomp = icalcomponent_get_first_component (comp_to_merge,
-					       ICAL_VTIMEZONE_COMPONENT);
-  while (subcomp) {
-    next_subcomp = icalcomponent_get_next_component (comp_to_merge,
-						     ICAL_VTIMEZONE_COMPONENT);
-    /* This will add the VTIMEZONE to comp, if necessary, and also update
-       the array of TZIDs we need to rename. */
-    icalcomponent_merge_vtimezone (comp, subcomp, tzids_to_rename);
-    /* FIXME: Handle possible NEWFAILED error. */
-
-    subcomp = next_subcomp;
-  }
-
-  /* If we need to do any renaming of TZIDs, do it now. */
-  if (tzids_to_rename->num_elements != 0) {
-    icalcomponent_rename_tzids (comp_to_merge, tzids_to_rename);
-      
-    /* Now free the tzids_to_rename array. */
-    for (i = 0; i < tzids_to_rename->num_elements; i++) {
-      free (icalarray_element_at (tzids_to_rename, i));
-    }
-    icalarray_free (tzids_to_rename);
-  }
-
-  /* Now move all the components from comp_to_merge to comp, excluding
-     VTIMEZONE components. */
-  subcomp = icalcomponent_get_first_component (comp_to_merge,
-					       ICAL_ANY_COMPONENT);
-  while (subcomp) {
-    next_subcomp = icalcomponent_get_next_component (comp_to_merge,
-						     ICAL_ANY_COMPONENT);
-    if (icalcomponent_isa(subcomp) != ICAL_VTIMEZONE_COMPONENT) {
-      icalcomponent_remove_component (comp_to_merge, subcomp);
-      icalcomponent_add_component (comp, subcomp);
-    }
-    subcomp = next_subcomp;
-  }
-
-  /* Free comp_to_merge. We have moved most of the subcomponents over to
-     comp now. */
-  icalcomponent_free (comp_to_merge);
-}
-
-
-static void icalcomponent_merge_vtimezone (icalcomponent *comp,
-					   icalcomponent *vtimezone,
-					   icalarray *tzids_to_rename)
-{
-  icalproperty *tzid_prop;
-  const char *tzid;
-  char *tzid_copy;
-  icaltimezone *existing_vtimezone;
-
-  /* Get the TZID of the VTIMEZONE. */
-  tzid_prop = icalcomponent_get_first_property (vtimezone, ICAL_TZID_PROPERTY);
-  if (!tzid_prop)
-    return;
-
-  tzid = icalproperty_get_tzid (tzid_prop);
-  if (!tzid)
-    return;
-
-  /* See if there is already a VTIMEZONE in comp with the same TZID. */
-  existing_vtimezone = icalcomponent_get_timezone (comp, tzid);
-
-  /* If there is no existing VTIMEZONE with the same TZID, we can just move
-     the VTIMEZONE to comp and return. */
-  if (!existing_vtimezone) {
-    icalcomponent_remove_component (icalcomponent_get_parent (vtimezone),
-				    vtimezone);
-    icalcomponent_add_component (comp, vtimezone);
-    return;
-  }
-
-  /* If the TZID has a '/' prefix, then we don't have to worry about the
-     clashing TZIDs, as they are supposed to be exactly the same VTIMEZONE. */
-  if (tzid[0] == '/')
-    return;
-
-  /* Now we have two VTIMEZONEs with the same TZID (which isn't a globally
-     unique one), so we compare the VTIMEZONE components to see if they are
-     the same. If they are, we don't need to do anything. We make a copy of
-     the tzid, since the parameter may get modified in these calls. */
-  tzid_copy = strdup (tzid);
-  if (!tzid_copy) {
-    icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-    return;
-  }
-
-  if (!icalcomponent_compare_vtimezones (comp, vtimezone)) {
-    /* FIXME: Handle possible NEWFAILED error. */
-
-    /* Now we have two different VTIMEZONEs with the same TZID. */
-    icalcomponent_handle_conflicting_vtimezones (comp, vtimezone, tzid_prop,
-						 tzid_copy, tzids_to_rename);
-  }
-  free (tzid_copy);
-}
-
-
-static void
-icalcomponent_handle_conflicting_vtimezones (icalcomponent *comp,
-					     icalcomponent *vtimezone,
-					     icalproperty *tzid_prop,
-					     const char *tzid,
-					     icalarray *tzids_to_rename)
-{
-  int i, suffix, max_suffix = 0, num_elements;
-  unsigned int tzid_len;
-  char *tzid_copy, *new_tzid, suffix_buf[32];
-
-  /* Find the length of the TZID without any trailing digits. */
-  tzid_len = icalcomponent_get_tzid_prefix_len (tzid);
-
-  /* Step through each of the VTIMEZONEs in comp. We may already have the
-     clashing VTIMEZONE in the calendar, but it may have been renamed
-     (i.e. a unique number added on the end of the TZID, e.g. 'London2').
-     So we compare the new VTIMEZONE with any VTIMEZONEs that have the
-     same prefix (e.g. 'London'). If it matches any of those, we have to
-     rename the TZIDs to that TZID, else we rename to a new TZID, using
-     the biggest numeric suffix found + 1. */
-  num_elements = comp->timezones ? comp->timezones->num_elements : 0;
-  for (i = 0; i < num_elements; i++) {
-    icaltimezone *zone;
-    char *existing_tzid, *existing_tzid_copy;
-    unsigned int existing_tzid_len;
-
-    zone = icalarray_element_at (comp->timezones, i);
-    existing_tzid = icaltimezone_get_tzid (zone);
-
-    /* Find the length of the TZID without any trailing digits. */
-    existing_tzid_len = icalcomponent_get_tzid_prefix_len (existing_tzid);
-
-    /* Check if we have the same prefix. */
-    if (tzid_len == existing_tzid_len
-	&& !strncmp (tzid, existing_tzid, tzid_len)) {
-      /* Compare the VTIMEZONEs. */
-      if (icalcomponent_compare_vtimezones (icaltimezone_get_component (zone),
-					    vtimezone)) {
-	/* The VTIMEZONEs match, so we can use the existing VTIMEZONE. But
-	   we have to rename TZIDs to this TZID. */
-	tzid_copy = strdup (tzid);
-	existing_tzid_copy = strdup (existing_tzid);
-	if (!tzid_copy || !existing_tzid_copy) {
-	  icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	} else {
-	  icalarray_append (tzids_to_rename, tzid_copy);
-	  icalarray_append (tzids_to_rename, existing_tzid_copy);
-	}
-	return;
-      } else {
-	/* FIXME: Handle possible NEWFAILED error. */
-
-	/* Convert the suffix to an integer and remember the maximum numeric
-	   suffix found. */
-	suffix = atoi (existing_tzid + existing_tzid_len);
-	if (max_suffix < suffix)
-	  max_suffix = suffix;
-      }
-    }
-  }
-
-  /* We didn't find a VTIMEZONE that matched, so we have to rename the TZID,
-     using the maximum numerical suffix found + 1. */
-  tzid_copy = strdup (tzid);
-  sprintf (suffix_buf, "%i", max_suffix + 1);
-  new_tzid = malloc (tzid_len + strlen (suffix_buf) + 1);
-  if (!new_tzid || !tzid_copy) {
-    icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-    return;
-  }
-
-  strncpy (new_tzid, tzid, tzid_len);
-  strcpy (new_tzid + tzid_len, suffix_buf);
-  icalarray_append (tzids_to_rename, tzid_copy);
-  icalarray_append (tzids_to_rename, new_tzid);
-}
-
-
-/* Returns the length of the TZID, without any trailing digits. */
-static unsigned int icalcomponent_get_tzid_prefix_len (const char *tzid)
-{
-  int len;
-  const char *p;
-
-  len = strlen (tzid);
-  p = tzid + len - 1;
-  while (len > 0 && *p >= '0' && *p <= '9') {
-    p--;
-    len--;
-  }
-
-  return len;
-}
-
-
-/**
- * Renames all references to the given TZIDs to a new name. rename_table
- * contains pairs of strings - a current TZID, and the new TZID to rename it
- * to.
- */
-static void icalcomponent_rename_tzids(icalcomponent* comp,
-				       icalarray* rename_table)
-{
-    icalcomponent_foreach_tzid (comp, icalcomponent_rename_tzids_callback,
-				rename_table);
-}
-
-
-static void icalcomponent_rename_tzids_callback(icalparameter *param, void *data)
-{
-    icalarray *rename_table = data;
-    const char *tzid;
-    int i;
-
-    tzid = icalparameter_get_tzid (param);
-    if (!tzid)
-        return;
-
-    /* Step through the rename table to see if the current TZID matches
-       any of the ones we want to rename. */
-    for (i = 0; i < rename_table->num_elements - 1; i += 2) {
-        if (!strcmp (tzid, icalarray_element_at (rename_table, i))) {
-	    icalparameter_set_tzid (param, icalarray_element_at (rename_table, i + 1));
-	    break;
-	}
-    }
-}
-
-
-/**
- * Calls the given function for each TZID parameter found in the component.
- */
-void icalcomponent_foreach_tzid(icalcomponent* comp,
-				void (*callback)(icalparameter *param, void *data),
-				void *callback_data)
-{
-    icalproperty *prop;
-    icalproperty_kind kind;
-    icalparameter *param;
-    icalcomponent *subcomp;
-
-    /* First look for any TZID parameters used in this component itself. */
-    prop = icalcomponent_get_first_property (comp, ICAL_ANY_PROPERTY);
-    while (prop) {
-      kind = icalproperty_isa (prop);
-
-      /* These are the only properties that can have a TZID. Note that
-	 COMPLETED, CREATED, DTSTAMP & LASTMODIFIED must be in UTC. */
-      if (kind == ICAL_DTSTART_PROPERTY || kind == ICAL_DTEND_PROPERTY
-	  || kind == ICAL_DUE_PROPERTY || kind == ICAL_EXDATE_PROPERTY
-	  || kind == ICAL_RDATE_PROPERTY) {
-	param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER);
-	if (param)
-	    (*callback) (param, callback_data);
-      }
-
-      prop = icalcomponent_get_next_property (comp, ICAL_ANY_PROPERTY);
-    }
-
-    /* Now recursively check child components. */
-    subcomp = icalcomponent_get_first_component (comp, ICAL_ANY_COMPONENT);
-    while (subcomp) {
-        icalcomponent_foreach_tzid (subcomp, callback, callback_data);
-        subcomp = icalcomponent_get_next_component (comp, ICAL_ANY_COMPONENT);
-    }
-}
-
-
-
-/**
- *  Returns the icaltimezone from the component corresponding to the given
- *  TZID, or NULL if the component does not have a corresponding VTIMEZONE.
- */
-icaltimezone* icalcomponent_get_timezone(icalcomponent* comp, const char *tzid)
-{
-    icaltimezone *zone;
-    int lower, upper, middle, cmp;
-    char *zone_tzid;
-
-    if (!comp->timezones)
-	return NULL;
-
-    /* Sort the array if necessary (by the TZID string). */
-    if (!comp->timezones_sorted) {
-	icalarray_sort (comp->timezones, icalcomponent_compare_timezone_fn);
-	comp->timezones_sorted = 1;
-    }
-
-    /* Do a simple binary search. */
-    lower = middle = 0;
-    upper = comp->timezones->num_elements;
-
-    while (lower < upper) {
-	middle = (lower + upper) >> 1;
-	zone = icalarray_element_at (comp->timezones, middle);
-	zone_tzid = icaltimezone_get_tzid (zone);
-	cmp = strcmp (tzid, zone_tzid);
-	if (cmp == 0)
-	    return zone;
-	else if (cmp < 0)
-	    upper = middle;
-	else
-	    lower = middle + 1;
-    }
-
-    return NULL;
-}
-
-
-/**
- * A function to compare 2 icaltimezone elements, used for qsort().
- */
-static int icalcomponent_compare_timezone_fn	(const void	*elem1,
-						 const void	*elem2)
-{
-    icaltimezone *zone1, *zone2;
-    const char *zone1_tzid, *zone2_tzid;
-
-    zone1 = (icaltimezone*) elem1;
-    zone2 = (icaltimezone*) elem2;
-
-    zone1_tzid = icaltimezone_get_tzid (zone1);
-    zone2_tzid = icaltimezone_get_tzid (zone2);
-
-    return strcmp (zone1_tzid, zone2_tzid);
-}
-
-
-/**
- * Compares 2 VTIMEZONE components to see if they match, ignoring their TZIDs.
- * It returns 1 if they match, 0 if they don't, or -1 on error.
- */
-static int icalcomponent_compare_vtimezones (icalcomponent	*vtimezone1,
-					     icalcomponent	*vtimezone2)
-{
-    icalproperty *prop1, *prop2;
-    const char *tzid1, *tzid2;
-    char *tzid2_copy, *string1, *string2;
-    int cmp;
-
-    /* Get the TZID property of the first VTIMEZONE. */
-    prop1 = icalcomponent_get_first_property (vtimezone1, ICAL_TZID_PROPERTY);
-    if (!prop1)
-	return -1;
-
-    tzid1 = icalproperty_get_tzid (prop1);
-    if (!tzid1)
-	return -1;
-
-    /* Get the TZID property of the second VTIMEZONE. */
-    prop2 = icalcomponent_get_first_property (vtimezone2, ICAL_TZID_PROPERTY);
-    if (!prop2)
-	return -1;
-
-    tzid2 = icalproperty_get_tzid (prop2);
-    if (!tzid2)
-	return -1;
-
-    /* Copy the second TZID, and set the property to the same as the first
-       TZID, since we don't care if these match of not. */
-    tzid2_copy = strdup (tzid2);
-    if (!tzid2_copy) {
-      icalerror_set_errno (ICAL_NEWFAILED_ERROR);
-      return 0;
-    }
-
-    icalproperty_set_tzid (prop2, tzid1);
-
-    /* Now convert both VTIMEZONEs to strings and compare them. */
-    string1 = icalcomponent_as_ical_string (vtimezone1);
-    if (!string1) {
-	free (tzid2_copy);
-	return -1;
-    }
-
-    string2 = icalcomponent_as_ical_string (vtimezone2);
-    if (!string2) {
-	free (string1);
-	free (tzid2_copy);
-	return -1;
-    }
-
-    cmp = strcmp (string1, string2);
-
-    free (string1);
-    free (string2);
-
-    /* Now reset the second TZID. */
-    icalproperty_set_tzid (prop2, tzid2_copy);
-    free (tzid2_copy);
-
-    return (cmp == 0) ? 1 : 0;
-}
-
-
-
-
-
-
-/** 
- * @brief set the RELCALID property of a component.
- *
- * @param comp    Valid calendar component.
- * @param v       Relcalid URL value
- */
-
-void icalcomponent_set_relcalid(icalcomponent* comp, const char* v)
-{
-  ICALSETUPSET(ICAL_RELCALID_PROPERTY);
-
-  if (prop == 0){
-    prop = icalproperty_new_relcalid(v);
-    icalcomponent_add_property(inner, prop);
-  }
-
-  icalproperty_set_relcalid(prop,v);
-
-}
-
-
-/** 
- * @brief get the RELCALID property of a component.
- *
- * @param comp    Valid calendar component.
- */
-
-const char* icalcomponent_get_relcalid(icalcomponent* comp){
-    icalcomponent *inner;
-    icalproperty *prop;
-    icalerror_check_arg_rz(comp!=0,"comp");
-
-    inner = icalcomponent_get_inner(comp);
-
-    if(inner == 0){
-        return 0;
-    }
-
-    prop= icalcomponent_get_first_property(inner,ICAL_RELCALID_PROPERTY);
-
-    if (prop == 0){
-        return 0;
-    }
-
-    return icalproperty_get_relcalid(prop);
-}
-
-
-/** @brief Return the time a TODO task is DUE.
- *
- *  @param comp Valid calendar component.
- *
- *  Uses the DUE: property if it exists, otherwise we calculate the DUE
- *  value by adding the task's duration to the DTSTART time
- */
-
-struct icaltimetype icalcomponent_get_due(icalcomponent* comp)
-{
-    icalcomponent *inner = icalcomponent_get_inner(comp);
-
-    icalproperty *due_prop
-        = icalcomponent_get_first_property(inner,ICAL_DUE_PROPERTY);
-
-    icalproperty *dur_prop
-        = icalcomponent_get_first_property(inner, ICAL_DURATION_PROPERTY);
-
-    if( due_prop == 0 && dur_prop == 0){
-        return icaltime_null_time();
-    } else if ( due_prop != 0) {
-        return icalproperty_get_due(due_prop);
-    } else if ( dur_prop != 0) {
-
-        struct icaltimetype start =
-            icalcomponent_get_dtstart(inner);
-        struct icaldurationtype duration =
-            icalproperty_get_duration(dur_prop);
-
-        struct icaltimetype due = icaltime_add(start,duration);
-
-        return due;
-
-    } else {
-        /* Error, both duration and due have been specified */
-        icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-        return icaltime_null_time();
-
-    }
-
-}
-
-/** @brief Set the due date of a VTODO task.
- *
- *  @param comp Valid VTODO component.
- *  @param v    Valid due date time.
- *
- *  - If no duration or due properties then set the DUE property.
- *  - If a DUE property is already set, then reset it to the value v.
- *  - If a DURATION property is already set, then calculate the new
- *    duration based on the supplied value of v.
- */
-
-void icalcomponent_set_due(icalcomponent* comp, struct icaltimetype v)
-{
-    icalcomponent *inner = icalcomponent_get_inner(comp);
-
-    icalproperty *due_prop
-        = icalcomponent_get_first_property(inner,ICAL_DUE_PROPERTY);
-
-    icalproperty *dur_prop
-        = icalcomponent_get_first_property(inner,ICAL_DURATION_PROPERTY);
-
-
-    if( due_prop == 0 && dur_prop == 0){
-        due_prop = icalproperty_new_due(v);
-        icalcomponent_add_property(inner,due_prop);
-    } else if ( due_prop != 0) {
-        icalproperty_set_due(due_prop,v);
-    } else if ( dur_prop != 0) {
-        struct icaltimetype start =
-            icalcomponent_get_dtstart(inner);
-
-        struct icaltimetype due =
-            icalcomponent_get_due(inner);
-
-        struct icaldurationtype dur
-            = icaltime_subtract(due,start);
-
-        icalproperty_set_duration(dur_prop,dur);
-
-    } else {
-        /* Error, both duration and due have been specified */
-        icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-    }
-}
diff --git a/libical/src/libical/icalcomponent.h b/libical/src/libical/icalcomponent.h
deleted file mode 100644
index be9bf8cc17..0000000000
--- a/libical/src/libical/icalcomponent.h
+++ /dev/null
@@ -1,282 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalcomponent.h
- CREATOR: eric 20 March 1999
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalcomponent.h
-
-======================================================================*/
-
-#ifndef ICALCOMPONENT_H
-#define ICALCOMPONENT_H
-
-#include "icalproperty.h"
-#include "icalvalue.h"
-#include "icalenums.h" /* defines icalcomponent_kind */
-#include "pvl.h"
-
-typedef struct icalcomponent_impl icalcomponent;
-
-#ifndef ICALTIMEZONE_DEFINED
-#define ICALTIMEZONE_DEFINED
-/** @brief An opaque struct representing a timezone.  
- * We declare this here to avoid a circular dependancy. 
- */
-typedef struct _icaltimezone		icaltimezone;
-#endif
-
-
-/* This is exposed so that callers will not have to allocate and
-   deallocate iterators. Pretend that you can't see it. */
-typedef struct icalcompiter
-{
-	icalcomponent_kind kind;
-	pvl_elem iter;
-
-} icalcompiter;
-
-icalcomponent* icalcomponent_new(icalcomponent_kind kind);
-icalcomponent* icalcomponent_new_clone(icalcomponent* component);
-icalcomponent* icalcomponent_new_from_string(char* str);
-icalcomponent* icalcomponent_vanew(icalcomponent_kind kind, ...);
-void icalcomponent_free(icalcomponent* component);
-
-char* icalcomponent_as_ical_string(icalcomponent* component);
-
-int icalcomponent_is_valid(icalcomponent* component);
-
-icalcomponent_kind icalcomponent_isa(const icalcomponent* component);
-
-int icalcomponent_isa_component (void* component);
-
-/* 
- * Working with properties
- */
-
-void icalcomponent_add_property(icalcomponent* component,
-				icalproperty* property);
-
-void icalcomponent_remove_property(icalcomponent* component,
-				   icalproperty* property);
-
-int icalcomponent_count_properties(icalcomponent* component,
-				   icalproperty_kind kind);
-
-/* Iterate through the properties */
-icalproperty* icalcomponent_get_current_property(icalcomponent* component);
-
-icalproperty* icalcomponent_get_first_property(icalcomponent* component,
-					      icalproperty_kind kind);
-icalproperty* icalcomponent_get_next_property(icalcomponent* component,
-					      icalproperty_kind kind);
-
-
-/* 
- * Working with components
- */ 
-
-
-/* Return the first VEVENT, VTODO or VJOURNAL sub-component of cop, or
-   comp if it is one of those types */
-
-icalcomponent* icalcomponent_get_inner(icalcomponent* comp);
-
-
-void icalcomponent_add_component(icalcomponent* parent,
-				icalcomponent* child);
-
-void icalcomponent_remove_component(icalcomponent* parent,
-				icalcomponent* child);
-
-int icalcomponent_count_components(icalcomponent* component,
-				   icalcomponent_kind kind);
-
-/**
-   This takes 2 VCALENDAR components and merges the second one into the first,
-   resolving any problems with conflicting TZIDs. comp_to_merge will no
-   longer exist after calling this function. */
-void icalcomponent_merge_component(icalcomponent* comp,
-				   icalcomponent* comp_to_merge);
-
-
-/* Iteration Routines. There are two forms of iterators, internal and
-external. The internal ones came first, and are almost completely
-sufficient, but they fail badly when you want to construct a loop that
-removes components from the container.*/
-
-
-/* Iterate through components */
-icalcomponent* icalcomponent_get_current_component (icalcomponent* component);
-
-icalcomponent* icalcomponent_get_first_component(icalcomponent* component,
-					      icalcomponent_kind kind);
-icalcomponent* icalcomponent_get_next_component(icalcomponent* component,
-					      icalcomponent_kind kind);
-
-/* Using external iterators */
-icalcompiter icalcomponent_begin_component(icalcomponent* component,
-					   icalcomponent_kind kind);
-icalcompiter icalcomponent_end_component(icalcomponent* component,
-					 icalcomponent_kind kind);
-icalcomponent* icalcompiter_next(icalcompiter* i);
-icalcomponent* icalcompiter_prior(icalcompiter* i);
-icalcomponent* icalcompiter_deref(icalcompiter* i);
-
-
-/* Working with embedded error properties */
-
-
-/* Check the component against itip rules and insert error properties*/
-/* Working with embedded error properties */
-int icalcomponent_check_restrictions(icalcomponent* comp);
-
-/** Count embedded errors. */
-int icalcomponent_count_errors(icalcomponent* component);
-
-/** Remove all X-LIC-ERROR properties*/
-void icalcomponent_strip_errors(icalcomponent* component);
-
-/** Convert some X-LIC-ERROR properties into RETURN-STATUS properties*/
-void icalcomponent_convert_errors(icalcomponent* component);
-
-/* Internal operations. They are private, and you should not be using them. */
-icalcomponent* icalcomponent_get_parent(icalcomponent* component);
-void icalcomponent_set_parent(icalcomponent* component, 
-			      icalcomponent* parent);
-
-/* Kind conversion routines */
-
-int icalcomponent_kind_is_valid(const icalcomponent_kind kind);
-
-icalcomponent_kind icalcomponent_string_to_kind(const char* string);
-
-const char* icalcomponent_kind_to_string(icalcomponent_kind kind);
-
-
-/************* Derived class methods.  ****************************
-
-If the code was in an OO language, the remaining routines would be
-members of classes derived from icalcomponent. Don't call them on the
-wrong component subtypes. */
-
-/** For VCOMPONENT: Return a reference to the first VEVENT, VTODO or
-   VJOURNAL */
-icalcomponent* icalcomponent_get_first_real_component(icalcomponent *c);
-
-/** For VEVENT, VTODO, VJOURNAL and VTIMEZONE: report the start and end
-   times of an event in UTC */
-struct icaltime_span icalcomponent_get_span(icalcomponent* comp);
-
-/******************** Convienience routines **********************/
-
-void icalcomponent_set_dtstart(icalcomponent* comp, struct icaltimetype v);
-struct icaltimetype icalcomponent_get_dtstart(icalcomponent* comp);
-
-/* For the icalcomponent routines only, dtend and duration are tied
-   together. If you call the set routine for one and the other exists,
-   the routine will calculate the change to the other. That is, if
-   there is a DTEND and you call set_duration, the routine will modify
-   DTEND to be the sum of DTSTART and the duration. If you call a get
-   routine for one and the other exists, the routine will calculate
-   the return value. If you call a set routine and neither exists, the
-   routine will create the apcompriate comperty */
-
-
-struct icaltimetype icalcomponent_get_dtend(icalcomponent* comp);
-void icalcomponent_set_dtend(icalcomponent* comp, struct icaltimetype v);
-
-struct icaltimetype icalcomponent_get_due(icalcomponent* comp);
-void icalcomponent_set_due(icalcomponent* comp, struct icaltimetype v);
-
-void icalcomponent_set_duration(icalcomponent* comp, 
-				struct icaldurationtype v);
-struct icaldurationtype icalcomponent_get_duration(icalcomponent* comp);
-
-void icalcomponent_set_method(icalcomponent* comp, icalproperty_method method);
-icalproperty_method icalcomponent_get_method(icalcomponent* comp);
-
-struct icaltimetype icalcomponent_get_dtstamp(icalcomponent* comp);
-void icalcomponent_set_dtstamp(icalcomponent* comp, struct icaltimetype v);
-
-void icalcomponent_set_summary(icalcomponent* comp, const char* v);
-const char* icalcomponent_get_summary(icalcomponent* comp);
-
-void icalcomponent_set_comment(icalcomponent* comp, const char* v);
-const char* icalcomponent_get_comment(icalcomponent* comp);
-
-void icalcomponent_set_uid(icalcomponent* comp, const char* v);
-const char* icalcomponent_get_uid(icalcomponent* comp);
-
-void icalcomponent_set_relcalid(icalcomponent* comp, const char* v);
-const char* icalcomponent_get_relcalid(icalcomponent* comp);
-
-void icalcomponent_set_recurrenceid(icalcomponent* comp, 
-				    struct icaltimetype v);
-struct icaltimetype icalcomponent_get_recurrenceid(icalcomponent* comp);
-
-void icalcomponent_set_description(icalcomponent* comp, const char* v);
-const char* icalcomponent_get_description(icalcomponent* comp);
-
-void icalcomponent_set_location(icalcomponent* comp, const char* v);
-const char* icalcomponent_get_location(icalcomponent* comp);
-
-void icalcomponent_set_sequence(icalcomponent* comp, int v);
-int icalcomponent_get_sequence(icalcomponent* comp);
-
-void icalcomponent_set_status(icalcomponent* comp, enum icalproperty_status v);
-enum icalproperty_status icalcomponent_get_status(icalcomponent* comp);
-
-
-/** Calls the given function for each TZID parameter found in the
-    component, and any subcomponents. */
-void icalcomponent_foreach_tzid(icalcomponent* comp,
-				void (*callback)(icalparameter *param, void *data),
-				void *callback_data);
-
-/** Returns the icaltimezone in the component corresponding to the
-    TZID, or NULL if it can't be found. */
-icaltimezone* icalcomponent_get_timezone(icalcomponent* comp,
-					 const char *tzid);
-
-int icalproperty_recurrence_is_excluded(icalcomponent *comp,
-                                       struct icaltimetype *dtstart,
-                                       struct icaltimetype *recurtime); 
-
-void icalcomponent_foreach_recurrence(icalcomponent* comp,
-				      struct icaltimetype start,
-				      struct icaltimetype end,
-			void (*callback)(icalcomponent *comp, 
-                                         struct icaltime_span *span, 
-                                         void *data),
-			      void *callback_data);
-
-
-/*************** Type Specific routines ***************/
-
-icalcomponent* icalcomponent_new_vcalendar();
-icalcomponent* icalcomponent_new_vevent();
-icalcomponent* icalcomponent_new_vtodo();
-icalcomponent* icalcomponent_new_vjournal();
-icalcomponent* icalcomponent_new_valarm();
-icalcomponent* icalcomponent_new_vfreebusy();
-icalcomponent* icalcomponent_new_vtimezone();
-icalcomponent* icalcomponent_new_xstandard();
-icalcomponent* icalcomponent_new_xdaylight();
-icalcomponent* icalcomponent_new_vagenda();
-icalcomponent* icalcomponent_new_vquery();
-
-#endif /* !ICALCOMPONENT_H */
diff --git a/libical/src/libical/icalderivedparameter.c.in b/libical/src/libical/icalderivedparameter.c.in
deleted file mode 100644
index 250cf188ee..0000000000
--- a/libical/src/libical/icalderivedparameter.c.in
+++ /dev/null
@@ -1,205 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalderivedparameters.{c,h}
-  CREATOR: eric 09 May 1999
-  
-  $Id: icalderivedparameter.c.in,v 1.3 2003/10/21 18:28:29 ettore Exp $
-  $Locker:  $
-    
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalderivedparameters.{c,h}
-
-  Contributions from:
-     Graham Davison (g.m.davison@computer.org)
-
- ======================================================================*/
-/*#line 29 "icalparameter.c.in"*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
-#include "icalparameter.h"
-#include "icalparameterimpl.h"
-
-#include "icalproperty.h"
-#include "icalerror.h"
-#include "icalmemory.h"
-
-#include <stdlib.h> /* for malloc() */
-#include <errno.h>
-#include <string.h> /* for memset() */
-
-icalvalue_kind icalparameter_value_to_value_kind(icalparameter_value value);
-
-struct icalparameter_impl* icalparameter_new_impl(icalparameter_kind kind);
-
-/* This map associates each of the parameters with the string
-   representation of the paramter's name */
-struct icalparameter_kind_map {
-    icalparameter_kind kind;
-    char *name;
-    
-};
-
-/* This map associates the enumerations for the VALUE parameter with
-   the kinds of VALUEs. */
-
-struct icalparameter_value_kind_map {
-    icalparameter_value value; 
-    icalvalue_kind kind; 
-};
-
-/* This map associates the parameter enumerations with a specific parameter and the string representation of the enumeration */
-
-struct icalparameter_map {
-    icalparameter_kind kind;
-    int enumeration;
-    const char* str;
-};
-
-
-
-<insert_code_here>
-
-const char* icalparameter_kind_to_string(icalparameter_kind kind)
-{
-    int i;
-
-    for (i=0; parameter_map[i].kind != ICAL_NO_PARAMETER; i++) {
-	if (parameter_map[i].kind == kind) {
-	    return parameter_map[i].name;
-	}
-    }
-
-    return 0;
-
-}
-
-icalparameter_kind icalparameter_string_to_kind(const char* string)
-{
-    int i;
-
-    if (string ==0 ) { 
-	return ICAL_NO_PARAMETER;
-    }
-
-    for (i=0; parameter_map[i].kind  != ICAL_NO_PARAMETER; i++) {
-
-	if (strcmp(parameter_map[i].name, string) == 0) {
-	    return parameter_map[i].kind;
-	}
-    }
-
-    if(strncmp(string,"X-",2)==0){
-	return ICAL_X_PARAMETER;
-    }
-
-    return ICAL_NO_PARAMETER;
-}
-
-
-icalvalue_kind icalparameter_value_to_value_kind(icalparameter_value value)
-{
-    int i;
-
-    for (i=0; value_kind_map[i].kind  != ICAL_NO_VALUE; i++) {
-
-	if (value_kind_map[i].value == value) {
-	    return value_kind_map[i].kind;
-	}
-    }
-
-    return ICAL_NO_VALUE;
-}
-
-
-const char* icalparameter_enum_to_string(int e) 
-{
-    int i;
-
-    icalerror_check_arg_rz(e >= ICALPARAMETER_FIRST_ENUM,"e");
-    icalerror_check_arg_rz(e <= ICALPARAMETER_LAST_ENUM,"e");
-
-    for (i=0; icalparameter_map[i].kind != ICAL_NO_PARAMETER; i++){
-        if(e == icalparameter_map[i].enumeration){
-            return icalparameter_map[i].str;
-        }
-    }
-
-    return 0;
-}
-
-int icalparameter_string_to_enum(const char* str)
-{
-    int i;
-
-    icalerror_check_arg_rz(str != 0,"str");
-
-    for (i=0; icalparameter_map[i].kind != ICAL_NO_PARAMETER; i++){
-        if(strcmp(str,icalparameter_map[i].str) == 0) {
-            return icalparameter_map[i].enumeration;
-        }
-    }
-
-    return 0;
-}
-
-icalparameter* icalparameter_new_from_value_string(icalparameter_kind kind,const  char* val)
-{
-
-    struct icalparameter_impl* param=0;
-    int found_kind = 0;
-    int i;
-
-    icalerror_check_arg_rz((val!=0),"val");
-
-    /* Search through the parameter map to find a matching kind */
-
-    param = icalparameter_new_impl(kind);
-
-    for (i=0; icalparameter_map[i].kind != ICAL_NO_PARAMETER; i++){
-        if(kind == icalparameter_map[i].kind) {
-            found_kind = 1;
-            if(strcmp(val,icalparameter_map[i].str) == 0) {
-
-                param->data = (int)icalparameter_map[i].enumeration;
-                return param;
-            }
-        }
-    }
-    
-    if(found_kind == 1){
-        /* The kind was in the parameter map, but the string did not
-           match, so assume that it is an alternate value, like an
-           X-value.*/
-        
-        icalparameter_set_xvalue(param, val);
-
-    } else {
- 
-        /* If the kind was not found, then it must be a string type */
-        
-        ((struct icalparameter_impl*)param)->string = icalmemory_strdup(val);
-
-    }
-
-   return param;
-}
-
-
-
-
diff --git a/libical/src/libical/icalderivedparameter.h.in b/libical/src/libical/icalderivedparameter.h.in
deleted file mode 100644
index 0e7c29fa65..0000000000
--- a/libical/src/libical/icalderivedparameter.h.in
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
-  FILE: icalparam.h
-  CREATOR: eric 20 March 1999
-
-
-  $Id: icalderivedparameter.h.in,v 1.3 2003/10/21 18:28:29 ettore Exp $
-  $Locker:  $
-
-  
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalparam.h
-
-  ======================================================================*/
-
-#ifndef ICALDERIVEDPARAMETER_H
-#define ICALDERIVEDPARAMETER_H
-
-
-typedef struct icalparameter_impl icalparameter;
-
-const char* icalparameter_enum_to_string(int e);
-int icalparameter_string_to_enum(const char* str); 
-
-<insert_code_here>
diff --git a/libical/src/libical/icalderivedproperty.c.in b/libical/src/libical/icalderivedproperty.c.in
deleted file mode 100644
index 30b86b0f8c..0000000000
--- a/libical/src/libical/icalderivedproperty.c.in
+++ /dev/null
@@ -1,285 +0,0 @@
-/* -*- Mode: C -*- */
-
-/*======================================================================
-  FILE: icalderivedproperty.c
-  CREATOR: eric 15 Feb 2001
-  
-  $Id: icalderivedproperty.c.in,v 1.3 2003/10/21 18:28:29 ettore Exp $
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalproperty.c
-
-======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "icalproperty.h"
-#include "icalcomponent.h"
-#include "pvl.h"
-#include "icalenums.h"
-#include "icalerror.h"
-#include "icalmemory.h"
-#include "icalparser.h"
-
-#include <string.h> /* For icalmemory_strdup, rindex */
-#include <assert.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <stdio.h> /* for printf */
-#include <stdarg.h> /* for va_list, va_start, etc. */
-                                               
-struct icalproperty_impl*
-icalproperty_new_impl (icalproperty_kind kind);
-void icalproperty_add_parameters(struct icalproperty_impl *prop,va_list args);
-
-/* This map associates the property kinds with the string
-   representation of the property name and the kind of VALUE that the
-   property uses as a default */
-
-struct  icalproperty_map {
-	icalproperty_kind kind;
-	const char *name;
-	icalvalue_kind value;
-
-};
-
-/* This map associates the property enumerations with the king of
-   property that they are used in and the string representation of the
-   enumeration */
-
-struct icalproperty_enum_map {
-    icalproperty_kind prop;
-    int prop_enum;
-    const char* str;
-}; 
-
-
-<insert_code_here>
-
-int icalproperty_kind_is_valid(const icalproperty_kind kind)
-{
-    int i = 0;
-    do {
-      if (property_map[i].kind == kind)
-	return 1;
-    } while (property_map[i++].kind != ICAL_NO_PROPERTY);
-
-    return 0;
-}  
-
-const char* icalproperty_kind_to_string(icalproperty_kind kind)
-{
-    int i;
-
-    for (i=0; property_map[i].kind != ICAL_NO_PROPERTY; i++) {
-	if (property_map[i].kind == kind) {
-	    return property_map[i].name;
-	}
-    }
-
-    return 0;
-
-}
-
-
-icalproperty_kind icalproperty_string_to_kind(const char* string)
-{
-    int i;
-
-    if (string ==0 ) { 
-	return ICAL_NO_PROPERTY;
-    }
-
-
-    for (i=0; property_map[i].kind  != ICAL_NO_PROPERTY; i++) {
-	if (strcmp(property_map[i].name, string) == 0) {
-	    return property_map[i].kind;
-	}
-    }
-
-    if(strncmp(string,"X-",2)==0){
-	return ICAL_X_PROPERTY;
-    }
-
-
-    return ICAL_NO_PROPERTY;
-}
-
-
-icalproperty_kind icalproperty_value_kind_to_kind(icalvalue_kind kind)
-{
-    int i;
-
-    for (i=0; property_map[i].kind  != ICAL_NO_PROPERTY; i++) {
-	if ( property_map[i].value == kind ) {
-	    return property_map[i].kind;
-	}
-    }
-
-    return ICAL_NO_PROPERTY;
-}
-
-
-
-icalvalue_kind icalproperty_kind_to_value_kind(icalproperty_kind kind)
-{
-    int i;
-
-    for (i=0; property_map[i].kind  != ICAL_NO_PROPERTY; i++) {
-	if ( property_map[i].kind == kind ) {
-	    return property_map[i].value;
-	}
-    }
-
-    return ICAL_NO_VALUE;
-}
-
-
-const char* icalproperty_enum_to_string(int e)
-{
-    icalerror_check_arg_rz(e >= ICALPROPERTY_FIRST_ENUM,"e");
-    icalerror_check_arg_rz(e <= ICALPROPERTY_LAST_ENUM,"e");
-
-    return enum_map[e-ICALPROPERTY_FIRST_ENUM].str;
-}
-
-int icalproperty_kind_and_string_to_enum(const int kind, const char* str)
-{
-    icalproperty_kind pkind;
-    int i;
-
-    icalerror_check_arg_rz(str!=0,"str")
-
-    if ((pkind = icalproperty_value_kind_to_kind(kind)) == ICAL_NO_VALUE)
-	return 0;
-
-    while(*str == ' '){
-	str++;
-    }
-
-    for (i=ICALPROPERTY_FIRST_ENUM; i != ICALPROPERTY_LAST_ENUM; i++) {
-	if (enum_map[i-ICALPROPERTY_FIRST_ENUM].prop == pkind)
-	    break;
-    }
-    if (i == ICALPROPERTY_LAST_ENUM)
-	    return 0;
-
-    for (; i != ICALPROPERTY_LAST_ENUM; i++) {
-	if ( strcmp(enum_map[i-ICALPROPERTY_FIRST_ENUM].str, str) == 0) {
-	    return enum_map[i-ICALPROPERTY_FIRST_ENUM].prop_enum;
-	}
-    }
-
-    return 0;
-}
-
-/** @deprecated please use icalproperty_kind_and_string_to_enum instead */
-int icalproperty_string_to_enum(const char* str)
-{
-    int i;
-
-    icalerror_check_arg_rz(str!=0,"str")
-
-    while(*str == ' '){
-	str++;
-    }
-
-    for (i=ICALPROPERTY_FIRST_ENUM; i != ICALPROPERTY_LAST_ENUM; i++) {
-	if ( strcmp(enum_map[i-ICALPROPERTY_FIRST_ENUM].str, str) == 0) {
-	    return enum_map[i-ICALPROPERTY_FIRST_ENUM].prop_enum;
-	}
-    }
-
-    return 0;
-}
-
-int icalproperty_enum_belongs_to_property(icalproperty_kind kind, int e)
-{
-    int i;
-
-
-    for (i=ICALPROPERTY_FIRST_ENUM; i != ICALPROPERTY_LAST_ENUM; i++) {
-        if(enum_map[i-ICALPROPERTY_FIRST_ENUM].prop_enum == e && 
-           enum_map[i-ICALPROPERTY_FIRST_ENUM].prop == kind ){
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
-
-const char* icalproperty_method_to_string(icalproperty_method method)
-{
-    icalerror_check_arg_rz(method >= ICAL_METHOD_X,"method");
-    icalerror_check_arg_rz(method <= ICAL_METHOD_NONE,"method");
-
-    return enum_map[method-ICALPROPERTY_FIRST_ENUM].str;
-}
-
-icalproperty_method icalproperty_string_to_method(const char* str)
-{
-    int i;
-
-    icalerror_check_arg_rx(str!=0,"str",ICAL_METHOD_NONE)
-
-    while(*str == ' '){
-	str++;
-    }
-
-    for (i=ICAL_METHOD_X-ICALPROPERTY_FIRST_ENUM; 
-         i != ICAL_METHOD_NONE-ICALPROPERTY_FIRST_ENUM;
-         i++) {
-	if ( strcmp(enum_map[i].str, str) == 0) {
-	    return (icalproperty_method)enum_map[i].prop_enum;
-	}
-    }
-
-    return ICAL_METHOD_NONE;
-}
-
-
-const char* icalenum_status_to_string(icalproperty_status status)
-{
-    icalerror_check_arg_rz(status >= ICAL_STATUS_X,"status");
-    icalerror_check_arg_rz(status <= ICAL_STATUS_NONE,"status");
-
-    return enum_map[status-ICALPROPERTY_FIRST_ENUM].str;
-}
-
-icalproperty_status icalenum_string_to_status(const char* str)
-{
-    int i;
-
-    icalerror_check_arg_rx(str!=0,"str",ICAL_STATUS_NONE)
-
-    while(*str == ' '){
-	str++;
-    }
-
-    for (i=ICAL_STATUS_X-ICALPROPERTY_FIRST_ENUM; 
-         i != ICAL_STATUS_NONE-ICALPROPERTY_FIRST_ENUM;
-         i++) {
-	if ( strcmp(enum_map[i].str, str) == 0) {
-	    return (icalproperty_status)enum_map[i].prop_enum;
-	}
-    }
-
-    return ICAL_STATUS_NONE;
-
-}
diff --git a/libical/src/libical/icalderivedproperty.h.in b/libical/src/libical/icalderivedproperty.h.in
deleted file mode 100644
index 515034742d..0000000000
--- a/libical/src/libical/icalderivedproperty.h.in
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalderivedproperties.{c,h}
-  CREATOR: eric 09 May 1999
-  
-  $Id: icalderivedproperty.h.in,v 1.3 2003/10/21 18:28:29 ettore Exp $
-    
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
- ======================================================================*/
-
-
-#ifndef ICALDERIVEDPROPERTY_H
-#define ICALDERIVEDPROPERTY_H
-
-#include <time.h>
-#include "icalparameter.h"
-#include "icalderivedvalue.h"  
-#include "icalrecur.h"
-
-typedef struct icalproperty_impl icalproperty;
-
-<insert_code_here>
diff --git a/libical/src/libical/icalderivedvalue.c.in b/libical/src/libical/icalderivedvalue.c.in
deleted file mode 100644
index 33f5083589..0000000000
--- a/libical/src/libical/icalderivedvalue.c.in
+++ /dev/null
@@ -1,337 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
-  FILE: icalvalue.c
-  CREATOR: eric 02 May 1999
-  
-  $Id: icalderivedvalue.c.in,v 1.5 2003/10/21 18:28:29 ettore Exp $
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalvalue.c
-
-  Contributions from:
-     Graham Davison (g.m.davison@computer.org)
-
-
-======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "icalerror.h"
-#include "icalmemory.h"
-#include "icalparser.h"
-#include "icalenums.h"
-
-#include "icalvalueimpl.h"
-
-#include <stdlib.h> /* for malloc */
-#include <stdio.h> /* for sprintf */
-#include <string.h> /* For memset, others */
-#include <stddef.h> /* For offsetof() macro */
-#include <errno.h>
-#include <time.h> /* for mktime */
-#include <stdlib.h> /* for atoi and atof */
-#include <limits.h> /* for SHRT_MAX */         
-
-struct icalvalue_impl*  icalvalue_new_impl(icalvalue_kind kind);
-
-/* This map associates each of the value types with its string
-   representation */
-struct icalvalue_kind_map {
-	icalvalue_kind kind;
-	char name[20];
-};
-
-<insert_code_here>
-
-
-int icalvalue_kind_is_valid(const icalvalue_kind kind)
-{
-    int i = 0;
-    do {
-      if (value_map[i].kind == kind)
-	return 1;
-    } while (value_map[i++].kind != ICAL_NO_VALUE);
-
-    return 0;
-}  
-
-const char* icalvalue_kind_to_string(const icalvalue_kind kind)
-{
-    int i;
-
-    for (i=0; value_map[i].kind != ICAL_NO_VALUE; i++) {
-	if (value_map[i].kind == kind) {
-	    return value_map[i].name;
-	}
-    }
-
-    return 0;
-}
-
-icalvalue_kind icalvalue_string_to_kind(const char* str)
-{
-    int i;
-
-    for (i=0; value_map[i].kind != ICAL_NO_VALUE; i++) {
-	if (strcmp(value_map[i].name,str) == 0) {
-	    return value_map[i].kind;
-	}
-    }
-
-    return  value_map[i].kind;
-
-}
-
-icalvalue* icalvalue_new_x (const char* v){
-   struct icalvalue_impl* impl = icalvalue_new_impl(ICAL_X_VALUE);
-   icalerror_check_arg_rz( (v!=0),"v");
-
-   icalvalue_set_x((icalvalue*)impl,v);
-   return (icalvalue*)impl;
-}
-void icalvalue_set_x(icalvalue* impl, const char* v) {
-    icalerror_check_arg_rv( (impl!=0),"value");
-    icalerror_check_arg_rv( (v!=0),"v");
-
-    if(impl->x_value!=0) {free((void*)impl->x_value);}
-
-    impl->x_value = icalmemory_strdup(v);
-
-    if (impl->x_value == 0){
-      errno = ENOMEM;
-    }
- 
- }
-const char* icalvalue_get_x(const icalvalue* value) {
-
-    icalerror_check_arg( (value!=0),"value");
-    icalerror_check_value_type(value, ICAL_X_VALUE);
-    return value->x_value;
-}
-
-/* Recur is a special case, so it is not auto generated. */
-icalvalue*
-icalvalue_new_recur (struct icalrecurrencetype v)
-{
-   struct icalvalue_impl* impl = icalvalue_new_impl(ICAL_RECUR_VALUE);
-    
-   icalvalue_set_recur((icalvalue*)impl,v);
-
-   return (icalvalue*)impl;
-}
-
-void
-icalvalue_set_recur(icalvalue* impl, struct icalrecurrencetype v)
-{
-    icalerror_check_arg_rv( (impl!=0),"value");
-    icalerror_check_value_type(value, ICAL_RECUR_VALUE);
-
-    if (impl->data.v_recur != 0){
-	free(impl->data.v_recur);
-	impl->data.v_recur = 0;
-    }
-
-    impl->data.v_recur = malloc(sizeof(struct icalrecurrencetype));
-
-    if (impl->data.v_recur == 0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return;
-    } else {
-	memcpy(impl->data.v_recur, &v, sizeof(struct icalrecurrencetype));
-    }
-	       
-}
-
-struct icalrecurrencetype
-icalvalue_get_recur(const icalvalue* value)
-{
-    icalerror_check_arg( (value!=0),"value");
-    icalerror_check_value_type(value, ICAL_RECUR_VALUE);
-  
-    return *(value->data.v_recur);
-}
-
-
-
-
-icalvalue*
-icalvalue_new_trigger (struct icaltriggertype v)
-{
-   struct icalvalue_impl* impl = icalvalue_new_impl(ICAL_TRIGGER_VALUE);
- 
-   icalvalue_set_trigger((icalvalue*)impl,v);
-
-   return (icalvalue*)impl;
-}
-
-void
-icalvalue_set_trigger(icalvalue* value, struct icaltriggertype v)
-{
-    icalerror_check_arg_rv( (value!=0),"value");
-    
-   if(!icaltime_is_null_time(v.time)){
-       icalvalue_set_datetime(value,v.time);
-       value->kind = ICAL_DATETIME_VALUE;
-   } else {
-       icalvalue_set_duration(value,v.duration);
-       value->kind = ICAL_DURATION_VALUE;
-   }
-}
-
-struct icaltriggertype
-icalvalue_get_trigger(const icalvalue* impl)
-{
-    struct icaltriggertype tr;
-
-    icalerror_check_arg( (impl!=0),"value");
-    icalerror_check_arg( (impl!=0),"value");
-
-    if(impl->kind == ICAL_DATETIME_VALUE){
-	 tr.duration = icaldurationtype_from_int(0);
-	 tr.time = impl->data.v_time;
-    } else if(impl->kind == ICAL_DURATION_VALUE){
-	tr.time = icaltime_null_time();
-	tr.duration = impl->data.v_duration;
-    } else {
-	tr.duration = icaldurationtype_from_int(0);
-	tr.time = icaltime_null_time();
-	icalerror_set_errno(ICAL_BADARG_ERROR);
-    }
-
-    return tr;
-}
-
-/* DATE-TIME-PERIOD is a special case, and is not auto generated */
-
-icalvalue*
-icalvalue_new_datetimeperiod (struct icaldatetimeperiodtype v)
-{
-   struct icalvalue_impl* impl = icalvalue_new_impl(ICAL_DATETIMEPERIOD_VALUE);
-
-   icalvalue_set_datetimeperiod(impl,v);
-
-   return (icalvalue*)impl;
-}
-
-void
-icalvalue_set_datetimeperiod(icalvalue* impl, struct icaldatetimeperiodtype v)
-{
-    icalerror_check_arg_rv( (impl!=0),"value");
-    
-    icalerror_check_value_type(value, ICAL_DATETIMEPERIOD_VALUE);
-
-    if(!icaltime_is_null_time(v.time)){
-	if(!icaltime_is_valid_time(v.time)){
-	    icalerror_set_errno(ICAL_BADARG_ERROR);
-	    return;
-	}
-	impl->kind = ICAL_DATETIME_VALUE;
-	icalvalue_set_datetime(impl,v.time);
-    } else if (!icalperiodtype_is_null_period(v.period)) {
-	if(!icalperiodtype_is_valid_period(v.period)){
-	    icalerror_set_errno(ICAL_BADARG_ERROR);
-	    return;
-	}
-	impl->kind = ICAL_PERIOD_VALUE;
-	icalvalue_set_period(impl,v.period);
-    } else {
-	icalerror_set_errno(ICAL_BADARG_ERROR);
-    }
-}
-
-struct icaldatetimeperiodtype
-icalvalue_get_datetimeperiod(const icalvalue* impl)
-{
-  struct icaldatetimeperiodtype dtp;
-  
-  icalerror_check_arg( (impl!=0),"value");
-  icalerror_check_value_type(value, ICAL_DATETIMEPERIOD_VALUE);
-  
-  if(impl->kind == ICAL_DATETIME_VALUE){
-      dtp.period = icalperiodtype_null_period();
-      dtp.time = impl->data.v_time;
-  } else if(impl->kind == ICAL_PERIOD_VALUE) {
-      dtp.period = impl->data.v_period;
-      dtp.time = icaltime_null_time();
-  } else {
-      dtp.period = icalperiodtype_null_period();
-      dtp.time = icaltime_null_time();
-      icalerror_set_errno(ICAL_BADARG_ERROR);
-  }	
-
-  return dtp;
-}
-
-
-
-icalvalue *
-icalvalue_new_attach (icalattach *attach)
-{
-    struct icalvalue_impl *impl;
-
-    icalerror_check_arg_rz ((attach != NULL), "attach");
-
-    impl = icalvalue_new_impl (ICAL_ATTACH_VALUE);
-    if (!impl) {
-	errno = ENOMEM;
-	return NULL;
-    }
-
-    icalvalue_set_attach ((icalvalue *) impl, attach);
-    return (icalvalue *) impl;
-}
-
-void
-icalvalue_set_attach (icalvalue *value, icalattach *attach)
-{
-    struct icalvalue_impl *impl;
- 
-    icalerror_check_arg_rv ((value != NULL), "value");
-    icalerror_check_value_type (value, ICAL_ATTACH_VALUE);
-    icalerror_check_arg_rv ((attach != NULL), "attach");
-  
-    impl = (struct icalvalue_impl *) value;
- 
-    icalattach_ref (attach);
-
-    if (impl->data.v_attach)
-	icalattach_unref (impl->data.v_attach);
-  
-    impl->data.v_attach = attach;
-}
-
-icalattach *
-icalvalue_get_attach (const icalvalue *value)
-{
-    icalerror_check_arg_rz ((value != NULL), "value");
-    icalerror_check_value_type (value, ICAL_ATTACH_VALUE);
-    
-    return value->data.v_attach;
-}
-
-
-
-
-
-
-
-/* The remaining interfaces are 'new', 'set' and 'get' for each of the value
-   types */
-
-
-/* Everything below this line is machine generated. Do not edit. */
diff --git a/libical/src/libical/icalderivedvalue.h.in b/libical/src/libical/icalderivedvalue.h.in
deleted file mode 100644
index ab52499aa8..0000000000
--- a/libical/src/libical/icalderivedvalue.h.in
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
-  FILE: icalvalue.h
-  CREATOR: eric 20 March 1999
-
-
-  $Id: icalderivedvalue.h.in,v 1.4 2003/10/21 18:28:29 ettore Exp $
-  $Locker:  $
-
-  
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalvalue.h
-
-  ======================================================================*/
-
-#ifndef ICALDERIVEDVALUE_H
-#define ICALDERIVEDVALUE_H
-
-#include "icaltypes.h"
-#include "icalrecur.h"
-#include "icaltime.h"
-#include "icalduration.h"
-#include "icalperiod.h"
-#include "icalattach.h"
-     
-typedef struct icalvalue_impl icalvalue;
-
-
-
-void icalvalue_set_x(icalvalue* value, const char* v);
-icalvalue* icalvalue_new_x(const char* v);
-const char* icalvalue_get_x(const icalvalue* value);
-
-icalvalue* icalvalue_new_recur (struct icalrecurrencetype v);
-void icalvalue_set_recur(icalvalue* value, struct icalrecurrencetype v);
-struct icalrecurrencetype icalvalue_get_recur(const icalvalue* value);
-
-icalvalue* icalvalue_new_trigger (struct icaltriggertype v);
-void icalvalue_set_trigger(icalvalue* value, struct icaltriggertype v);
-struct icaltriggertype icalvalue_get_trigger(const icalvalue* value);
-
-icalvalue* icalvalue_new_datetimeperiod (struct icaldatetimeperiodtype v);
-void icalvalue_set_datetimeperiod(icalvalue* value, struct icaldatetimeperiodtype v);
-struct icaldatetimeperiodtype icalvalue_get_datetimeperiod(const icalvalue* value);
-
-icalvalue *icalvalue_new_attach (icalattach *attach);
-void icalvalue_set_attach (icalvalue *value, icalattach *attach);
-icalattach *icalvalue_get_attach (const icalvalue *value);
-
-void icalvalue_reset_kind(icalvalue* value);
-
-<insert_code_here>
diff --git a/libical/src/libical/icalduration.c b/libical/src/libical/icalduration.c
deleted file mode 100644
index 821a3b7688..0000000000
--- a/libical/src/libical/icalduration.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icaltime.c
-  CREATOR: eric 02 June 2000
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
- ======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "icalduration.h"
-
-#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "icalerror.h"
-#include "icalmemory.h"
-#include "icalvalue.h"
-
-
-
-
-/* From Seth Alves,  <alves@hungry.com>   */
-struct icaldurationtype icaldurationtype_from_int(int t)
-{
-    struct icaldurationtype dur;
-    int used = 0;
-
-    dur = icaldurationtype_null_duration();
-
-    if(t < 0){
-	dur.is_neg = 1;
-	t = -t;
-    }
-
-    if (t % (60 * 60 * 24 * 7) == 0) {
-	dur.weeks = t / (60 * 60 * 24 * 7);
-    } else {
-	used += dur.weeks * (60 * 60 * 24 * 7);
-	dur.days = (t - used) / (60 * 60 * 24);
-	used += dur.days * (60 * 60 * 24);
-	dur.hours = (t - used) / (60 * 60);
-	used += dur.hours * (60 * 60);
-	dur.minutes = (t - used) / (60);
-	used += dur.minutes * (60);
-	dur.seconds = (t - used);
-    }
- 
-    return dur;
-}
-
-struct icaldurationtype icaldurationtype_from_string(const char* str)
-{
-
-    int i;
-    int begin_flag = 0;
-    int time_flag = 0;
-    int date_flag = 0;
-    int week_flag = 0;
-    int digits=-1;
-    int scan_size = -1;
-    int size = strlen(str);
-    char p;
-    struct icaldurationtype d;
-
-    memset(&d, 0, sizeof(struct icaldurationtype));
-
-    for(i=0;i != size;i++){
-	p = str[i];
-	
-	switch(p) 
-	    {
-	    case '-': {
-		if(i != 0 || begin_flag == 1) goto error;
-
-		d.is_neg = 1;
-		break;
-	    }
-
-	    case 'P': {
-		if (i != 0 && i !=1 ) goto error;
-		begin_flag = 1;
-		break;
-	    }
-
-	    case 'T': {
-		time_flag = 1;
-		break;
-	    }
-
-	    case '0':
-	    case '1':
-	    case '2':
-	    case '3':
-	    case '4':
-	    case '5':
-	    case '6':
-	    case '7':
-	    case '8':
-	    case '9':
-		{ 
-		    
-		    /* HACK. Skip any more digits if the l;ast one
-                       read has not been assigned */
-		    if(digits != -1){
-			break;
-		    }
-
-		    if (begin_flag == 0) goto error;
-		    /* Get all of the digits, not one at a time */
-		    scan_size = sscanf(&str[i],"%d",&digits);
-		    if(scan_size == 0) goto error;
-		    break;
-		}
-
-	    case 'H': {	
-		if (time_flag == 0||week_flag == 1||d.hours !=0||digits ==-1) 
-		    goto error;
-		d.hours = digits; digits = -1;
-		break;
-	    }
-	    case 'M': {
-		if (time_flag == 0||week_flag==1||d.minutes != 0||digits ==-1) 
-		    goto error;
-		d.minutes = digits; digits = -1;	    
-		break;
-	    }
-	    case 'S': {
-		if (time_flag == 0||week_flag==1||d.seconds!=0||digits ==-1) 
-		    goto error;
-		d.seconds = digits; digits = -1;	    
-		break;
-	    }
-	    case 'W': {
-		if (time_flag==1||date_flag==1||d.weeks!=0||digits ==-1) 
-		    goto error;
-		week_flag = 1;	
-		d.weeks = digits; digits = -1;	    
-		break;
-	    }
-	    case 'D': {
-		if (time_flag==1||week_flag==1||d.days!=0||digits ==-1) 
-		    goto error;
-		date_flag = 1;
-		d.days = digits; digits = -1;	    
-		break;
-	    }
-	    default: {
-		goto error;
-	    }
-
-	    }
-    }
-
-    return d;
-	
-
- error:
-    icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-    return icaldurationtype_bad_duration();
-}
-
-#define TMP_BUF_SIZE 1024
-static
-void append_duration_segment(char** buf, char** buf_ptr, size_t* buf_size, 
-			     char* sep, unsigned int value) {
-
-    char temp[TMP_BUF_SIZE];
-
-    sprintf(temp,"%d",value);
-
-    icalmemory_append_string(buf, buf_ptr, buf_size, temp);
-    icalmemory_append_string(buf, buf_ptr, buf_size, sep);
-    
-}
-
-char* icaldurationtype_as_ical_string(struct icaldurationtype d) 
-{
-
-    char *buf, *output_line;
-    size_t buf_size = 256;
-    char* buf_ptr = 0;
-    int seconds;
-
-    buf = (char*)icalmemory_new_buffer(buf_size);
-    buf_ptr = buf;
-    
-
-    seconds = icaldurationtype_as_int(d);
-
-    if(seconds !=0){
-	
-	if(d.is_neg == 1){
-	    icalmemory_append_char(&buf, &buf_ptr, &buf_size, '-'); 
-	}
-
-	icalmemory_append_char(&buf, &buf_ptr, &buf_size, 'P');
-    
-	if (d.weeks != 0 ) {
-	    append_duration_segment(&buf, &buf_ptr, &buf_size, "W", d.weeks);
-	}
-	
-	if (d.days != 0 ) {
-	    append_duration_segment(&buf, &buf_ptr, &buf_size, "D", d.days);
-	}
-	
-	if (d.hours != 0 || d.minutes != 0 || d.seconds != 0) {
-	    
-	    icalmemory_append_string(&buf, &buf_ptr, &buf_size, "T");
-	    
-	    if (d.hours != 0 ) {
-		append_duration_segment(&buf, &buf_ptr, &buf_size, "H", d.hours);
-	    }
-	    if (d.minutes != 0 ) {
-		append_duration_segment(&buf, &buf_ptr, &buf_size, "M", 
-					d.minutes);
-	    }
-	    if (d.seconds != 0 ) {
-		append_duration_segment(&buf, &buf_ptr, &buf_size, "S", 
-					d.seconds);
-	    }
-	    
-	}
-    } else {
-	icalmemory_append_string(&buf, &buf_ptr, &buf_size, "PT0S");
-    }
- 
-    output_line = icalmemory_tmp_copy(buf);
-    icalmemory_free_buffer(buf);
-
-    return output_line;
-    
-}
-
-
-/* From Russel Steinthal */
-int icaldurationtype_as_int(struct icaldurationtype dur)
-{
-    return (int)( (dur.seconds +
-		   (60 * dur.minutes) +
-		   (60 * 60 * dur.hours) +
-		   (60 * 60 * 24 * dur.days) +
-		   (60 * 60 * 24 * 7 * dur.weeks))
-		  * (dur.is_neg==1? -1 : 1) ) ;
-} 
-
-struct icaldurationtype icaldurationtype_null_duration(void)
-{
-    struct icaldurationtype d;
-    
-    memset(&d,0,sizeof(struct icaldurationtype));
-    
-    return d;
-}
-
-int icaldurationtype_is_null_duration(struct icaldurationtype d)
-{
-    if(icaldurationtype_as_int(d) == 0){
-	return 1;
-    } else {
-	return 0;
-    }
-}
-
-/* in icalvalue_new_from_string_with_error, we should not call
-   icaldurationtype_is_null_duration() to see if there is an error
-   condition. Null duration is perfectly valid for an alarm.
-   We cannot depend on the caller to check icalerrno either,
-   following the philosophy of unix errno. we set the is_neg
-   to -1 to indicate that this is a bad duration.
-*/
-struct icaldurationtype icaldurationtype_bad_duration()
-{
-    struct icaldurationtype d;
-    memset(&d,0,sizeof(struct icaldurationtype));
-    d.is_neg = -1;
-    return d;
-}
-
-int icaldurationtype_is_bad_duration(struct icaldurationtype d)
-{
-    return (d.is_neg == -1);
-}
-
-
-struct icaltimetype  icaltime_add(struct icaltimetype t,
-				  struct icaldurationtype  d)
-{
-    int dt = icaldurationtype_as_int(d);
-    
-    t.second += dt;
-    
-    t = icaltime_normalize(t);
-    
-    return t;
-}
-
-struct icaldurationtype  icaltime_subtract(struct icaltimetype t1,
-					   struct icaltimetype t2)
-{
-
-    time_t t1t = icaltime_as_timet(t1);
-    time_t t2t = icaltime_as_timet(t2);
-
-    return icaldurationtype_from_int((int)(t1t-t2t));
-
-
-}
-
diff --git a/libical/src/libical/icalduration.h b/libical/src/libical/icalduration.h
deleted file mode 100644
index 0e64cad9cd..0000000000
--- a/libical/src/libical/icalduration.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalduration.h
- CREATOR: eric 26 Jan 2001
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
-======================================================================*/
-
-#ifndef ICALDURATION_H
-#define ICALDURATION_H
-
-#include "icaltime.h"
-
-struct icaldurationtype
-{
-	int is_neg;
-	unsigned int days;
-	unsigned int weeks;
-	unsigned int hours;
-	unsigned int minutes;
-	unsigned int seconds;
-};
-
-struct icaldurationtype icaldurationtype_from_int(int t);
-struct icaldurationtype icaldurationtype_from_string(const char*);
-int icaldurationtype_as_int(struct icaldurationtype duration);
-char* icaldurationtype_as_ical_string(struct icaldurationtype d);
-struct icaldurationtype icaldurationtype_null_duration(void);
-struct icaldurationtype icaldurationtype_bad_duration(void);
-int icaldurationtype_is_null_duration(struct icaldurationtype d);
-int icaldurationtype_is_bad_duration(struct icaldurationtype d);
-
-struct icaltimetype  icaltime_add(struct icaltimetype t,
-				  struct icaldurationtype  d);
-
-struct icaldurationtype  icaltime_subtract(struct icaltimetype t1,
-					   struct icaltimetype t2);
-
-#endif /* !ICALDURATION_H */
-
-
-
diff --git a/libical/src/libical/icalenums.c b/libical/src/libical/icalenums.c
deleted file mode 100644
index 66c5ccd0cf..0000000000
--- a/libical/src/libical/icalenums.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
-  FILE: icalenum.c
-  CREATOR: eric 29 April 1999
-  
-  $Id$
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalenum.c
-
-  ======================================================================*/
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "icalenums.h"
-
-#include <stdio.h> /* For fprintf */
-#include <stdio.h> /* For stderr */
-#include <string.h> /* For strncmp */
-#include <assert.h>
-#include "icalmemory.h"
-
-/*** @brief Allowed request status values
- */
-static struct {
-	 enum icalrequeststatus kind;
-	int major;
-	int minor;
-	const char* str;
-} request_status_map[] = {
-    {ICAL_2_0_SUCCESS_STATUS, 2,0,"Success."},
-    {ICAL_2_1_FALLBACK_STATUS, 2,1,"Success but fallback taken  on one or more property  values."},
-    {ICAL_2_2_IGPROP_STATUS, 2,2,"Success, invalid property ignored."},
-    {ICAL_2_3_IGPARAM_STATUS, 2,3,"Success, invalid property parameter ignored."},
-    {ICAL_2_4_IGXPROP_STATUS, 2,4,"Success, unknown non-standard property ignored."},
-    {ICAL_2_5_IGXPARAM_STATUS, 2,5,"Success, unknown non standard property value  ignored."},
-    {ICAL_2_6_IGCOMP_STATUS, 2,6,"Success, invalid calendar component ignored."},
-    {ICAL_2_7_FORWARD_STATUS, 2,7,"Success, request forwarded to Calendar User."},
-    {ICAL_2_8_ONEEVENT_STATUS, 2,8,"Success, repeating event ignored. Scheduled as a  single component."},
-    {ICAL_2_9_TRUNC_STATUS, 2,9,"Success, truncated end date time to date boundary."},
-    {ICAL_2_10_ONETODO_STATUS, 2,10,"Success, repeating VTODO ignored. Scheduled as a  single VTODO."},
-    {ICAL_2_11_TRUNCRRULE_STATUS, 2,11,"Success, unbounded RRULE clipped at some finite  number of instances  "},
-    {ICAL_3_0_INVPROPNAME_STATUS, 3,0,"Invalid property name."},
-    {ICAL_3_1_INVPROPVAL_STATUS, 3,1,"Invalid property value."},
-    {ICAL_3_2_INVPARAM_STATUS, 3,2,"Invalid property parameter."},
-    {ICAL_3_3_INVPARAMVAL_STATUS, 3,3,"Invalid property parameter  value."},
-    {ICAL_3_4_INVCOMP_STATUS, 3,4,"Invalid calendar component."},
-    {ICAL_3_5_INVTIME_STATUS, 3,5,"Invalid date or time."},
-    {ICAL_3_6_INVRULE_STATUS, 3,6,"Invalid rule."},
-    {ICAL_3_7_INVCU_STATUS, 3,7,"Invalid Calendar User."},
-    {ICAL_3_8_NOAUTH_STATUS, 3,8,"No authority."},
-    {ICAL_3_9_BADVERSION_STATUS, 3,9,"Unsupported version."},
-    {ICAL_3_10_TOOBIG_STATUS, 3,10,"Request entity too large."},
-    {ICAL_3_11_MISSREQCOMP_STATUS, 3,11,"Required component or property missing."},
-    {ICAL_3_12_UNKCOMP_STATUS, 3,12,"Unknown component or property found."},
-    {ICAL_3_13_BADCOMP_STATUS, 3,13,"Unsupported component or property found"},
-    {ICAL_3_14_NOCAP_STATUS, 3,14,"Unsupported capability."},
-    {ICAL_3_15_INVCOMMAND, 3,15,"Invalid command."},
-    {ICAL_4_0_BUSY_STATUS, 4,0,"Event conflict. Date/time  is busy."},
-    {ICAL_4_1_STORE_ACCESS_DENIED, 4,1,"Store Access Denied."},
-    {ICAL_4_2_STORE_FAILED, 4,2,"Store Failed."},
-    {ICAL_4_3_STORE_NOT_FOUND, 4,3,"Store not found."},
-    {ICAL_5_0_MAYBE_STATUS, 5,0,"Request MAY supported."},
-    {ICAL_5_1_UNAVAIL_STATUS, 5,1,"Service unavailable."},
-    {ICAL_5_2_NOSERVICE_STATUS, 5,2,"Invalid calendar service."},
-    {ICAL_5_3_NOSCHED_STATUS, 5,3,"No scheduling support for  user."},
-    {ICAL_6_1_CONTAINER_NOT_FOUND, 6,1,"Container not found."},
-    {ICAL_9_0_UNRECOGNIZED_COMMAND, 9,0,"An unrecognized command was received."},
-    {ICAL_UNKNOWN_STATUS, 0,0,"Error: Unknown request status"}
-};
-
-
-/*** @brief Return the descriptive text for a request status
- */
-const char* icalenum_reqstat_desc(icalrequeststatus stat)
-{
-    int i;
-
-    for (i=0; request_status_map[i].kind  != ICAL_UNKNOWN_STATUS; i++) {
-	if ( request_status_map[i].kind ==  stat) {
-	    return request_status_map[i].str;
-	}
-    }
-
-    return 0;
-}
-
-/*** @brief Return the code for a request status
- */
-char* icalenum_reqstat_code(icalrequeststatus stat)
-{
-    int i, major, minor;
-    char tmpbuf[36];
-
-    for (i=0; request_status_map[i].kind  != ICAL_UNKNOWN_STATUS; i++) {
-	if ( request_status_map[i].kind ==  stat) {
-	    major = request_status_map[i].major;
-	    minor = request_status_map[i].minor;
-	    sprintf(tmpbuf, "%i.%i", major, minor);
-	    return icalmemory_tmp_copy(tmpbuf);
-	}
-    }
-    return NULL;
-}
-
-/*** @brief Return the major number for a request status
- */
-short icalenum_reqstat_major(icalrequeststatus stat)
-{
-    int i;
-
-    for (i=0; request_status_map[i].kind  != ICAL_UNKNOWN_STATUS; i++) {
-	if ( request_status_map[i].kind ==  stat) {
-	    return request_status_map[i].major;
-	}
-    }
-    return -1;
-}
-
-/*** @brief Return the minor number for a request status
- */
-short icalenum_reqstat_minor(icalrequeststatus stat)
-{
-    int i;
-
-    for (i=0; request_status_map[i].kind  != ICAL_UNKNOWN_STATUS; i++) {
-	if ( request_status_map[i].kind ==  stat) {
-	    return request_status_map[i].minor;
-	}
-    }
-    return -1;
-}
-
-
-/*** @brief Return a request status for major/minor status numbers
- */
-icalrequeststatus icalenum_num_to_reqstat(short major, short minor)
-{
-    int i;
-
-    for (i=0; request_status_map[i].kind  != ICAL_UNKNOWN_STATUS; i++) {
-	if ( request_status_map[i].major ==  major && request_status_map[i].minor ==  minor) {
-	    return request_status_map[i].kind;
-	}
-    }
-    return 0;
-}
-
-
-
diff --git a/libical/src/libical/icalenums.h b/libical/src/libical/icalenums.h
deleted file mode 100644
index dde5e5afb6..0000000000
--- a/libical/src/libical/icalenums.h
+++ /dev/null
@@ -1,166 +0,0 @@
-
-/* -*- Mode: C -*-*/
-/*======================================================================
- FILE: icalenums.h
-
- 
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalenums.h
-
-  Contributions from:
-     Graham Davison (g.m.davison@computer.org)
-
-======================================================================*/
-
-#ifndef ICALENUMS_H
-#define ICALENUMS_H
-
-
-
-/***********************************************************************
- * Component enumerations
-**********************************************************************/
-
-typedef enum icalcomponent_kind {
-    ICAL_NO_COMPONENT,
-    ICAL_ANY_COMPONENT,	/* Used to select all components*/
-    ICAL_XROOT_COMPONENT,
-    ICAL_XATTACH_COMPONENT, /* MIME attached data, returned by parser. */
-    ICAL_VEVENT_COMPONENT,
-    ICAL_VTODO_COMPONENT,
-    ICAL_VJOURNAL_COMPONENT,
-    ICAL_VCALENDAR_COMPONENT,
-    ICAL_VAGENDA_COMPONENT,
-    ICAL_VFREEBUSY_COMPONENT,
-    ICAL_VALARM_COMPONENT,
-    ICAL_XAUDIOALARM_COMPONENT,  
-    ICAL_XDISPLAYALARM_COMPONENT,
-    ICAL_XEMAILALARM_COMPONENT,
-    ICAL_XPROCEDUREALARM_COMPONENT,
-    ICAL_VTIMEZONE_COMPONENT,
-    ICAL_XSTANDARD_COMPONENT,
-    ICAL_XDAYLIGHT_COMPONENT,
-    ICAL_X_COMPONENT,
-    ICAL_VSCHEDULE_COMPONENT,
-    ICAL_VQUERY_COMPONENT,
-    ICAL_VREPLY_COMPONENT,
-    ICAL_VCAR_COMPONENT,
-    ICAL_VCOMMAND_COMPONENT,
-    ICAL_XLICINVALID_COMPONENT,
-    ICAL_XLICMIMEPART_COMPONENT /* a non-stardard component that mirrors
-				structure of MIME data */
-
-} icalcomponent_kind;
-
-
-
-/***********************************************************************
- * Request Status codes
- **********************************************************************/
-
-typedef enum icalrequeststatus {
-    ICAL_UNKNOWN_STATUS,
-    ICAL_2_0_SUCCESS_STATUS,
-    ICAL_2_1_FALLBACK_STATUS,
-    ICAL_2_2_IGPROP_STATUS,
-    ICAL_2_3_IGPARAM_STATUS,
-    ICAL_2_4_IGXPROP_STATUS,
-    ICAL_2_5_IGXPARAM_STATUS,
-    ICAL_2_6_IGCOMP_STATUS,
-    ICAL_2_7_FORWARD_STATUS,
-    ICAL_2_8_ONEEVENT_STATUS,
-    ICAL_2_9_TRUNC_STATUS,
-    ICAL_2_10_ONETODO_STATUS,
-    ICAL_2_11_TRUNCRRULE_STATUS,
-    ICAL_3_0_INVPROPNAME_STATUS,
-    ICAL_3_1_INVPROPVAL_STATUS,
-    ICAL_3_2_INVPARAM_STATUS,
-    ICAL_3_3_INVPARAMVAL_STATUS,
-    ICAL_3_4_INVCOMP_STATUS,
-    ICAL_3_5_INVTIME_STATUS,
-    ICAL_3_6_INVRULE_STATUS,
-    ICAL_3_7_INVCU_STATUS,
-    ICAL_3_8_NOAUTH_STATUS,
-    ICAL_3_9_BADVERSION_STATUS,
-    ICAL_3_10_TOOBIG_STATUS,
-    ICAL_3_11_MISSREQCOMP_STATUS,
-    ICAL_3_12_UNKCOMP_STATUS,
-    ICAL_3_13_BADCOMP_STATUS,
-    ICAL_3_14_NOCAP_STATUS,
-    ICAL_3_15_INVCOMMAND,
-    ICAL_4_0_BUSY_STATUS,
-    ICAL_4_1_STORE_ACCESS_DENIED,
-    ICAL_4_2_STORE_FAILED,
-    ICAL_4_3_STORE_NOT_FOUND,
-    ICAL_5_0_MAYBE_STATUS,
-    ICAL_5_1_UNAVAIL_STATUS,
-    ICAL_5_2_NOSERVICE_STATUS,
-    ICAL_5_3_NOSCHED_STATUS,
-    ICAL_6_1_CONTAINER_NOT_FOUND,
-	ICAL_9_0_UNRECOGNIZED_COMMAND
-} icalrequeststatus;
-
-
-const char* icalenum_reqstat_desc(icalrequeststatus stat);
-short icalenum_reqstat_major(icalrequeststatus stat);
-short icalenum_reqstat_minor(icalrequeststatus stat);
-icalrequeststatus icalenum_num_to_reqstat(short major, short minor);
-char* icalenum_reqstat_code(icalrequeststatus stat);
-
-/***********************************************************************
- * Conversion functions
-**********************************************************************/
-
-
-/* Thse routines used to be in icalenums.c, but were moved into the
-   icalproperty, icalparameter, icalvalue, or icalcomponent modules. */
-
-/* const char* icalproperty_kind_to_string(icalproperty_kind kind);*/
-#define icalenum_property_kind_to_string(x) icalproperty_kind_to_string(x)
-
-/*icalproperty_kind icalproperty_string_to_kind(const char* string)*/
-#define icalenum_string_to_property_kind(x) icalproperty_string_to_kind(x)
-
-/*icalvalue_kind icalproperty_kind_to_value_kind(icalproperty_kind kind);*/
-#define icalenum_property_kind_to_value_kind(x) icalproperty_kind_to_value_kind(x)
-
-/*const char* icalenum_method_to_string(icalproperty_method);*/
-#define icalenum_method_to_string(x) icalproperty_method_to_string(x)
-
-/*icalproperty_method icalenum_string_to_method(const char* string);*/
-#define icalenum_string_to_method(x) icalproperty_string_to_method(x)
-
-/*const char* icalenum_status_to_string(icalproperty_status);*/
-#define icalenum_status_to_string(x) icalproperty_status_to_string(x)
-
-/*icalproperty_status icalenum_string_to_status(const char* string);*/
-#define icalenum_string_to_status(x) icalproperty_string_to_status(x)
-
-/*icalvalue_kind icalenum_string_to_value_kind(const char* str);*/
-#define icalenum_string_to_value_kind(x) icalvalue_string_to_kind(x)
-
-/*const char* icalenum_value_kind_to_string(icalvalue_kind kind);*/
-#define icalenum_value_kind_to_string(x) icalvalue_kind_to_string(x)
-
-/*const char* icalenum_component_kind_to_string(icalcomponent_kind kind);*/
-#define icalenum_component_kind_to_string(x) icalcomponent_kind_to_string(x)
-
-/*icalcomponent_kind icalenum_string_to_component_kind(const char* string);*/
-#define icalenum_string_to_component_kind(x) icalcomponent_string_to_kind(x)
-
-
-#endif /* !ICALENUMS_H */
-
diff --git a/libical/src/libical/icalerror.c b/libical/src/libical/icalerror.c
deleted file mode 100644
index 61043b2fce..0000000000
--- a/libical/src/libical/icalerror.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalerror.c
-  CREATOR: eric 16 May 1999
-  
-  $Id$
-  $Locker$
-    
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalerror.c
-
- ======================================================================*/
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdlib.h>		/* for malloc() */
-#include <string.h>		/* for strcmp */
-#include "icalerror.h"
-
-#ifdef HAVE_PTHREAD
-#include <pthread.h>
-
-static pthread_key_t  icalerrno_key;
-static pthread_once_t icalerrno_key_once = PTHREAD_ONCE_INIT;
-
-static void icalerrno_destroy(void* buf) {
-  free(buf);
-  pthread_setspecific(icalerrno_key, NULL);
-}
-
-static void icalerrno_key_alloc(void) {
-  pthread_key_create(&icalerrno_key, icalerrno_destroy);
-}
-
-icalerrorenum *icalerrno_return(void) {
-  icalerrorenum *_errno;
-
-  pthread_once(&icalerrno_key_once, icalerrno_key_alloc);
-  
-  _errno = (icalerrorenum*) pthread_getspecific(icalerrno_key);
-
-  if (!_errno) {
-    _errno = malloc(sizeof(icalerrorenum));
-    *_errno = ICAL_NO_ERROR;
-    pthread_setspecific(icalerrno_key, _errno);
-  }
-  return _errno;
-}
-
-#else
-
-static icalerrorenum icalerrno_storage = ICAL_NO_ERROR;
-
-icalerrorenum *icalerrno_return(void) {
-   return &icalerrno_storage;
-}
-
-#endif
-
-
-static int foo;
-
-void icalerror_stop_here(void)
-{
-    foo++; /* Keep optimizers from removing routine */
-}
-
-void icalerror_crash_here(void)
-{
-    int *p=0;
-    *p = 1;
-
-    assert( *p);
-}
-
-#ifdef ICAL_SETERROR_ISFUNC
-void icalerror_set_errno(icalerrorenum x) 
-{
-    icalerrno = x; 
-    if(icalerror_get_error_state(x)==ICAL_ERROR_FATAL || 
-       (icalerror_get_error_state(x)==ICAL_ERROR_DEFAULT && 
-        icalerror_errors_are_fatal == 1 )){ 
-        icalerror_warn(icalerror_strerror(x)); 
-        assert(0); 
-    } 
-
-}
-#endif 
-
-void icalerror_clear_errno() {
-    
-    icalerrno = ICAL_NO_ERROR;
-}
-
-#ifdef ICAL_ERRORS_ARE_FATAL
-int icalerror_errors_are_fatal = 1;
-#else
-int icalerror_errors_are_fatal = 0;
-#endif
-
-struct icalerror_state {
-    icalerrorenum error;
-    icalerrorstate state; 
-};
-
-static struct icalerror_state error_state_map[] = 
-{ 
-    { ICAL_BADARG_ERROR,ICAL_ERROR_DEFAULT},
-    { ICAL_NEWFAILED_ERROR,ICAL_ERROR_DEFAULT},
-    { ICAL_ALLOCATION_ERROR,ICAL_ERROR_DEFAULT},
-    { ICAL_MALFORMEDDATA_ERROR,ICAL_ERROR_DEFAULT}, 
-    { ICAL_PARSE_ERROR,ICAL_ERROR_DEFAULT},
-    { ICAL_INTERNAL_ERROR,ICAL_ERROR_DEFAULT}, 
-    { ICAL_FILE_ERROR,ICAL_ERROR_DEFAULT},
-    { ICAL_USAGE_ERROR,ICAL_ERROR_DEFAULT},
-    { ICAL_UNIMPLEMENTED_ERROR,ICAL_ERROR_DEFAULT},
-    { ICAL_UNKNOWN_ERROR,ICAL_ERROR_DEFAULT},
-    { ICAL_NO_ERROR,ICAL_ERROR_DEFAULT}
-
-};
-
-struct icalerror_string_map {
-    const char* str;
-    icalerrorenum error;
-    char name[160];
-};
-
-static struct icalerror_string_map string_map[] = 
-{
-    {"BADARG",ICAL_BADARG_ERROR,"BADARG: Bad argument to function"},
-    { "NEWFAILED",ICAL_NEWFAILED_ERROR,"NEWFAILED: Failed to create a new object via a *_new() routine"},
-    { "ALLOCATION",ICAL_ALLOCATION_ERROR,"ALLOCATION: Failed to allocate new memory"},
-    {"MALFORMEDDATA",ICAL_MALFORMEDDATA_ERROR,"MALFORMEDDATA: An input string was not correctly formed or a component has missing or extra properties"},
-    { "PARSE",ICAL_PARSE_ERROR,"PARSE: Failed to parse a part of an iCal component"},
-    {"INTERNAL",ICAL_INTERNAL_ERROR,"INTERNAL: Random internal error. This indicates an error in the library code, not an error in use"}, 
-    { "FILE",ICAL_FILE_ERROR,"FILE: An operation on a file failed. Check errno for more detail."},
-    { "USAGE",ICAL_USAGE_ERROR,"USAGE: Failed to propertyl sequence calls to a set of interfaces"},
-    { "UNIMPLEMENTED",ICAL_UNIMPLEMENTED_ERROR,"UNIMPLEMENTED: This feature has not been implemented"},
-    { "NO",ICAL_NO_ERROR,"NO: No error"},
-    {"UNKNOWN",ICAL_UNKNOWN_ERROR,"UNKNOWN: Unknown error type -- icalerror_strerror() was probably given bad input"}
-};
-
-
-icalerrorenum icalerror_error_from_string(const char* str){
- 
-    icalerrorenum e;
-    int i = 0;
-
-    for( i = 0; string_map[i].error != ICAL_NO_ERROR; i++){
-        if (strcmp(string_map[i].str,str) == 0){
-            e = string_map[i].error;
-        }
-    }
-
-    return e;
-}
-
-icalerrorstate icalerror_supress(const char* error){
-
-    icalerrorenum e = icalerror_error_from_string(error);
-    icalerrorstate es;
-
-     if (e == ICAL_NO_ERROR){
-        return ICAL_ERROR_UNKNOWN;
-    }
-
-
-    es = icalerror_get_error_state(e);
-    icalerror_set_error_state(e,ICAL_ERROR_NONFATAL);
-
-    return es;
-}
-
-char* icalerror_perror()
-{
-    return icalerror_strerror(icalerrno);
-}
-
-void icalerror_restore(const char* error, icalerrorstate es){
-
-
-    icalerrorenum e = icalerror_error_from_string(error);
-
-    if (e != ICAL_NO_ERROR){
-        icalerror_set_error_state(e,es);
-    }
-
-}
-
-
-
-void icalerror_set_error_state( icalerrorenum error, 
-				icalerrorstate state)
-{
-    int i;
-
-    for(i = 0; error_state_map[i].error!= ICAL_NO_ERROR;i++){
-	if(error_state_map[i].error == error){
-	    error_state_map[i].state = state; 	
-	}
-    }
-}
-
-icalerrorstate icalerror_get_error_state( icalerrorenum error)
-{
-    int i;
-
-    for(i = 0; error_state_map[i].error!= ICAL_NO_ERROR;i++){
-	if(error_state_map[i].error == error){
-	    return error_state_map[i].state; 	
-	}
-    }
-
-    return ICAL_ERROR_UNKNOWN;	
-}
-
-
-
-
-char* icalerror_strerror(icalerrorenum e) {
-
-    int i;
-
-    for (i=0; string_map[i].error != ICAL_UNKNOWN_ERROR; i++) {
-	if (string_map[i].error == e) {
-	    return string_map[i].name;
-	}
-    }
-
-    return string_map[i].name; /* Return string for ICAL_UNKNOWN_ERROR*/
-    
-}
-
-
-
diff --git a/libical/src/libical/icalerror.h b/libical/src/libical/icalerror.h
deleted file mode 100644
index 7826041855..0000000000
--- a/libical/src/libical/icalerror.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
-  FILE: icalerror.h
-  CREATOR: eric 09 May 1999
-  
-  $Id$
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalerror.h
-
-======================================================================*/
-
-
-#ifndef ICALERROR_H
-#define ICALERROR_H
-
-#include <assert.h>
-#include <stdio.h> /* For icalerror_warn() */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#define ICAL_SETERROR_ISFUNC
-
-
-/** This routine is called before any error is triggered. It is called
-   by icalerror_set_errno, so it does not appear in all of the macros
-   below */
-void icalerror_stop_here(void);
-
-void icalerror_crash_here(void);
-
-typedef enum icalerrorenum {
-    ICAL_NO_ERROR,     /* icalerrno may not be initialized - put it first so and pray that the compiler initialize things to zero */    
-    ICAL_BADARG_ERROR,
-    ICAL_NEWFAILED_ERROR,
-    ICAL_ALLOCATION_ERROR,
-    ICAL_MALFORMEDDATA_ERROR, 
-    ICAL_PARSE_ERROR,
-    ICAL_INTERNAL_ERROR, /* Like assert --internal consist. prob */
-    ICAL_FILE_ERROR,
-    ICAL_USAGE_ERROR,
-    ICAL_UNIMPLEMENTED_ERROR,
-    ICAL_UNKNOWN_ERROR  /* Used for problems in input to icalerror_strerror()*/
-
-} icalerrorenum;
-
-icalerrorenum * icalerrno_return(void);
-#define icalerrno (*(icalerrno_return()))
-
-/** If true, libicl aborts after a call to icalerror_set_error
- *
- *  @warning NOT THREAD SAFE -- recommended that you do not change
- *           this in a multithreaded program.
- */
-extern int icalerror_errors_are_fatal;
-
-/* Warning messages */
-
-#ifdef __GNUC__ca
-#define icalerror_warn(message) {fprintf(stderr,"%s(), %s:%d: %s\n",__FUNCTION__,__FILE__,__LINE__,message);}
-#else /* __GNU_C__ */
-#define icalerror_warn(message) {fprintf(stderr,"%s:%d: %s\n",__FILE__,__LINE__,message);}
-#endif /* __GNU_C__ */
-
-
-void icalerror_clear_errno(void);
-void _icalerror_set_errno(icalerrorenum);
-
-/* Make an individual error fatal or non-fatal. */
-typedef enum icalerrorstate { 
-    ICAL_ERROR_FATAL,     /* Not fata */
-    ICAL_ERROR_NONFATAL,  /* Fatal */
-    ICAL_ERROR_DEFAULT,   /* Use the value of icalerror_errors_are_fatal*/
-    ICAL_ERROR_UNKNOWN    /* Asked state for an unknown error type */
-} icalerrorstate ;
-
-char* icalerror_strerror(icalerrorenum e);
-char* icalerror_perror();
-void icalerror_set_error_state( icalerrorenum error, icalerrorstate);
-icalerrorstate icalerror_get_error_state( icalerrorenum error);
-
-#ifndef ICAL_SETERROR_ISFUNC
-#define icalerror_set_errno(x) \
-icalerrno = x; \
-if(icalerror_get_error_state(x)==ICAL_ERROR_FATAL || \
-   (icalerror_get_error_state(x)==ICAL_ERROR_DEFAULT && \
-    icalerror_errors_are_fatal == 1 )){ \
-   icalerror_warn(icalerror_strerror(x)); \
-   assert(0); \
-} 
-#else
-void icalerror_set_errno(icalerrorenum x); 
-#endif
-
-#ifdef ICAL_ERRORS_ARE_FATAL
-#undef NDEBUG
-#endif
-
-#define icalerror_check_value_type(value,type);
-#define icalerror_check_property_type(value,type);
-#define icalerror_check_parameter_type(value,type);
-#define icalerror_check_component_type(value,type);
-
-/* Assert with a message */
-#ifdef ICAL_ERRORS_ARE_FATAL
-
-#ifdef __GNUC__
-#define icalerror_assert(test,message) if(!(test)){fprintf(stderr,"%s(), %s:%d: %s\n",__FUNCTION__,__FILE__,__LINE__,message);icalerror_stop_here(); abort();}
-#else /*__GNUC__*/
-#define icalerror_assert(test,message) if(!(test)){fprintf(stderr,"%s:%d: %s\n",__FILE__,__LINE__,message);icalerror_stop_here(); abort();}
-#endif /*__GNUC__*/
-
-#else /* ICAL_ERRORS_ARE_FATAL */
-#define icalerror_assert(test,message) 
-#endif /* ICAL_ERRORS_ARE_FATAL */
-
-/* Check & abort if check fails */
-#define icalerror_check_arg(test,arg) if(!(test)) { icalerror_set_errno(ICAL_BADARG_ERROR); }
-
-/* Check & return void if check fails*/
-#define icalerror_check_arg_rv(test,arg) if(!(test)) {icalerror_set_errno(ICAL_BADARG_ERROR); return; }
-
-/* Check & return 0 if check fails*/
-#define icalerror_check_arg_rz(test,arg) if(!(test)) { icalerror_set_errno(ICAL_BADARG_ERROR); return 0;}
-
-/* Check & return an error if check fails*/
-#define icalerror_check_arg_re(test,arg,error) if(!(test)) { icalerror_stop_here(); assert(0); return error;}
-
-/* Check & return something*/
-#define icalerror_check_arg_rx(test,arg,x) if(!(test)) { icalerror_set_errno(ICAL_BADARG_ERROR); return x;}
-
-
-
-/* String interfaces to set an error to NONFATAL and restore it to its
-   original value */
-
-icalerrorstate icalerror_supress(const char* error);
-void icalerror_restore(const char* error, icalerrorstate es);
-
-
-#endif /* !ICALERROR_H */
-
-
-
diff --git a/libical/src/libical/icallangbind.c b/libical/src/libical/icallangbind.c
deleted file mode 100644
index 1a3ad48a31..0000000000
--- a/libical/src/libical/icallangbind.c
+++ /dev/null
@@ -1,312 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icallangbind.c
-  CREATOR: eric 15 dec 2000
-  
-  DESCRIPTION:
-  
-  $Id$
-  $Locker$
-
-  (C) COPYRIGHT 1999 Eric Busboom 
-  http://www.softwarestudio.org
-  
-  This package is free software and is provided "as is" without
-  express or implied warranty.  It may be used, redistributed and/or
-  modified under the same terms as perl itself. ( Either the Artistic
-  License or the GPL. )
-
-  ======================================================================*/
-
-#include "icalcomponent.h"
-#include "icalproperty.h"
-#include "icalerror.h"
-#include "icalmemory.h"
-#include "icalvalue.h"
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef WIN32
-#define snprintf      _snprintf
-#define strcasecmp    stricmp
-#endif
-
-int* icallangbind_new_array(int size){
-    int* p = (int*)malloc(size*sizeof(int));
-    return p; /* Caller handles failures */
-}
-
-void icallangbind_free_array(int* array){
-    free(array);
-}
-
-int icallangbind_access_array(int* array, int index) {
-    return array[index];
-}                    
-
-/** Iterators to fetch parameters given property */
-
-icalparameter* icallangbind_get_first_parameter(icalproperty *prop)
-
-{
-    icalparameter_kind kind = ICAL_ANY_PARAMETER;
-    
-    return icalproperty_get_first_parameter(prop,kind);
-}
-
-icalparameter* icallangbind_get_next_parameter(icalproperty *prop)
-{
-    icalparameter_kind kind = ICAL_ANY_PARAMETER;
-    
-    return icalproperty_get_next_parameter(prop,kind);
-}
-		                                              
-
-/** Like icalcomponent_get_first_component(), but takes a string for the
-   kind and can iterate over X properties as if each X name was a
-   seperate kind */
-
-icalproperty* icallangbind_get_first_property(icalcomponent *c,
-                                              const char* prop)
-{
-    icalproperty_kind kind = icalproperty_string_to_kind(prop);
-    icalproperty *p;
-
-    if (kind == ICAL_NO_PROPERTY){
-	return 0;
-    }
-
-    if(kind == ICAL_X_PROPERTY){
-        for(p = icalcomponent_get_first_property(c,kind);
-            p !=0;
-            p = icalcomponent_get_next_property(c,kind)){
-            
-            if(strcmp(icalproperty_get_x_name(p),prop) == 0){
-                return p;
-            }                
-        }
-    } else {
-        p=icalcomponent_get_first_property(c,kind);
-
-        return p;
-    }
-	
-    return 0;
-
-}
-
-icalproperty* icallangbind_get_next_property(icalcomponent *c,
-                                              const char* prop)
-{
-    icalproperty_kind kind = icalenum_string_to_property_kind(prop);
-    icalproperty *p;
-
-    if (kind == ICAL_NO_PROPERTY){
-	return 0;
-    }
-
-    if(kind == ICAL_X_PROPERTY){
-        for(p = icalcomponent_get_next_property(c,kind);
-            p !=0;
-            p = icalcomponent_get_next_property(c,kind)){
-            
-            if(strcmp(icalproperty_get_x_name(p),prop) == 0){
-                return p;
-            }                
-        }
-    } else {
-        p=icalcomponent_get_next_property(c,kind);
-
-        return p;
-    }
-	
-    return 0;
-
-}
-
-
-icalcomponent* icallangbind_get_first_component(icalcomponent *c,
-                                              const char* comp)
-{
-    icalcomponent_kind kind = icalenum_string_to_component_kind(comp);
-
-    if (kind == ICAL_NO_COMPONENT){
-	return 0;
-    }
-    return icalcomponent_get_first_component(c,kind);
-}
-
-icalcomponent* icallangbind_get_next_component(icalcomponent *c,
-                                              const char* comp)
-{
-    icalcomponent_kind kind = icalenum_string_to_component_kind(comp);
-
-    if (kind == ICAL_NO_COMPONENT){
-	return 0;
-    }
-    return icalcomponent_get_next_component(c,kind);
-}
-
-
-#define APPENDS(x) icalmemory_append_string(&buf, &buf_ptr, &buf_size, x);
-
-#define APPENDC(x) icalmemory_append_char(&buf, &buf_ptr, &buf_size, x);
-
-
-const char* icallangbind_property_eval_string(icalproperty* prop, char* sep)
-{
-    char tmp[25];
-    size_t buf_size = 1024;
-    char* buf = icalmemory_new_buffer(buf_size);
-    char* buf_ptr = buf;
-    icalparameter *param;
-    
-    icalvalue* value;
-
-    if( prop == 0){
-	return 0;
-    }
-
-    APPENDS("{ ");
-
-    value = icalproperty_get_value(prop);
-
-    APPENDS(" 'name' ");
-    APPENDS(sep);
-    APPENDC('\'');
-    APPENDS(icalproperty_kind_to_string(icalproperty_isa(prop)));
-    APPENDC('\'');
-
-    if(value){
-        APPENDS(", 'value_type' ");
-        APPENDS(sep);
-        APPENDC('\'');
-        APPENDS(icalvalue_kind_to_string(icalvalue_isa(value)));
-        APPENDC('\'');
-    }
-
-    APPENDS(", 'pid' ");
-    APPENDS(sep);
-    APPENDC('\'');
-    snprintf(tmp,25,"%p",prop);
-    APPENDS(tmp);
-    APPENDC('\'');
-
-
-    if(value){
-        switch (icalvalue_isa(value)){
-	
-        case ICAL_ATTACH_VALUE:
-        case ICAL_BINARY_VALUE: 
-        case ICAL_NO_VALUE: {
-            icalerror_set_errno(ICAL_INTERNAL_ERROR);
-            break;
-        }
-
-        default: 
-        {
-            const char* str = icalvalue_as_ical_string(value);
-            char* copy = (char*) malloc(strlen(str)+1);
-            
-            const char *i;
-            char *j;
-
-            if(copy ==0){
-                icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-                break; 
-            }
-            /* Remove any newlines */
-                
-            for(j=copy, i = str; *i != 0; j++,i++){
-                if(*i=='\n'){
-                    i++;
-                }   
-                *j = *i;
-            }
-                
-            *j = 0;
-                
-            APPENDS(", 'value'");
-            APPENDS(sep);
-            APPENDC('\'');
-            APPENDS(copy);
-            APPENDC('\'');
-            
-            free(copy);
-            break;
-
-        }
-        }
-    }
-
-    /* Add Parameters */
-
-    for(param = icalproperty_get_first_parameter(prop,ICAL_ANY_PARAMETER);
-        param != 0;
-        param = icalproperty_get_next_parameter(prop,ICAL_ANY_PARAMETER)){
-        
-        const char* str = icalparameter_as_ical_string(param);
-        char *copy = icalmemory_tmp_copy(str);
-        char *v;
-
-        if(copy == 0){
-            icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-            continue;
-        }
-
-        v = strchr(copy,'=');
-
-
-        if(v == 0){
-            continue;
-        }
-
-        *v = 0;
-
-        v++;
-
-        APPENDS(", ");
-        APPENDC('\'');
-        APPENDS(copy);
-        APPENDC('\'');
-        APPENDS(sep);
-        APPENDC('\'');
-        APPENDS(v);        
-        APPENDC('\'');
-        
-    }
-
-
-    APPENDC('}');
-
-    icalmemory_add_tmp_buffer(buf);
-    return buf;
-
-}
-
-#include "fcntl.h"
-int icallangbind_string_to_open_flag(const char* str)
-{
-    if (strcmp(str,"r") == 0) {return O_RDONLY;}
-    else if (strcmp(str,"r+") == 0) {return O_RDWR;}
-    else if (strcmp(str,"w") == 0) {return O_WRONLY;}
-    else if (strcmp(str,"w+") == 0) {return O_RDWR|O_CREAT;}
-    else if (strcmp(str,"a") == 0) {return O_WRONLY|O_APPEND;}
-    else return -1;
-}
-
-
-const char* icallangbind_quote_as_ical(const char* str)
-{
-    size_t buf_size = 2 * strlen(str);
-
-    /* assume every char could be quoted */
-    char* buf = icalmemory_new_buffer(buf_size);
-    int result;
-
-    result = icalvalue_encode_ical_string(str, buf, buf_size);
-
-    icalmemory_add_tmp_buffer(buf);
-
-    return buf;
-}
diff --git a/libical/src/libical/icallangbind.h b/libical/src/libical/icallangbind.h
deleted file mode 100644
index fed3626c32..0000000000
--- a/libical/src/libical/icallangbind.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icallangbind.h
-  CREATOR: eric 25 jan 2001
-  
-  DESCRIPTION:
-  
-  $Id$
-  $Locker$
-
-  (C) COPYRIGHT 1999 Eric Busboom 
-  http://www.softwarestudio.org
-  
-  This package is free software and is provided "as is" without
-  express or implied warranty.  It may be used, redistributed and/or
-  modified under the same terms as perl itself. ( Either the Artistic
-  License or the GPL. )
-
-  ======================================================================*/
-
-#ifndef __ICALLANGBIND_H__
-#define __ICALLANGBIND_H__
-
-int* icallangbind_new_array(int size);
-void icallangbind_free_array(int* array);
-int icallangbind_access_array(int* array, int index);
-icalproperty* icallangbind_get_property(icalcomponent *c, int n, const char* prop);
-const char* icallangbind_get_property_val(icalproperty* p);
-const char* icallangbind_get_parameter(icalproperty *p, const char* parameter);
-icalcomponent* icallangbind_get_component(icalcomponent *c, const char* comp);
-
-icalproperty* icallangbind_get_first_property(icalcomponent *c,
-                                              const char* prop);
-
-icalproperty* icallangbind_get_next_property(icalcomponent *c,
-                                              const char* prop);
-
-icalcomponent* icallangbind_get_first_component(icalcomponent *c,
-                                              const char* comp);
-
-icalcomponent* icallangbind_get_next_component(icalcomponent *c,
-                                              const char* comp);
-
-icalparameter* icallangbind_get_first_parameter(icalproperty *prop);
-
-icalparameter* icallangbind_get_next_parameter(icalproperty *prop);
-
-const char* icallangbind_property_eval_string(icalproperty* prop, char* sep);
-
-
-int icallangbind_string_to_open_flag(const char* str);
-
-const char* icallangbind_quote_as_ical(const char* str);
-#endif /*__ICALLANGBIND_H__*/
diff --git a/libical/src/libical/icallexer.l b/libical/src/libical/icallexer.l
deleted file mode 100644
index fe292c8b6d..0000000000
--- a/libical/src/libical/icallexer.l
+++ /dev/null
@@ -1,161 +0,0 @@
-%{
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icallexer.l
-  CREATOR: eric 10 June 1999
-  
-  DESCRIPTION:
-  
-  $Id: icallexer.l,v 1.10 2003/10/21 18:28:28 ettore Exp $
-  $Locker:  $
-
-  (C) COPYRIGHT 1999 Eric Busboom 
-  http://www.softwarestudio.org
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
- 
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and
-  limitations under the License.
-
-  The original author is Eric Busboom
-  The original code is icalitip.y
-
-
-
-  ======================================================================*/
-#include "icalparser.h"
-#include "icalenums.h"
-#include "icalmemory.h"
-#include "assert.h"
-#include "icalyacc.h"
-
-#include <string.h> /* For strdup() */
-
-int icalparser_flex_input(char* buf, int max_size);
-void icalparser_clear_flex_input(void);
-
-
-#define ICAL_MAX_STR_CONST 1024
-
-#undef YY_INPUT
-#define YY_INPUT(b,r,ms) ( r= icalparser_flex_input(b,ms))
-#undef yywrap
-
-#undef YY_FATAL_ERROR
-#define YY_FATAL_ERROR(msg) ical_yyerror(msg)
-
-icalvalue_kind value_kind=ICAL_NO_VALUE;
-void set_parser_value_state(icalvalue_kind kind);
-extern int yydebug; 
-
-void ical_yyerror(char *s);
-
-void init_str_buf(void);
-
-int last_state;
-
-char *str_buf;
-char *str_buf_p;
-size_t buf_sz; /* = ICAL_MAX_STR_CONST;*/
-
-%}
-
-crlf		\x0D?\x0A
-space		[ ]
-qsafechar	[^\x00-\x1F\"]
-safechar	[^\x00-\x1F\"\:\;\,]
-tsafechar	[\x20-\x21\x23-\x2B\x2D-\x39\x3C-\x5B\x5D-\x7E]
-valuechar	[^\x00-\x08\x10-\x1F]
-xname		X-[a-zA-Z0-9\-]+
-xname2          [a-zA-Z0-9\-\ ]
-paramtext	{safechar}+
-value		{valuechar}+
-quotedstring	\"{qsafechar}+\"
-digit		[0-9]
-
-%array /* Make yytext an array. Slow, but handy. HACK */
-
-%option caseless
-
-%s quoted_string
-%s binary_value boolean_value uri_value time_value duration_value number_value period_value recur_value text_value utcoffset_value
-%s enum_param_value string_param_value stringlist_param_value keyword line_start component seperator parameter end_of_value paramtext
-
-
-
-%%
-
-%{
-%}
-
-
-<time_value>{
-{digit}+		 { ical_yylval.v_string =icalmemory_tmp_copy(yytext) ;
-                           return DIGITS; }
-T			 { return TIME_CHAR; }
-Z			 { return UTC_CHAR; }
-[\/\+\-PWHMSD]		 { return yytext[0]; }
-{crlf}                   { return EOL;}
-
-}
-
-<utcoffset_value>{
-{crlf}                   { return EOL;}
-\-|\+			 { return yytext[0]; }
-{digit}{digit}		 { ical_yylval.v_int=atoi(yytext); return INTNUMBER; }
-
-}
-
-<enum_param_value>{
-.			 { return CHARACTER; }
-{crlf}                   { return EOL;}
-
-}
-
-<seperator>{
-,       { BEGIN(last_state); return COMMA; } 
-}
-
-
-%% 
-
-int yywrap()
-{
-     return 1;
-}
-
-
-void set_parser_value_state(icalvalue_kind kind)
-{
-
-    switch (kind){
-
-	case ICAL_UTCOFFSET_VALUE:
-	    {BEGIN(utcoffset_value);break;}
-
-	case ICAL_DATETIMEPERIOD_VALUE:
-	case ICAL_DURATION_VALUE:
-	case ICAL_PERIOD_VALUE:
-	    {BEGIN(time_value);break;}
-
-	default:
-	{
-	   assert(1==0);
-	}
-    }
-}
-
-void init_str_buf(void)
-{
-   str_buf = icalmemory_tmp_buffer(ICAL_MAX_STR_CONST);
-   str_buf_p = str_buf;
-   buf_sz = ICAL_MAX_STR_CONST;
-
-
-}
-
diff --git a/libical/src/libical/icalmemory.c b/libical/src/libical/icalmemory.c
deleted file mode 100644
index 058ef3791f..0000000000
--- a/libical/src/libical/icalmemory.c
+++ /dev/null
@@ -1,367 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalmemory.c
-  CREATOR: eric 30 June 1999
-  
-  $Id$
-  $Locker$
-    
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is icalmemory.h
-
- ======================================================================*/
-
-/**
- * @file icalmemory.c
- * @brief Common memory management routines.
- *
- * libical often passes strings back to the caller. To make these
- * interfaces simple, I did not want the caller to have to pass in a
- * memory buffer, but having libical pass out newly allocated memory
- * makes it difficult to de-allocate the memory.
- * 
- * The ring buffer in this scheme makes it possible for libical to pass
- * out references to memory which the caller does not own, and be able
- * to de-allocate the memory later. The ring allows libical to have
- * several buffers active simultaneously, which is handy when creating
- * string representations of components. 
- */
-
-#define ICALMEMORY_C
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
-#include "icalmemory.h"
-#include "icalerror.h"
-
-#include <stdio.h> /* for printf (debugging) */
-#include <stdlib.h> /* for malloc, realloc */
-#include <string.h> /* for memset(), strdup */
-
-#ifdef WIN32
-#include <windows.h>
-#endif
-
-#define BUFFER_RING_SIZE 2500
-#define MIN_BUFFER_SIZE 200
-
-
-/* HACK. Not threadsafe */
-
-typedef struct {
-	int pos;
-	void *ring[BUFFER_RING_SIZE];
-} buffer_ring;
-
-void icalmemory_free_tmp_buffer (void* buf);
-void icalmemory_free_ring_byval(buffer_ring *br);
-
-static buffer_ring* global_buffer_ring = 0;
-
-#ifdef HAVE_PTHREAD
-#include <pthread.h>
-
-static pthread_key_t  ring_key;
-static pthread_once_t ring_key_once = PTHREAD_ONCE_INIT;
-
-static void ring_destroy(void * buf) {
-    if (buf) icalmemory_free_ring_byval((buffer_ring *) buf);
-    pthread_setspecific(ring_key, NULL);
-}
-
-static void ring_key_alloc(void) {  
-    pthread_key_create(&ring_key, ring_destroy);
-}
-#endif
-
-
-static buffer_ring * buffer_ring_new(void) {
-	buffer_ring *br;
-	int i;
-
-	br = (buffer_ring *)malloc(sizeof(buffer_ring));
-
-	for(i=0; i<BUFFER_RING_SIZE; i++){
-	    br->ring[i]  = 0;
-	}
-	br->pos = 0;
-        return(br);
-}
-
-
-#ifdef HAVE_PTHREAD
-static buffer_ring* get_buffer_ring_pthread(void) {
-    buffer_ring *br;
-
-    pthread_once(&ring_key_once, ring_key_alloc);
-
-    br = pthread_getspecific(ring_key);
-
-    if (!br) {
-	br = buffer_ring_new();
-	pthread_setspecific(ring_key, br);
-    }
-    return(br);
-}
-#endif
-
-/* get buffer ring via a single global for a non-threaded program */
-static buffer_ring* get_buffer_ring_global(void) {
-    if (global_buffer_ring == 0) {
-	global_buffer_ring = buffer_ring_new();
-    }
-    return(global_buffer_ring);
-}
-
-static buffer_ring *get_buffer_ring(void) {
-#ifdef HAVE_PTHREAD
-	return(get_buffer_ring_pthread());
-#else
-	return get_buffer_ring_global();
-#endif
-}
-
-
-/** Add an existing buffer to the buffer ring */
-void  icalmemory_add_tmp_buffer(void* buf)
-{
-    buffer_ring *br = get_buffer_ring();
-
-
-    /* Wrap around the ring */
-    if(++(br->pos) == BUFFER_RING_SIZE){
-	br->pos = 0;
-    }
-
-    /* Free buffers as their slots are overwritten */
-    if ( br->ring[br->pos] != 0){
-	free( br->ring[br->pos]);
-    }
-
-    /* Assign the buffer to a slot */
-    br->ring[br->pos] = buf; 
-}
-
-
-/**
- * Create a new temporary buffer on the ring. Libical owns these and
- * will deallocate them. 
- */
-
-void*
-icalmemory_tmp_buffer (size_t size)
-{
-    char *buf;
-
-    if (size < MIN_BUFFER_SIZE){
-	size = MIN_BUFFER_SIZE;
-    }
-    
-    buf = (void*)malloc(size);
-
-    if( buf == 0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-    memset(buf,0,size); 
-
-    icalmemory_add_tmp_buffer(buf);
-
-    return buf;
-}
-
-/** get rid of this buffer ring */
-void icalmemory_free_ring_byval(buffer_ring *br) {
-   int i;
-   for(i=0; i<BUFFER_RING_SIZE; i++){
-    if ( br->ring[i] != 0){
-       free( br->ring[i]);
-    }
-    }
-   free(br);
-}
-
-void icalmemory_free_ring()
-{
-   buffer_ring *br;
-   br = get_buffer_ring();
-
-   icalmemory_free_ring_byval(br);
-}
-
-
-
-/** Like strdup, but the buffer is on the ring. */
-char*
-icalmemory_tmp_copy(const char* str)
-{
-    char* b = icalmemory_tmp_buffer(strlen(str)+1);
-
-    strcpy(b,str);
-
-    return b;
-}
-    
-
-char* icalmemory_strdup(const char *s)
-{
-    return strdup(s);
-}
-
-void
-icalmemory_free_tmp_buffer (void* buf)
-{
-   if(buf == 0)
-   {
-       return;
-   }
-
-   free(buf);
-}
-
-
-/*
- * These buffer routines create memory the old fashioned way -- so the
- * caller will have to deallocate the new memory 
- */
-
-void* icalmemory_new_buffer(size_t size)
-{
-    void *b = malloc(size);
-
-    if( b == 0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-    memset(b,0,size); 
-
-    return b;
-}
-
-void* icalmemory_resize_buffer(void* buf, size_t size)
-{
-    void *b = realloc(buf, size);
-
-    if( b == 0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-   return b;
-}
-
-void icalmemory_free_buffer(void* buf)
-{
-    free(buf);
-}
-
-void 
-icalmemory_append_string(char** buf, char** pos, size_t* buf_size, 
-			      const char* string)
-{
-    char *new_buf;
-    char *new_pos;
-
-    size_t data_length, final_length, string_length;
-
-#ifndef ICAL_NO_INTERNAL_DEBUG
-    icalerror_check_arg_rv( (buf!=0),"buf");
-    icalerror_check_arg_rv( (*buf!=0),"*buf");
-    icalerror_check_arg_rv( (pos!=0),"pos");
-    icalerror_check_arg_rv( (*pos!=0),"*pos");
-    icalerror_check_arg_rv( (buf_size!=0),"buf_size");
-    icalerror_check_arg_rv( (*buf_size!=0),"*buf_size");
-    icalerror_check_arg_rv( (string!=0),"string");
-#endif 
-
-    string_length = strlen(string);
-    data_length = (size_t)*pos - (size_t)*buf;    
-    final_length = data_length + string_length; 
-
-    if ( final_length >= (size_t) *buf_size) {
-
-	
-	*buf_size  = (*buf_size) * 2  + final_length;
-
-	new_buf = realloc(*buf,*buf_size);
-
-	new_pos = (void*)((size_t)new_buf + data_length);
-	
-	*pos = new_pos;
-	*buf = new_buf;
-    }
-    
-    strcpy(*pos, string);
-
-    *pos += string_length;
-}
-
-
-void 
-icalmemory_append_char(char** buf, char** pos, size_t* buf_size, 
-			      char ch)
-{
-    char *new_buf;
-    char *new_pos;
-
-    size_t data_length, final_length;
-
-#ifndef ICAL_NO_INTERNAL_DEBUG
-    icalerror_check_arg_rv( (buf!=0),"buf");
-    icalerror_check_arg_rv( (*buf!=0),"*buf");
-    icalerror_check_arg_rv( (pos!=0),"pos");
-    icalerror_check_arg_rv( (*pos!=0),"*pos");
-    icalerror_check_arg_rv( (buf_size!=0),"buf_size");
-    icalerror_check_arg_rv( (*buf_size!=0),"*buf_size");
-#endif
-
-    data_length = (size_t)*pos - (size_t)*buf;
-
-    final_length = data_length + 2; 
-
-    if ( final_length > (size_t) *buf_size ) {
-
-	
-	*buf_size  = (*buf_size) * 2  + final_length +1;
-
-	new_buf = realloc(*buf,*buf_size);
-
-	new_pos = (void*)((size_t)new_buf + data_length);
-	
-	*pos = new_pos;
-	*buf = new_buf;
-    }
-
-    **pos = ch;
-    *pos += 1;
-    **pos = 0;
-}
diff --git a/libical/src/libical/icalmemory.h b/libical/src/libical/icalmemory.h
deleted file mode 100644
index 7c42566eb5..0000000000
--- a/libical/src/libical/icalmemory.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalmemory.h
- CREATOR: eric 30 June 1999
-
-
- $Id$
- $Locker$
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Initial Developer of the Original Code is Eric Busboom
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-======================================================================*/
-
-#ifndef ICALMEMORY_H
-#define ICALMEMORY_H
-
-#ifndef WIN32
-#include <sys/types.h> /* for size_t */
-#else
-#include <stddef.h>
-#endif
-
-/* Tmp buffers are managed by ical. References can be returned to the
-   caller, although the caller will not own the memory. */
-
-void* icalmemory_tmp_buffer(size_t size);
-char* icalmemory_tmp_copy(const char* str);
-
-/** Add an externally allocated buffer to the ring. */
-void  icalmemory_add_tmp_buffer(void*);
-
-
-/** Free all memory used in the ring */
-void icalmemory_free_ring(void);
-
-/* Non-tmp buffers must be freed. These are mostly wrappers around
- * malloc, etc, but are used so the caller can change the memory
- * allocators in a future version of the library */
-
-void* icalmemory_new_buffer(size_t size);
-void* icalmemory_resize_buffer(void* buf, size_t size);
-void icalmemory_free_buffer(void* buf);
-
-/**
-   icalmemory_append_string will copy the string 'string' to the
-   buffer 'buf' starting at position 'pos', reallocing 'buf' if it is
-   too small. 'buf_size' is the size of 'buf' and will be changed if
-   'buf' is reallocated. 'pos' will point to the last byte of the new
-   string in 'buf', usually a '\0' */
-
-/* THESE ROUTINES CAN NOT BE USED ON TMP BUFFERS. Only use them on
-   normally allocated memory, or on buffers created from
-   icalmemory_new_buffer, never with buffers created by
-   icalmemory_tmp_buffer. If icalmemory_append_string has to resize a
-   buffer on the ring, the ring will loose track of it an you will
-   have memory problems. */
-
-void icalmemory_append_string(char** buf, char** pos, size_t* buf_size, 
-			      const char* string);
-
-/**  icalmemory_append_char is similar, but is appends a character instead of a string */
-void icalmemory_append_char(char** buf, char** pos, size_t* buf_size, 
-			      char ch);
-
-/** A wrapper around strdup. Partly to trap calls to strdup, partly
-    because in -ansi, gcc on Red Hat claims that strdup is undeclared */
-char* icalmemory_strdup(const char *s);
-
-#endif /* !ICALMEMORY_H */
-
-
-
diff --git a/libical/src/libical/icalmime.c b/libical/src/libical/icalmime.c
deleted file mode 100644
index e5d1c90601..0000000000
--- a/libical/src/libical/icalmime.c
+++ /dev/null
@@ -1,394 +0,0 @@
-/* -*- Mode: C -*-*/
-/*======================================================================
- FILE: icalmime.c
- CREATOR: eric 26 July 2000
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
-======================================================================*/
-
-#include "icalmime.h"
-#include "icalerror.h"
-#include "icalmemory.h"
-#include "sspm.h"
-#include "stdlib.h"
-#include <string.h> /* For strdup */
-#include <stdio.h> /* for snprintf*/
-
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
-#ifdef WIN32
-#define snprintf      _snprintf
-#define strcasecmp    stricmp
-#endif
-
-/* These *_part routines are called by the MIME parser via the
-   local_action_map */
-
-struct text_part
-{
-	char* buf;
-	char* buf_pos;
-	size_t buf_size;
-};
-
-void* icalmime_text_new_part()
-{
-
-#define BUF_SIZE 2048
-
-    struct text_part* impl;
-
-    if ( ( impl = (struct text_part*)
-	   malloc(sizeof(struct text_part))) == 0) {
-	return 0;
-    }
-
-    impl->buf =  icalmemory_new_buffer(BUF_SIZE);
-    impl->buf_pos = impl->buf;
-    impl->buf_size = BUF_SIZE;
-
-    return impl;    
-}
-void icalmime_text_add_line(void *part, 
-			    struct sspm_header *header, 
-			    char* line, size_t size)
-{
-    struct text_part* impl = (struct text_part*) part;
-
-    icalmemory_append_string(&(impl->buf),&(impl->buf_pos),
-			     &(impl->buf_size),line);
-    
-}
-
-void* icalmime_textcalendar_end_part(void* part)
-{
-
-    struct text_part* impl = (struct text_part*) part;
-    icalcomponent *c = icalparser_parse_string(impl->buf);
-
-    icalmemory_free_buffer(impl->buf);
-    free(impl);
-
-    return c;
-
-}
-
-void* icalmime_text_end_part(void* part)
-{
-    struct text_part* impl = ( struct text_part*) part;
-
-    icalmemory_add_tmp_buffer(impl->buf);
-    free(impl);
-
-    return impl->buf;
-}
-
-void icalmime_text_free_part(void *part)
-{
-    part = part;
-}
-
-
-/* Ignore Attachments for now */
-
-void* icalmime_attachment_new_part()
-{
-    return 0;
-}
-void icalmime_attachment_add_line(void *part, struct sspm_header *header, 
-				  char* line, size_t size)
-{
-    part = part;
-    header = header;
-    line = line;
-    size = size;
-}
-
-void* icalmime_attachment_end_part(void* part)
-{
-    return 0;
-}
-
-void icalmime_attachment_free_part(void *part)
-{
-}
-
-
-
-
-struct sspm_action_map icalmime_local_action_map[] = 
-{
-    {SSPM_TEXT_MAJOR_TYPE,SSPM_CALENDAR_MINOR_TYPE,icalmime_text_new_part,icalmime_text_add_line,icalmime_textcalendar_end_part,icalmime_text_free_part},
-    {SSPM_TEXT_MAJOR_TYPE,SSPM_ANY_MINOR_TYPE,icalmime_text_new_part,icalmime_text_add_line,icalmime_text_end_part,icalmime_text_free_part},
-    {SSPM_TEXT_MAJOR_TYPE,SSPM_PLAIN_MINOR_TYPE,icalmime_text_new_part,icalmime_text_add_line,icalmime_text_end_part,icalmime_text_free_part},
-    {SSPM_APPLICATION_MAJOR_TYPE,SSPM_CALENDAR_MINOR_TYPE,icalmime_attachment_new_part,icalmime_attachment_add_line,icalmime_attachment_end_part,icalmime_attachment_free_part},
-    {SSPM_IMAGE_MAJOR_TYPE,SSPM_CALENDAR_MINOR_TYPE,icalmime_attachment_new_part,icalmime_attachment_add_line,icalmime_attachment_end_part,icalmime_attachment_free_part},
-    {SSPM_AUDIO_MAJOR_TYPE,SSPM_CALENDAR_MINOR_TYPE,icalmime_attachment_new_part,icalmime_attachment_add_line,icalmime_attachment_end_part,icalmime_attachment_free_part},
-    {SSPM_IMAGE_MAJOR_TYPE,SSPM_CALENDAR_MINOR_TYPE,icalmime_attachment_new_part,icalmime_attachment_add_line,icalmime_attachment_end_part,icalmime_attachment_free_part},
-   {SSPM_UNKNOWN_MAJOR_TYPE,SSPM_UNKNOWN_MINOR_TYPE,0,0,0,0}
-};
-
-#define NUM_PARTS 100 /* HACK. Hard Limit */
-
-
-
-struct sspm_part* icalmime_make_part(icalcomponent* comp)
-{
-    comp = comp;
-    return 0;
-}
-
-char* icalmime_as_mime_string(char* icalcomponent);
-
-icalcomponent* icalmime_parse(char* (*get_string)(char *s, size_t size, 
-						       void *d),
-				void *data)
-{
-    struct sspm_part *parts;
-    int i, last_level=0;
-    icalcomponent *root=0, *parent=0, *comp=0, *last = 0;
-
-    if ( (parts = (struct sspm_part *)
-	  malloc(NUM_PARTS*sizeof(struct sspm_part)))==0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-    memset(parts,0,sizeof(parts));
-
-    sspm_parse_mime(parts, 
-		    NUM_PARTS, /* Max parts */
-		    icalmime_local_action_map, /* Actions */ 
-		    get_string,
-		    data, /* data for get_string*/
-		    0 /* First header */);
-
-
-
-    for(i = 0; i <NUM_PARTS && parts[i].header.major != SSPM_NO_MAJOR_TYPE ; i++){
-
-#define TMPSZ 1024
-	char mimetype[TMPSZ];			       
-	char* major = sspm_major_type_string(parts[i].header.major);
-	char* minor = sspm_minor_type_string(parts[i].header.minor);
-
-	if(parts[i].header.minor == SSPM_UNKNOWN_MINOR_TYPE ){
-	    assert(parts[i].header.minor_text !=0);
-	    minor = parts[i].header.minor_text;
-	}
-	
-	sprintf(mimetype,"%s/%s",major,minor);
-
-	comp = icalcomponent_new(ICAL_XLICMIMEPART_COMPONENT);
-
-	if(comp == 0){
-	    /* HACK Handle Error */
-	    assert(0);
-	}
-
-	if(parts[i].header.error!=SSPM_NO_ERROR){
-	    char *str = "Unknown error";
-	    char temp[256];
-
-	    if(parts[i].header.error==SSPM_MALFORMED_HEADER_ERROR){
-		str = "Malformed header, possibly due to input not in MIME format";
-	    }
-
-	    if(parts[i].header.error==SSPM_UNEXPECTED_BOUNDARY_ERROR){
-		str = "Got an unexpected boundary, possibly due to a MIME header for a MULTIPART part that is missing the Content-Type line";
-	    }
-
-	    if(parts[i].header.error==SSPM_WRONG_BOUNDARY_ERROR){
-		str = "Got the wrong boundary for the opening of a MULTIPART part.";
-	    }
-
-	    if(parts[i].header.error==SSPM_NO_BOUNDARY_ERROR){
-		str = "Got a multipart header that did not specify a boundary";
-	    }
-
-	    if(parts[i].header.error==SSPM_NO_HEADER_ERROR){
-		str = "Did not get a header for the part. Is there a blank\
-line between the header and the previous boundary\?";
-
-	    }
-
-	    if(parts[i].header.error_text != 0){
-		snprintf(temp,sizeof(temp),
-			 "%s: %s",str,parts[i].header.error_text);
-	    } else {
-		strcpy(temp,str);
-	    }
-
-	    icalcomponent_add_property
-		(comp,
-		 icalproperty_vanew_xlicerror(
-		     temp,
-		     icalparameter_new_xlicerrortype(
-			 ICAL_XLICERRORTYPE_MIMEPARSEERROR),
-		     0));  
-	}
-
-	if(parts[i].header.major != SSPM_NO_MAJOR_TYPE &&
-	   parts[i].header.major != SSPM_UNKNOWN_MAJOR_TYPE){
-
-	    icalcomponent_add_property(comp,
-		icalproperty_new_xlicmimecontenttype((char*)
-				icalmemory_strdup(mimetype)));
-
-	}
-
-	if (parts[i].header.encoding != SSPM_NO_ENCODING){
-
-	    icalcomponent_add_property(comp,
-	       icalproperty_new_xlicmimeencoding(
-		   sspm_encoding_string(parts[i].header.encoding)));
-	}
-
-	if (parts[i].header.filename != 0){
-	    icalcomponent_add_property(comp,
-	       icalproperty_new_xlicmimefilename(parts[i].header.filename));
-	}
-
-	if (parts[i].header.content_id != 0){
-	    icalcomponent_add_property(comp,
-	       icalproperty_new_xlicmimecid(parts[i].header.content_id));
-	}
-
-	if (parts[i].header.charset != 0){
-	    icalcomponent_add_property(comp,
-	       icalproperty_new_xlicmimecharset(parts[i].header.charset));
-	}
-
-	/* Add iCal components as children of the component */
-	if(parts[i].header.major == SSPM_TEXT_MAJOR_TYPE &&
-	   parts[i].header.minor == SSPM_CALENDAR_MINOR_TYPE &&
-	   parts[i].data != 0){
-
-	    icalcomponent_add_component(comp,
-					(icalcomponent*)parts[i].data);
-	    parts[i].data = 0;
-
-	} else 	if(parts[i].header.major == SSPM_TEXT_MAJOR_TYPE &&
-	   parts[i].header.minor != SSPM_CALENDAR_MINOR_TYPE &&
-	   parts[i].data != 0){
-
-	    /* Add other text components as "DESCRIPTION" properties */
-
-	    icalcomponent_add_property(comp,
-               icalproperty_new_description(
-		   (char*)icalmemory_strdup((char*)parts[i].data)));
-
-	    parts[i].data = 0;
-	}
-	
-
-	if(root!= 0 && parts[i].level == 0){
-	    /* We've already assigned the root, but there is another
-               part at the root level. This is probably a parse
-               error*/
-	    icalcomponent_free(comp);
-	    continue;
-	}
-
-	if(parts[i].level == last_level && last_level != 0){
-	    icalerror_assert(parent!=0,"No parent for adding component");
-
-	    icalcomponent_add_component(parent,comp);
-
-	} else if (parts[i].level == last_level && last_level == 0 &&
-	    root == 0) {
-
-	    root = comp;
-	    parent = comp;
-
-	} else if (parts[i].level > last_level){	    
-
-	    parent = last;
-	    icalcomponent_add_component(parent,comp);
-
-	    last_level = parts[i].level;
-
-	} else if (parts[i].level < last_level){
-
-	    parent = icalcomponent_get_parent(parent);
-	    icalcomponent_add_component(parent,comp);
-
-	    last_level = parts[i].level;
-	} else { 
-	    assert(0);
-	}
-
-	last = comp;
-	last_level = parts[i].level;
-	assert(parts[i].data == 0);
-    }
-
-    sspm_free_parts(parts,NUM_PARTS);
-    free(parts);
-
-    return root;
-}
-
-
-
-int icalmime_test(char* (*get_string)(char *s, size_t size, void *d),
-		  void *data)
-{
-    char *out;
-    struct sspm_part *parts;
-    int i;
-
-    if ( (parts = (struct sspm_part *)
-	  malloc(NUM_PARTS*sizeof(struct sspm_part)))==0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-    memset(parts,0,sizeof(parts));
-
-    sspm_parse_mime(parts, 
-		    NUM_PARTS, /* Max parts */
-		    icalmime_local_action_map, /* Actions */ 
-		    get_string,
-		    data, /* data for get_string*/
-		    0 /* First header */);
-
-   for(i = 0; i <NUM_PARTS && parts[i].header.major != SSPM_NO_MAJOR_TYPE ; 
-       i++){
-       if(parts[i].header.minor == SSPM_CALENDAR_MINOR_TYPE){
-	   parts[i].data = icalmemory_strdup(
-	       icalcomponent_as_ical_string((icalcomponent*)parts[i].data));
-       }
-   }
-
-    sspm_write_mime(parts,NUM_PARTS,&out,"To: bob@bob.org");
-
-    printf("%s\n",out);
-
-    return 0;
-
-}
-
-
diff --git a/libical/src/libical/icalmime.h b/libical/src/libical/icalmime.h
deleted file mode 100644
index b22288842d..0000000000
--- a/libical/src/libical/icalmime.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalmime.h
- CREATOR: eric 26 July 2000
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-======================================================================*/
-
-#ifndef ICALMIME_H
-#define ICALMIME_H
-
-#include "icalcomponent.h"
-#include "icalparser.h"
-
-icalcomponent* icalmime_parse(	char* (*line_gen_func)(char *s, size_t size, 
-						       void *d),
-				void *data);
-
-/* The inverse of icalmime_parse, not implemented yet. Use sspm.h directly.  */
-char* icalmime_as_mime_string(char* component);
-
-
-
-#endif /* !ICALMIME_H */
-
-
-
diff --git a/libical/src/libical/icalparameter.c b/libical/src/libical/icalparameter.c
deleted file mode 100644
index 9c55419021..0000000000
--- a/libical/src/libical/icalparameter.c
+++ /dev/null
@@ -1,383 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalderivedparameters.{c,h}
-  CREATOR: eric 09 May 1999
-  
-  $Id$
-  $Locker$
-    
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalderivedparameters.{c,h}
-
-  Contributions from:
-     Graham Davison (g.m.davison@computer.org)
-
- ======================================================================*/
-/*#line 29 "icalparameter.c.in"*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-
-#include "icalparameter.h"
-#include "icalproperty.h"
-#include "icalerror.h"
-#include "icalmemory.h"
-#include "icalparameterimpl.h"
-
-#include <stdlib.h> /* for malloc() */
-#include <errno.h>
-#include <string.h> /* for memset() */
-
-/* In icalderivedparameter */
-icalparameter* icalparameter_new_from_value_string(icalparameter_kind kind,const  char* val);
-
-
-struct icalparameter_impl* icalparameter_new_impl(icalparameter_kind kind)
-{
-    struct icalparameter_impl* v;
-
-    if ( ( v = (struct icalparameter_impl*)
-	   malloc(sizeof(struct icalparameter_impl))) == 0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-    
-    strcpy(v->id,"para");
-
-    v->kind = kind;
-    v->size = 0;
-    v->string = 0;
-    v->x_name = 0;
-    v->parent = 0;
-    v->data = 0;
-
-    return v;
-}
-
-icalparameter*
-icalparameter_new (icalparameter_kind kind)
-{
-    struct icalparameter_impl* v = icalparameter_new_impl(kind);
-
-    return (icalparameter*) v;
-
-}
-
-void
-icalparameter_free (icalparameter* param)
-{
-
-/*  HACK. This always triggers, even when parameter is non-zero
-    icalerror_check_arg_rv((parameter==0),"parameter");*/
-
-
-#ifdef ICAL_FREE_ON_LIST_IS_ERROR
-    icalerror_assert( (param->parent ==0),"Tried to free a parameter that is still attached to a component. ");
-    
-#else
-    if(param->parent !=0){
-	return;
-    }
-#endif
-
-    
-    if (param->string != 0){
-	free ((void*)param->string);
-    }
-    
-    if (param->x_name != 0){
-	free ((void*)param->x_name);
-    }
-    
-    memset(param,0,sizeof(param));
-
-    param->parent = 0;
-    param->id[0] = 'X';
-    free(param);
-}
-
-
-
-icalparameter* 
-icalparameter_new_clone(icalparameter* old)
-{
-    struct icalparameter_impl *new;
-
-    new = icalparameter_new_impl(old->kind);
-
-    icalerror_check_arg_rz((old!=0),"param");
-
-    if (new == 0){
-	return 0;
-    }
-
-    memcpy(new,old,sizeof(struct icalparameter_impl));
-
-    if (old->string != 0){
-	new->string = icalmemory_strdup(old->string);
-	if (new->string == 0){
-	    icalparameter_free(new);
-	    return 0;
-	}
-    }
-
-    if (old->x_name != 0){
-	new->x_name = icalmemory_strdup(old->x_name);
-	if (new->x_name == 0){
-	    icalparameter_free(new);
-	    return 0;
-	}
-    }
-
-    return new;
-}
-
-icalparameter* icalparameter_new_from_string(const char *str)
-{
-    char* eq;
-    char* cpy;
-    icalparameter_kind kind;
-    icalparameter *param;
-
-    icalerror_check_arg_rz(str != 0,"str");
-
-    cpy = icalmemory_strdup(str);
-
-    if (cpy == 0){
-        icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-        return 0;
-    }
-
-    eq = strchr(cpy,'=');
-
-    if(eq == 0){
-        icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-        return 0;
-    }
-
-    *eq = '\0';
-
-    eq++;
-
-    kind = icalparameter_string_to_kind(cpy);
-
-    if(kind == ICAL_NO_PARAMETER){
-        icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-        return 0;
-    }
-
-    param = icalparameter_new_from_value_string(kind,eq);
-
-    if(kind == ICAL_X_PARAMETER){
-        icalparameter_set_xname(param,cpy);
-    }
-
-    free(cpy);
-
-    return param;
-    
-}
-
-/**
- * Return a string representation of the parameter according to RFC2445.
- *
- * param	= param-name "=" param-value
- * param-name	= iana-token / x-token
- * param-value	= paramtext /quoted-string
- * paramtext	= *SAFE-SHARE
- * quoted-string= DQUOTE *QSAFE-CHARE DQUOTE
- * QSAFE-CHAR	= any character except CTLs and DQUOTE
- * SAFE-CHAR	= any character except CTLs, DQUOTE. ";", ":", ","
- */
-char*
-icalparameter_as_ical_string (icalparameter* param)
-{
-    size_t buf_size = 1024;
-    char* buf; 
-    char* buf_ptr;
-    char *out_buf;
-    const char *kind_string;
-
-    icalerror_check_arg_rz( (param!=0), "parameter");
-
-    /* Create new buffer that we can append names, parameters and a
-       value to, and reallocate as needed. Later, this buffer will be
-       copied to a icalmemory_tmp_buffer, which is managed internally
-       by libical, so it can be given to the caller without fear of
-       the caller forgetting to free it */
-
-    buf = icalmemory_new_buffer(buf_size);
-    buf_ptr = buf;
-
-    if(param->kind == ICAL_X_PARAMETER) {
-
-	icalmemory_append_string(&buf, &buf_ptr, &buf_size, 
-				 icalparameter_get_xname(param));
-
-    } else {
-
-	kind_string = icalparameter_kind_to_string(param->kind);
-	
-	if (param->kind == ICAL_NO_PARAMETER || 
-	    param->kind == ICAL_ANY_PARAMETER || 
-	    kind_string == 0)
-	{
-	    icalerror_set_errno(ICAL_BADARG_ERROR);
-	    return 0;
-	}
-	
-	
-	/* Put the parameter name into the string */
-	icalmemory_append_string(&buf, &buf_ptr, &buf_size, kind_string);
-
-    }
-
-    icalmemory_append_string(&buf, &buf_ptr, &buf_size, "=");
-
-    if(param->string !=0){
-        int qm = 0;
-
-	/* Encapsulate the property in quotes if necessary */
-	if (strpbrk(param->string, ";:,") != 0) {
-		icalmemory_append_char (&buf, &buf_ptr, &buf_size, '"');
-		qm = 1;
-	}
-        icalmemory_append_string(&buf, &buf_ptr, &buf_size, param->string); 
-	if (qm == 1) {
-		icalmemory_append_char (&buf, &buf_ptr, &buf_size, '"');
-	}
-    } else if (param->data != 0){
-        const char* str = icalparameter_enum_to_string(param->data);
-        icalmemory_append_string(&buf, &buf_ptr, &buf_size, str); 
-    } else {
-        icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-        return 0;
-    }
-
-    /* Now, copy the buffer to a tmp_buffer, which is safe to give to
-       the caller without worring about de-allocating it. */
-    
-    out_buf = icalmemory_tmp_copy(buf);
-    icalmemory_free_buffer(buf);
-
-    return out_buf;
-
-}
-
-
-int
-icalparameter_is_valid (icalparameter* parameter);
-
-
-icalparameter_kind
-icalparameter_isa (icalparameter* parameter)
-{
-    if(parameter == 0){
-	return ICAL_NO_PARAMETER;
-    }
-
-    return parameter->kind;
-}
-
-
-int
-icalparameter_isa_parameter (void* parameter)
-{
-    struct icalparameter_impl *impl = (struct icalparameter_impl *)parameter;
-
-    if (parameter == 0){
-	return 0;
-    }
-
-    if (strcmp(impl->id,"para") == 0) {
-	return 1;
-    } else {
-	return 0;
-    }
-}
-
-
-void
-icalparameter_set_xname (icalparameter* param, const char* v)
-{
-    icalerror_check_arg_rv( (param!=0),"param");
-    icalerror_check_arg_rv( (v!=0),"v");
-
-    if (param->x_name != 0){
-	free((void*)param->x_name);
-    }
-
-    param->x_name = icalmemory_strdup(v);
-
-    if (param->x_name == 0){
-	errno = ENOMEM;
-    }
-
-}
-
-const char*
-icalparameter_get_xname (icalparameter* param)
-{
-    icalerror_check_arg_rz( (param!=0),"param");
-
-    return param->x_name;
-}
-
-void
-icalparameter_set_xvalue (icalparameter* param, const char* v)
-{
-    icalerror_check_arg_rv( (param!=0),"param");
-    icalerror_check_arg_rv( (v!=0),"v");
-
-    if (param->string != 0){
-	free((void*)param->string);
-    }
-
-    param->string = icalmemory_strdup(v);
-
-    if (param->string == 0){
-	errno = ENOMEM;
-    }
-
-}
-
-const char*
-icalparameter_get_xvalue (icalparameter* param)
-{
-    icalerror_check_arg_rz( (param!=0),"param");
-
-    return param->string;
-}
-
-void icalparameter_set_parent(icalparameter* param,
-			     icalproperty* property)
-{
-    icalerror_check_arg_rv( (param!=0),"param");
-
-    param->parent = property;
-}
-
-icalproperty* icalparameter_get_parent(icalparameter* param)
-{
-    icalerror_check_arg_rz( (param!=0),"param");
-
-    return param->parent;
-}
-
-
-/* Everything below this line is machine generated. Do not edit. */
-/* ALTREP */
diff --git a/libical/src/libical/icalparameter.h b/libical/src/libical/icalparameter.h
deleted file mode 100644
index f3d64ab9e5..0000000000
--- a/libical/src/libical/icalparameter.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
-  FILE: icalparam.h
-  CREATOR: eric 20 March 1999
-
-
-  $Id$
-  $Locker$
-
-  
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalparam.h
-
-  ======================================================================*/
-
-#ifndef ICALPARAM_H
-#define ICALPARAM_H
-
-#include "icalderivedparameter.h"
-
-/* Declared in icalderivedparameter.h */
-/*typedef struct icalparameter_impl icalparameter;*/
-
-icalparameter* icalparameter_new(icalparameter_kind kind);
-icalparameter* icalparameter_new_clone(icalparameter* p);
-
-/* Create from string of form "PARAMNAME=VALUE" */
-icalparameter* icalparameter_new_from_string(const char* value);
-
-/* Create from just the value, the part after the "=" */
-icalparameter* icalparameter_new_from_value_string(icalparameter_kind kind, const char* value);
-
-void icalparameter_free(icalparameter* parameter);
-
-char* icalparameter_as_ical_string(icalparameter* parameter);
-
-int icalparameter_is_valid(icalparameter* parameter);
-
-icalparameter_kind icalparameter_isa(icalparameter* parameter);
-
-int icalparameter_isa_parameter(void* param);
-
-/* Acess the name of an X parameer */
-void icalparameter_set_xname (icalparameter* param, const char* v);
-const char* icalparameter_get_xname(icalparameter* param);
-void icalparameter_set_xvalue (icalparameter* param, const char* v);
-const char* icalparameter_get_xvalue(icalparameter* param);
-
-/* Convert enumerations */
-
-const char* icalparameter_kind_to_string(icalparameter_kind kind);
-icalparameter_kind icalparameter_string_to_kind(const char* string);
-
-
-
-#endif 
diff --git a/libical/src/libical/icalparameter_cxx.cpp b/libical/src/libical/icalparameter_cxx.cpp
deleted file mode 100644
index 4b54a69991..0000000000
--- a/libical/src/libical/icalparameter_cxx.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-/* -*- Mode: C++ -*- */
-
-/**
- * @file    icalparameter_cxx.cpp
- * @author  fnguyen (12/10/01)
- * @brief   Implementation of C++ Wrapper for icalparameter.c
- *
- * (C) COPYRIGHT 2001, Critical Path
- */
-
-#ifndef ICALPARAMETER_CXX_H
-#include "icalparameter_cxx.h"
-#endif
-
-#ifndef ICALVALUE_CXX_H
-#include "icalvalue_cxx.h"
-#endif
-
-typedef	char* string; // Will use the string library from STL
-
-ICalParameter::ICalParameter() throw(icalerrorenum) : imp(icalparameter_new(ICAL_ANY_PARAMETER)){
-}
-
-ICalParameter::ICalParameter(const ICalParameter& v) throw(icalerrorenum) {
-	imp = icalparameter_new_clone(v.imp);
-	if (!imp) throw icalerrno;
-}
-
-ICalParameter& ICalParameter::operator=(const ICalParameter& v)  throw(icalerrorenum) {
-	if (this == &v) return *this;
-
-	if (imp != NULL)
-	{
-		icalparameter_free(imp);
-		imp = icalparameter_new_clone(v.imp);
-		if (!imp) throw icalerrno;
-	}
-    
-	return *this;
-}
-
-ICalParameter::~ICalParameter(){
-	if (imp != NULL) icalparameter_free(imp);
-}
-
-ICalParameter::ICalParameter(icalparameter* v) throw(icalerrorenum) : imp(v){
-}
-
-/// Create from string of form "PARAMNAME=VALUE"
-ICalParameter::ICalParameter(string str) throw(icalerrorenum) { 
-	imp = icalparameter_new_from_string(str);
-	if (!imp) throw icalerrno;
-}
-
-/// Create from just the value, the part after the "="
-ICalParameter::ICalParameter(icalparameter_kind kind, string  str) throw(icalerrorenum) { 
-	imp = icalparameter_new_from_value_string(kind, str);
-	if (!imp) throw icalerrno;
-}
-
-ICalParameter::ICalParameter(icalparameter_kind kind) throw(icalerrorenum) {
-	imp = icalparameter_new(kind);
-	if (!imp) throw icalerrno;
-}
-
-string ICalParameter::as_ical_string() throw(icalerrorenum) {
-  char *str = icalparameter_as_ical_string(imp);
-
-  if (!str) throw icalerrno;
-
-  return str;
-}
-
-bool ICalParameter::is_valid(){
-	if (imp == NULL) return false;
-	return (icalparameter_isa_parameter((void*)imp) ? true : false);
-}
-icalparameter_kind ICalParameter::isa(){
-	return icalparameter_isa(imp);
-}
-int ICalParameter::isa_parameter(void* param){
-	return icalparameter_isa_parameter(param);
-}
-
-/* Acess the name of an X parameer */
-void ICalParameter::set_xname(ICalParameter &param, string  v){
-	icalparameter_set_xname(param, v);
-}
-string ICalParameter::get_xname(ICalParameter &param){
-	return (string)icalparameter_get_xname(param);
-}
-void ICalParameter::set_xvalue (ICalParameter &param, string  v){
-	icalparameter_set_xvalue(param, v);
-}
-string ICalParameter::get_xvalue(ICalParameter &param){
-	return (string)icalparameter_get_xvalue(param);
-}
-
-/* Convert enumerations */
-string ICalParameter::kind_to_string(icalparameter_kind kind){
-	return (string)icalparameter_kind_to_string(kind);
-}
-icalparameter_kind ICalParameter::string_to_kind(string  str){
-	return icalparameter_string_to_kind(str);
-}
-
-/* DELEGATED-FROM */
-string ICalParameter::get_delegatedfrom(){
-	return (string)icalparameter_get_delegatedfrom(imp);
-}
-void ICalParameter::set_delegatedfrom(string  v){
-	icalparameter_set_delegatedfrom(imp, v);
-}
-
-/* RELATED */
-icalparameter_related ICalParameter::get_related(){
-	return icalparameter_get_related(imp);
-}
-void ICalParameter::set_related(icalparameter_related v){
-	icalparameter_set_related(imp, v);
-}
-
-/* SENT-BY */
-string ICalParameter::get_sentby(){
-	return (string)icalparameter_get_sentby(imp);
-}
-void ICalParameter::set_sentby(string  v){
-	icalparameter_set_sentby(imp, v);
-}
-
-/* LANGUAGE */
-string ICalParameter::get_language(){
-	return (string)icalparameter_get_language(imp);
-}
-void ICalParameter::set_language(string  v){
-	icalparameter_set_language(imp, v);
-}
-
-/* RELTYPE */
-icalparameter_reltype ICalParameter::get_reltype(){
-	return icalparameter_get_reltype(imp);
-}
-void ICalParameter::set_reltype(icalparameter_reltype v){
-	icalparameter_set_reltype(imp, v);
-}
-
-/* ENCODING */
-icalparameter_encoding ICalParameter::get_encoding(){
-	return icalparameter_get_encoding(imp);
-}
-void ICalParameter::set_encoding(icalparameter_encoding v){
-	icalparameter_set_encoding(imp, v);
-}
-
-/* ALTREP */
-string ICalParameter::get_altrep(){
-	return (string)icalparameter_get_language(imp);
-}
-void ICalParameter::set_altrep(string  v){
-	icalparameter_set_altrep(imp, v);
-}
-
-/* FMTTYPE */
-string ICalParameter::get_fmttype(){
-	return (string)icalparameter_get_fmttype(imp);
-}
-void ICalParameter::set_fmttype(string  v){
-	icalparameter_set_fmttype(imp, v);
-}
-
-/* FBTYPE */
-icalparameter_fbtype ICalParameter::get_fbtype(){
-	return icalparameter_get_fbtype(imp);
-}
-void ICalParameter::set_fbtype(icalparameter_fbtype v){
-	icalparameter_set_fbtype(imp, v);
-}
-
-/* RSVP */
-icalparameter_rsvp ICalParameter::get_rsvp(){
-	return icalparameter_get_rsvp(imp);
-}
-void ICalParameter::set_rsvp(icalparameter_rsvp v){
-	icalparameter_set_rsvp(imp, v);
-}
-
-/* RANGE */
-icalparameter_range ICalParameter::get_range(){
-	return icalparameter_get_range(imp);
-}
-void ICalParameter::set_range(icalparameter_range v){
-	icalparameter_set_range(imp, v);
-}
-
-/* DELEGATED-TO */
-string ICalParameter::get_delegatedto(){
-	return (string)icalparameter_get_delegatedto(imp);
-}
-void ICalParameter::set_delegatedto(string  v){
-	icalparameter_set_delegatedto(imp, v);
-}
-
-/* CN */
-string ICalParameter::get_cn(){
-	return (string)icalparameter_get_cn(imp);
-}
-void ICalParameter::set_cn(string  v){
-	icalparameter_set_cn(imp, v);
-}
-
-/* ROLE */
-icalparameter_role ICalParameter::get_role(){
-	return icalparameter_get_role(imp);
-}
-void ICalParameter::set_role(icalparameter_role v){
-	icalparameter_set_role(imp, v);
-}
-
-/* X-LIC-COMPARETYPE */
-icalparameter_xliccomparetype ICalParameter::get_xliccomparetype(){
-	return icalparameter_get_xliccomparetype(imp);
-}
-void ICalParameter::set_xliccomparetype(icalparameter_xliccomparetype v){
-	icalparameter_set_xliccomparetype(imp, v);
-}
-
-/* PARTSTAT */
-icalparameter_partstat ICalParameter::get_partstat(){
-	return icalparameter_get_partstat(imp);
-}
-void ICalParameter::set_partstat(icalparameter_partstat v){
-	icalparameter_set_partstat(imp, v);
-}
-
-/* X-LIC-ERRORTYPE */
-icalparameter_xlicerrortype ICalParameter::get_xlicerrortype(){
-	return icalparameter_get_xlicerrortype(imp);
-}
-void ICalParameter::set_xlicerrortype(icalparameter_xlicerrortype v){
-	icalparameter_set_xlicerrortype(imp, v);
-}
-
-/* MEMBER */
-string ICalParameter::get_member(){
-	return (string)icalparameter_get_member(imp);
-}
-void ICalParameter::set_member(string  v){
-	icalparameter_set_member(imp, v);
-}
-
-/* X */
-string ICalParameter::get_x(){
-	return (string)icalparameter_get_x(imp);
-}
-void ICalParameter::set_x(string  v){
-	icalparameter_set_x(imp, v);
-}
-
-/* CUTYPE */
-icalparameter_cutype ICalParameter::get_cutype(){
-	return icalparameter_get_cutype(imp);
-}
-void ICalParameter::set_cutype(icalparameter_cutype v){
-	icalparameter_set_cutype(imp, v);
-}
-
-/* TZID */
-string ICalParameter::get_tzid(){
-	return (string)icalparameter_get_tzid(imp);
-}
-void ICalParameter::set_tzid(string  v){
-	icalparameter_set_tzid(imp, v);
-}
-
-/* VALUE */
-icalparameter_value ICalParameter::get_value(){
-	return icalparameter_get_value(imp);
-}
-void ICalParameter::set_value(icalparameter_value v){
-	icalparameter_set_value(imp, v);
-}
-
-/* DIR */
-string ICalParameter::get_dir(){
-	return (string)icalparameter_get_dir(imp);
-}
-void ICalParameter::set_dir(string  v){
-	icalparameter_set_dir(imp, v);
-}
diff --git a/libical/src/libical/icalparameter_cxx.h b/libical/src/libical/icalparameter_cxx.h
deleted file mode 100644
index fe35d6d4ed..0000000000
--- a/libical/src/libical/icalparameter_cxx.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/* -*- Mode: C++ -*- */
-
-/**
- * @file    icalparameter_cxx.h
- * @author  fnguyen (12/10/01)
- * @brief   Definition of C++ Wrapper for icalparameter.c
- *
- * (C) COPYRIGHT 2001, Critical Path
- */
-
-
-#ifndef ICALPARAMETER_CXX_H
-#define ICALPARAMETER_CXX_H
-
-extern "C" {
-#include "ical.h"
-};
-
-#include "icptrholder.h"
-
-typedef	char* string; // Will use the string library from STL
-
-class ICalParameter {
-public:
-	ICalParameter() throw(icalerrorenum);
-	ICalParameter(const ICalParameter&) throw(icalerrorenum);
-	ICalParameter& operator=(const ICalParameter&) throw(icalerrorenum);
-	~ICalParameter();
-
-	ICalParameter(icalparameter* v)  throw(icalerrorenum);
-
-        // Create from string of form "PARAMNAME=VALUE"
-	ICalParameter(string str) throw(icalerrorenum);
-
-        // Create from just the value, the part after the "="
-	ICalParameter(icalparameter_kind kind, string  str) throw(icalerrorenum); 
-	ICalParameter(icalparameter_kind kind) throw(icalerrorenum);
-
-	operator icalparameter*() { return imp; }
-
-	void detach() {
-	    imp = NULL;
-	}
-
-public:
-	string as_ical_string() throw(icalerrorenum);
-	bool is_valid();
-	icalparameter_kind isa( );
-	int isa_parameter(void* param);
-	
-public:
-	/* Acess the name of an X parameer */
-	static void set_xname (ICalParameter  &param, string  v);
-	static string get_xname(ICalParameter  &param);
-	static void set_xvalue (ICalParameter  &param, string  v);
-	static string get_xvalue(ICalParameter  &param);
-
-	/* Convert enumerations */
-	static string kind_to_string(icalparameter_kind kind);
-	static icalparameter_kind string_to_kind(string  str);
-
-public:
-	/* DELEGATED-FROM */
-	string get_delegatedfrom();
-	void set_delegatedfrom(string  v);
-
-	/* RELATED */
-	icalparameter_related get_related();
-	void set_related(icalparameter_related v);
-
-	/* SENT-BY */
-	string get_sentby();
-	void set_sentby(string  v);
-
-	/* LANGUAGE */
-	string get_language();
-	void set_language(string  v);
-
-	/* RELTYPE */
-	icalparameter_reltype get_reltype();
-	void set_reltype(icalparameter_reltype v);
-
-	/* ENCODING */
-	icalparameter_encoding get_encoding();
-	void set_encoding(icalparameter_encoding v);
-
-	/* ALTREP */
-	string get_altrep();
-	void set_altrep(string  v);
-
-	/* FMTTYPE */
-	string get_fmttype();
-	void set_fmttype(string  v);
-
-	/* FBTYPE */
-	icalparameter_fbtype get_fbtype();
-	void set_fbtype(icalparameter_fbtype v);
-
-	/* RSVP */
-	icalparameter_rsvp get_rsvp();
-	void set_rsvp(icalparameter_rsvp v);
-
-	/* RANGE */
-	icalparameter_range get_range();
-	void set_range(icalparameter_range v);
-
-	/* DELEGATED-TO */
-	string get_delegatedto();
-	void set_delegatedto(string  v);
-
-	/* CN */
-	string get_cn();
-	void set_cn(string  v);
-
-	/* ROLE */
-	icalparameter_role get_role();
-	void set_role(icalparameter_role v);
-
-	/* X-LIC-COMPARETYPE */
-	icalparameter_xliccomparetype get_xliccomparetype();
-	void set_xliccomparetype(icalparameter_xliccomparetype v);
-
-	/* PARTSTAT */
-	icalparameter_partstat get_partstat();
-	void set_partstat(icalparameter_partstat v);
-
-	/* X-LIC-ERRORTYPE */
-	icalparameter_xlicerrortype get_xlicerrortype();
-	void set_xlicerrortype(icalparameter_xlicerrortype v);
-
-	/* MEMBER */
-	string get_member();
-	void set_member(string  v);
-
-	/* X */
-	string get_x();
-	void set_x(string  v);
-
-	/* CUTYPE */
-	icalparameter_cutype get_cutype();
-	void set_cutype(icalparameter_cutype v);
-
-	/* TZID */
-	string get_tzid();
-	void set_tzid(string  v);
-
-	/* VALUE */
-	icalparameter_value get_value();
-	void set_value(icalparameter_value v);
-
-	/* DIR */
-	string get_dir();
-	void set_dir(string  v);
-
-private:
-	icalparameter* imp;
-};
-
-#endif 
diff --git a/libical/src/libical/icalparameterimpl.h b/libical/src/libical/icalparameterimpl.h
deleted file mode 100644
index 2d0fdd642d..0000000000
--- a/libical/src/libical/icalparameterimpl.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalparameterimpl.h
-  CREATOR: eric 09 May 1999
-  
-  $Id$
-  $Locker$
-    
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalderivedparameters.{c,h}
-
-  Contributions from:
-     Graham Davison (g.m.davison@computer.org)
-
- ======================================================================*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifndef ICALPARAMETER_IMPL
-#define ICALPARAMETER_IMPL
-
-#include "icalparameter.h"
-#include "icalproperty.h"
-
-struct icalparameter_impl
-{
-	icalparameter_kind kind;
-	char id[5];
-	int size;
-	const char* string;
-	const char* x_name;
-	icalproperty* parent;
-
-	int data;
-};
-
-
-#endif /*ICALPARAMETER_IMPL*/
diff --git a/libical/src/libical/icalparser.c b/libical/src/libical/icalparser.c
deleted file mode 100644
index 0090cf9568..0000000000
--- a/libical/src/libical/icalparser.c
+++ /dev/null
@@ -1,1112 +0,0 @@
-/* -*- Mode: C; tab-width: 4; c-basic-offset: 8; -*-
-  ======================================================================
-  FILE: icalparser.c
-  CREATOR: eric 04 August 1999
-  
-  $Id$
-  $Locker$
-    
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The Initial Developer of the Original Code is Eric Busboom
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
- ======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-
-#include "pvl.h"
-#include "icalerror.h"
-#include "icalvalue.h"
-#include "icalderivedparameter.h"
-#include "icalparameter.h"
-#include "icalproperty.h"
-#include "icalcomponent.h"
-
-#include <string.h> /* For strncpy & size_t */
-#include <stdio.h> /* For FILE and fgets and sprintf */
-#include <stdlib.h> /* for free */
-
-#include "icalmemory.h"
-#include "icalparser.h"
-
-#ifdef WIN32
-#define HAVE_CTYPE_H
-#define HAVE_ISWSPACE
-#endif
-
-#ifdef HAVE_WCTYPE_H
-#include <wctype.h>
-#endif
-
-#ifdef HAVE_CTYPE_H
-#include <ctype.h>
-#endif
-
-#ifndef HAVE_ISWSPACE
-#ifdef HAVE_ISSPACE
-# define iswspace        isspace
-#else
-#error "You don't have isspace. Please report the error to libical@softwarestudio.org."
-#endif
-#endif
-
-#ifdef WIN32
-#define snprintf      _snprintf
-#define strcasecmp    stricmp
-#endif
-
-char* icalparser_get_next_char(char c, char *str, int qm);
-char* icalparser_get_next_parameter(char* line,char** end);
-char* icalparser_get_next_value(char* line, char **end, icalvalue_kind kind);
-char* icalparser_get_prop_name(char* line, char** end);
-char* icalparser_get_param_name(char* line, char **end);
-
-#define TMP_BUF_SIZE 80
-
-struct icalparser_impl 
-{
-    int buffer_full; /* flag indicates that temp is smaller that 
-                        data being read into it*/
-    int continuation_line; /* last line read was a continuation line */
-    size_t tmp_buf_size; 
-    char temp[TMP_BUF_SIZE];
-    icalcomponent *root_component;
-    int version; 
-    int level;
-    int lineno;
-    icalparser_state state;
-    pvl_list components;
-    
-    void *line_gen_data;
-
-};
-
-
-icalparser* icalparser_new(void)
-{
-    struct icalparser_impl* impl = 0;
-    if ( ( impl = (struct icalparser_impl*)
-	   malloc(sizeof(struct icalparser_impl))) == 0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-    
-    impl->root_component = 0;
-    impl->components  = pvl_newlist();  
-    impl->level = 0;
-    impl->state = ICALPARSER_SUCCESS;
-    impl->tmp_buf_size = TMP_BUF_SIZE;
-    impl->buffer_full = 0;
-	impl->continuation_line = 0;
-    impl->lineno = 0;
-    impl->continuation_line = 0;
-    memset(impl->temp,0, TMP_BUF_SIZE);
-
-    return (icalparser*)impl;
-}
-
-
-void icalparser_free(icalparser* parser)
-{
-    icalcomponent *c;
-
-    if (parser->root_component != 0){
-	icalcomponent_free(parser->root_component);
-    }
-
-    while( (c=pvl_pop(parser->components)) != 0){
-	icalcomponent_free(c);
-    }
-    
-    pvl_free(parser->components);
-    
-    free(parser);
-}
-
-void icalparser_set_gen_data(icalparser* parser, void* data)
-{
-		parser->line_gen_data  = data;
-}
-
-
-icalvalue* icalvalue_new_From_string_with_error(icalvalue_kind kind, 
-                                                char* str, 
-                                                icalproperty **error);
-
-
-
-char* icalparser_get_next_char(char c, char *str, int qm)
-{
-    int quote_mode = 0;
-    char* p;
-
-    for(p=str; *p!=0; p++){
-	    if (qm == 1) {
-				if ( quote_mode == 0 && *p=='"' && *(p-1) != '\\' ){
-						quote_mode =1;
-						continue;
-				}
-
-				if ( quote_mode == 1 && *p=='"' && *(p-1) != '\\' ){
-						quote_mode =0;
-						continue;
-				}
-	    }
-		
-		if (quote_mode == 0 &&  *p== c  && *(p-1) != '\\' ){
-				return p;
-		} 
-
-    }
-
-    return 0;
-}
-
-
-/** make a new tmp buffer out of a substring */
-static char* make_segment(char* start, char* end)
-{
-    char *buf, *tmp;
-    size_t size = (size_t)end - (size_t)start;
-    
-    buf = icalmemory_tmp_buffer(size+1);
-    
-
-    strncpy(buf,start,size);
-    *(buf+size) = 0;
-
-	tmp = (buf+size);
-	while ( *tmp == '\0' || iswspace(*tmp) )
-	{
-		*tmp = 0;
-		tmp--;
-	}
-    
-    return buf;
-}
-
-
-char* icalparser_get_prop_name(char* line, char** end)
-{
-    char* p;
-    char* v;
-    char *str;
-
-    p = icalparser_get_next_char(';',line,1); 
-    v = icalparser_get_next_char(':',line,1); 
-    if (p== 0 && v == 0) {
-	return 0;
-    }
-
-    /* There is no ';' or, it is after the ';' that marks the beginning of
-       the value */
-    if (v!=0 && ( p == 0 || p > v)){
-	str = make_segment(line,v);
-	*end = v+1;
-    } else {
-	str = make_segment(line,p);
-	*end = p+1;
-    }
-
-    return str;
-}
-
-
-char* icalparser_get_param_name(char* line, char **end)
-{
-    char* next; 
-    char *str;
-
-    next = icalparser_get_next_char('=',line,1);
-
-    if (next == 0) {
-	return 0;
-    }
-
-    str = make_segment(line,next);
-    *end = next+1;
-    if (**end == '"') {
-        *end = *end+1;
-	    next = icalparser_get_next_char('"',*end,0);
-	    if (next == 0) {
-		    return 0;
-	    }
-
-	    *end = make_segment(*end,next);
-    }
-
-    return str;
-}
-
-
-char* icalparser_get_next_paramvalue(char* line, char **end)
-{
-    char* next; 
-    char *str;
-
-    next = icalparser_get_next_char(',',line,1);
-
-    if (next == 0){
-	next = (char*)(size_t)line+(size_t)strlen(line);\
-    }
-
-    if (next == line){
-	return 0;
-    } else {
-	str = make_segment(line,next);
-	*end = next+1;
-	return str;
-    }
-}
-
-
-/**
-   A property may have multiple values, if the values are seperated by
-   commas in the content line. This routine will look for the next
-   comma after line and will set the next place to start searching in
-   end. */
-
-char* icalparser_get_next_value(char* line, char **end, icalvalue_kind kind)
-{
-    
-    char* next;
-    char *p;
-    char *str;
-    size_t length = strlen(line);
-
-    p = line;
-    while(1){
-
-	next = icalparser_get_next_char(',',p,1);
-
-	/* Unforunately, RFC2445 says that for the RECUR value, COMMA
-	   can both seperate digits in a list, and it can seperate
-	   multiple recurrence specifications. This is not a friendly
-	   part of the spec. This weirdness tries to
-	   distinguish the two uses. it is probably a HACK*/
-      
-	if( kind == ICAL_RECUR_VALUE ) {
-	    if ( next != 0 &&
-		 (*end+length) > next+5 &&
-		 strncmp(next,"FREQ",4) == 0
-		) {
-		/* The COMMA was followed by 'FREQ', is it a real seperator*/
-		/* Fall through */
-	    } else if (next != 0){
-		/* Not real, get the next COMMA */
-		p = next+1;
-		next = 0;
-		continue;
-	    } 
-	}
-	/* ignore all , for query value. select dtstart, dtend etc ... */
-	else if( kind == ICAL_QUERY_VALUE) {
-	    if ( next != 0) {
-		p = next+1;
-		continue;
-	    }
-	    else
-		break;
-	}
-
-	/* If the comma is preceeded by a '\', then it is a literal and
-	   not a value seperator*/  
-      
-	if ( (next!=0 && *(next-1) == '\\') ||
-	     (next!=0 && *(next-3) == '\\')
-	    ) 
-	    /*second clause for '/' is on prev line. HACK may be out of bounds */
-	{
-	    p = next+1;
-	} else {
-	    break;
-	}
-
-    }
-
-    if (next == 0){
-	next = (char*)(size_t)line+length;
-	*end = next;
-    } else {
-	*end = next+1;
-    }
-
-    if (next == line){
-	return 0;
-    } 
-	
-
-    str = make_segment(line,next);
-    return str;
-   
-}
-
-char* icalparser_get_next_parameter(char* line,char** end)
-{
-    char *next;
-    char *v;
-    char *str;
-
-    v = icalparser_get_next_char(':',line,1); 
-    next = icalparser_get_next_char(';', line,1);
-    
-    /* There is no ';' or, it is after the ':' that marks the beginning of
-       the value */
-
-    if (next == 0 || next > v) {
-	next = icalparser_get_next_char(':', line,1);
-    }
-
-    if (next != 0) {
-	str = make_segment(line,next);
-	*end = next+1;
-	return str;
-    } else {
-	*end = line;
-	return 0;
-    }
-}
-
-
-/**
- * Get a single property line, from the property name through the
- * final new line, and include any continuation lines
- */
-char* icalparser_get_line(icalparser *parser,
-                          char* (*line_gen_func)(char *s, size_t size, void *d))
-{
-    char *line;
-    char *line_p;
-    size_t buf_size = parser->tmp_buf_size;
-    
-    line_p = line = icalmemory_new_buffer(buf_size);
-    line[0] = '\0';
-   
-    /* Read lines by calling line_gen_func and putting the data into
-       parser->temp. If the line is a continuation line ( begins with a
-       space after a newline ) then append the data onto line and read
-       again. Otherwise, exit the loop. */
-
-    while(1) {
-
-        /* The first part of the loop deals with the temp buffer,
-           which was read on he last pass through the loop. The
-           routine is split like this because it has to read lone line
-           ahead to determine if a line is a continuation line. */
-
-
-	/* The tmp buffer is not clear, so transfer the data in it to the
-	   output. This may be left over from a previous call */
-	if (parser->temp[0] != '\0' ) {
-
-	    /* If the last position in the temp buffer is occupied,
-               mark the buffer as full. The means we will do another
-               read later, because the line is not finished */
-	    if (parser->temp[parser->tmp_buf_size-1] == 0 &&
-		parser->temp[parser->tmp_buf_size-2] != '\n'&& 
-                parser->temp[parser->tmp_buf_size-2] != 0 ){
-		parser->buffer_full = 1;
-	    } else {
-		parser->buffer_full = 0;
-	    }
-
-	    /* Copy the temp to the output and clear the temp buffer. */
-            if(parser->continuation_line==1){
-                /* back up the pointer to erase the continuation characters */
-                parser->continuation_line = 0;
-                line_p--;
-                
-                if ( *(line_p-1) == '\r'){
-                    line_p--;
-                }
-                
-                /* copy one space up to eliminate the leading space*/
-                icalmemory_append_string(&line,&line_p,&buf_size,
-                                         parser->temp+1);
-
-            } else {
-                icalmemory_append_string(&line,&line_p,&buf_size,parser->temp);
-            }
-
-            parser->temp[0] = '\0' ;
-	}
-	
-	parser->temp[parser->tmp_buf_size-1] = 1; /* Mark end of buffer */
-
-        /****** Here is where the routine gets string data ******************/
-	if ((*line_gen_func)(parser->temp,parser->tmp_buf_size,parser->line_gen_data)
-	    ==0){/* Get more data */
-
-	    /* If the first position is clear, it means we didn't get
-               any more data from the last call to line_ge_func*/
-	    if (parser->temp[0] == '\0'){
-
-		if(line[0] != '\0'){
-		    /* There is data in the output, so fall trhough and process it*/
-		    break;
-		} else {
-		    /* No data in output; return and signal that there
-                       is no more input*/
-		    free(line);
-		    return 0;
-		}
-	    }
-	}
-	
- 
-	/* If the output line ends in a '\n' and the temp buffer
-	   begins with a ' ', then the buffer holds a continuation
-	   line, so keep reading.  */
-
-	if  ( line_p > line+1 && *(line_p-1) == '\n' && parser->temp[0] == ' ') {
-
-            parser->continuation_line = 1;
-
-	} else if ( parser->buffer_full == 1 ) {
-	    
-	    /* The buffer was filled on the last read, so read again */
-
-	} else {
-
-	    /* Looks like the end of this content line, so break */
-	    break;
-	}
-
-	
-    }
-
-    /* Erase the final newline and/or carriage return*/
-    if ( line_p > line+1 && *(line_p-1) == '\n') {	
-	*(line_p-1) = '\0';
-	if ( *(line_p-2) == '\r'){
-	    *(line_p-2) = '\0';
-	}
-
-    } else {
-	*(line_p) = '\0';
-    }
-
-	while ( (*line_p == '\0' || iswspace(*line_p)) && line_p > line )
-	{
-		*line_p = '\0';
-		line_p--;
-	}
-
-    return line;
-
-}
-
-static void insert_error(icalcomponent* comp, char* text, 
-		  char* message, icalparameter_xlicerrortype type)
-{
-    char temp[1024];
-    
-    if (text == 0){
-	snprintf(temp,1024,"%s:",message);
-    } else {
-	snprintf(temp,1024,"%s: %s",message,text);
-    }	
-    
-    icalcomponent_add_property
-	(comp,
-	 icalproperty_vanew_xlicerror(
-	     temp,
-	     icalparameter_new_xlicerrortype(type),
-	     0));   
-}
-
-
-static int line_is_blank(char* line){
-    int i=0;
-
-    for(i=0; *(line+i)!=0; i++){
-	char c = *(line+i);
-
-	if(c != ' ' && c != '\n' && c != '\t'){
-	    return 0;
-	}
-    }
-    
-    return 1;
-}
-
-icalcomponent* icalparser_parse(icalparser *parser,
-				char* (*line_gen_func)(char *s, size_t size, 
-						       void* d))
-{
-
-    char* line; 
-    icalcomponent *c=0; 
-    icalcomponent *root=0;
-    icalerrorstate es = icalerror_get_error_state(ICAL_MALFORMEDDATA_ERROR);
-	int cont;
-
-    icalerror_check_arg_rz((parser !=0),"parser");
-
-    icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR,ICAL_ERROR_NONFATAL);
-
-    do{
-	    line = icalparser_get_line(parser, line_gen_func);
-
-	if ((c = icalparser_add_line(parser,line)) != 0){
-
-	    if(icalcomponent_get_parent(c) !=0){
-		/* This is bad news... assert? */
-	    }	    
-	    
-	    assert(parser->root_component == 0);
-	    assert(pvl_count(parser->components) ==0);
-
-	    if (root == 0){
-		/* Just one component */
-		root = c;
-	    } else if(icalcomponent_isa(root) != ICAL_XROOT_COMPONENT) {
-		/*Got a second component, so move the two components under
-		  an XROOT container */
-		icalcomponent *tempc = icalcomponent_new(ICAL_XROOT_COMPONENT);
-		icalcomponent_add_component(tempc, root);
-		icalcomponent_add_component(tempc, c);
-		root = tempc;
-	    } else if(icalcomponent_isa(root) == ICAL_XROOT_COMPONENT) {
-		/* Already have an XROOT container, so add the component
-		   to it*/
-		icalcomponent_add_component(root, c);
-		
-	    } else {
-		/* Badness */
-		assert(0);
-	    }
-
-	    c = 0;
-
-        }
-	cont = 0;
-	if(line != 0){
-	    icalmemory_free_buffer(line);
-		cont = 1;
-	}
-    } while ( cont );
-
-    icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR,es);
-
-    return root;
-
-}
-
-
-icalcomponent* icalparser_add_line(icalparser* parser,
-                                       char* line)
-{ 
-    char *str;
-    char *end;
-    int vcount = 0;
-    icalproperty *prop;
-    icalproperty_kind prop_kind;
-    icalvalue *value;
-    icalvalue_kind value_kind = ICAL_NO_VALUE;
-
-
-    icalerror_check_arg_rz((parser != 0),"parser");
-
-
-    if (line == 0)
-    {
-	parser->state = ICALPARSER_ERROR;
-	return 0;
-    }
-
-    if(line_is_blank(line) == 1){
-	return 0;
-    }
-
-    /* Begin by getting the property name at the start of the line. The
-       property name may end up being "BEGIN" or "END" in which case it
-       is not really a property, but the marker for the start or end of
-       a component */
-
-    end = 0;
-    str = icalparser_get_prop_name(line, &end);
-
-    if (str == 0 || strlen(str) == 0 ){
-	/* Could not get a property name */
-	icalcomponent *tail = pvl_data(pvl_tail(parser->components));
-
-	if (tail){
-	    insert_error(tail,line,
-			 "Got a data line, but could not find a property name or component begin tag",
-			 ICAL_XLICERRORTYPE_COMPONENTPARSEERROR);
-	}
-	tail = 0;
-	parser->state = ICALPARSER_ERROR;
-	return 0; 
-    }
-
-    /**********************************************************************
-     * Handle begin and end of components
-     **********************************************************************/								       
-    /* If the property name is BEGIN or END, we are actually
-       starting or ending a new component */
-
-
-    if(strcmp(str,"BEGIN") == 0){
-	icalcomponent *c;
-        icalcomponent_kind comp_kind;
-
-
-	parser->level++;
-	str = icalparser_get_next_value(end,&end, value_kind);
-	    
-
-        comp_kind = icalenum_string_to_component_kind(str);
-
-
-        if (comp_kind == ICAL_NO_COMPONENT){
-
-
-	    c = icalcomponent_new(ICAL_XLICINVALID_COMPONENT);
-	    insert_error(c,str,"Parse error in component name",
-			 ICAL_XLICERRORTYPE_COMPONENTPARSEERROR);
-        }
-
-	c  =  icalcomponent_new(comp_kind);
-
-	if (c == 0){
-	    c = icalcomponent_new(ICAL_XLICINVALID_COMPONENT);
-	    insert_error(c,str,"Parse error in component name",
-			 ICAL_XLICERRORTYPE_COMPONENTPARSEERROR);
-	}
-	    
-	pvl_push(parser->components,c);
-
-	parser->state = ICALPARSER_BEGIN_COMP;
-	return 0;
-
-    } else if (strcmp(str,"END") == 0 ) {
-	icalcomponent* tail;
-
-	parser->level--;
-	str = icalparser_get_next_value(end,&end, value_kind);
-
-	/* Pop last component off of list and add it to the second-to-last*/
-	parser->root_component = pvl_pop(parser->components);
-
-	tail = pvl_data(pvl_tail(parser->components));
-
-	if(tail != 0){
-	    icalcomponent_add_component(tail,parser->root_component);
-	} 
-
-	tail = 0;
-
-	/* Return the component if we are back to the 0th level */
-	if (parser->level == 0){
-	    icalcomponent *rtrn; 
-
-	    if(pvl_count(parser->components) != 0){
-	    /* There are still components on the stack -- this means
-               that one of them did not have a proper "END" */
-		pvl_push(parser->components,parser->root_component);
-		icalparser_clean(parser); /* may reset parser->root_component*/
-	    }
-
-	    assert(pvl_count(parser->components) == 0);
-
-	    parser->state = ICALPARSER_SUCCESS;
-	    rtrn = parser->root_component;
-	    parser->root_component = 0;
-	    return rtrn;
-
-	} else {
-	    parser->state = ICALPARSER_END_COMP;
-	    return 0;
-	}
-    }
-
-
-    /* There is no point in continuing if we have not seen a
-       component yet */
-
-    if(pvl_data(pvl_tail(parser->components)) == 0){
-	parser->state = ICALPARSER_ERROR;
-	return 0;
-    }
-
-
-    /**********************************************************************
-     * Handle property names
-     **********************************************************************/
-								       
-    /* At this point, the property name really is a property name,
-       (Not a component name) so make a new property and add it to
-       the component */
-
-    
-    prop_kind = icalproperty_string_to_kind(str);
-
-    prop = icalproperty_new(prop_kind);
-
-    if (prop != 0){
-	icalcomponent *tail = pvl_data(pvl_tail(parser->components));
-
-        if(prop_kind==ICAL_X_PROPERTY){
-            icalproperty_set_x_name(prop,str);
-        }
-
-	icalcomponent_add_property(tail, prop);
-
-	/* Set the value kind for the default for this type of
-	   property. This may be re-set by a VALUE parameter */
-	value_kind = icalproperty_kind_to_value_kind(icalproperty_isa(prop));
-
-    } else {
-	icalcomponent* tail = pvl_data(pvl_tail(parser->components));
-
-	insert_error(tail,str,"Parse error in property name",
-		     ICAL_XLICERRORTYPE_PROPERTYPARSEERROR);
-	    
-	tail = 0;
-	parser->state = ICALPARSER_ERROR;
-	return 0;
-    }
-
-    /**********************************************************************
-     * Handle parameter values
-     **********************************************************************/								       
-
-    /* Now, add any parameters to the last property */
-
-    while(1) {
-
-	if (*(end-1) == ':'){
-	    /* if the last seperator was a ":" and the value is a
-	       URL, icalparser_get_next_parameter will find the
-	       ':' in the URL, so better break now. */
-	    break;
-	}
-
-	str = icalparser_get_next_parameter(end,&end);
-
-	if (str != 0){
-	    char* name;
-	    char* pvalue;
-        
-	    icalparameter *param = 0;
-	    icalparameter_kind kind;
-	    icalcomponent *tail = pvl_data(pvl_tail(parser->components));
-
-	    name = icalparser_get_param_name(str,&pvalue);
-
-	    if (name == 0){
-		/* 'tail' defined above */
-		insert_error(tail, str, "Cant parse parameter name",
-			     ICAL_XLICERRORTYPE_PARAMETERNAMEPARSEERROR);
-		tail = 0;
-		break;
-	    }
-
-	    kind = icalparameter_string_to_kind(name);
-
-	    if(kind == ICAL_X_PARAMETER){
-		param = icalparameter_new(ICAL_X_PARAMETER);
-		
-		if(param != 0){
-		    icalparameter_set_xname(param,name);
-		    icalparameter_set_xvalue(param,pvalue);
-		}
-
-
-	    } else if (kind != ICAL_NO_PARAMETER){
-		param = icalparameter_new_from_value_string(kind,pvalue);
-	    } else {
-		/* Error. Failed to parse the parameter*/
-		/* 'tail' defined above */
-		insert_error(tail, str, "Cant parse parameter name",
-			     ICAL_XLICERRORTYPE_PARAMETERNAMEPARSEERROR);
-		tail = 0;
-		parser->state = ICALPARSER_ERROR;
-		return 0;
-	    }
-
-	    if (param == 0){
-		/* 'tail' defined above */
-		insert_error(tail,str,"Cant parse parameter value",
-			     ICAL_XLICERRORTYPE_PARAMETERVALUEPARSEERROR);
-		    
-		tail = 0;
-		parser->state = ICALPARSER_ERROR;
-		continue;
-	    }
-
-	    /* If it is a VALUE parameter, set the kind of value*/
-	    if (icalparameter_isa(param)==ICAL_VALUE_PARAMETER){
-
-		value_kind = (icalvalue_kind)
-                    icalparameter_value_to_value_kind(
-                                icalparameter_get_value(param)
-                                );
-
-		if (value_kind == ICAL_NO_VALUE){
-
-		    /* Ooops, could not parse the value of the
-		       parameter ( it was not one of the defined
-		       values ), so reset the value_kind */
-			
-		    insert_error(
-			tail, str, 
-			"Got a VALUE parameter with an unknown type",
-			ICAL_XLICERRORTYPE_PARAMETERVALUEPARSEERROR);
-		    icalparameter_free(param);
-			
-		    value_kind = 
-			icalproperty_kind_to_value_kind(
-			    icalproperty_isa(prop));
-			
-		    icalparameter_free(param);
-		    tail = 0;
-		    parser->state = ICALPARSER_ERROR;
-		    return 0;
-		} 
-	    }
-
-	    /* Everything is OK, so add the parameter */
-	    icalproperty_add_parameter(prop,param);
-	    tail = 0;
-
-	} else { /* if ( str != 0)  */
-	    /* If we did not get a param string, go on to looking
-	       for a value */
-	    break;
-	} /* if ( str != 0)  */
-
-    } /* while(1) */	    
-	
-    /**********************************************************************
-     * Handle values
-     **********************************************************************/								       
-
-    /* Look for values. If there are ',' characters in the values,
-       then there are multiple values, so clone the current
-       parameter and add one part of the value to each clone */
-
-    vcount=0;
-    while(1) {
-	str = icalparser_get_next_value(end,&end, value_kind);
-
-	if (str != 0){
-		
-	    if (vcount > 0){
-		/* Actually, only clone after the second value */
-		icalproperty* clone = icalproperty_new_clone(prop);
-		icalcomponent* tail = pvl_data(pvl_tail(parser->components));
-		    
-		icalcomponent_add_property(tail, clone);
-		prop = clone;		    
-		tail = 0;
-	    }
-		
-	    value = icalvalue_new_from_string(value_kind, str);
-		
-	    /* Don't add properties without value */
-	    if (value == 0){
-		char temp[200]; /* HACK */
-
-		icalproperty_kind prop_kind = icalproperty_isa(prop);
-		icalcomponent* tail = pvl_data(pvl_tail(parser->components));
-
-		sprintf(temp,"Cant parse as %s value in %s property. Removing entire property",
-			icalvalue_kind_to_string(value_kind),
-			icalproperty_kind_to_string(prop_kind));
-
-		insert_error(tail, str, temp,
-			     ICAL_XLICERRORTYPE_VALUEPARSEERROR);
-
-		/* Remove the troublesome property */
-		icalcomponent_remove_property(tail,prop);
-		icalproperty_free(prop);
-		prop = 0;
-		tail = 0;
-		parser->state = ICALPARSER_ERROR;
-		return 0;
-		    
-	    } else {
-		vcount++;
-		icalproperty_set_value(prop, value);
-	    }
-
-
-	} else {
-	    if (vcount == 0){
-		char temp[200]; /* HACK */
-		
-		icalproperty_kind prop_kind = icalproperty_isa(prop);
-		icalcomponent *tail = pvl_data(pvl_tail(parser->components));
-		
-		sprintf(temp,"No value for %s property. Removing entire property",
-			icalproperty_kind_to_string(prop_kind));
-
-		insert_error(tail, str, temp,
-			     ICAL_XLICERRORTYPE_VALUEPARSEERROR);
-
-		/* Remove the troublesome property */
-		icalcomponent_remove_property(tail,prop);
-		icalproperty_free(prop);
-		prop = 0;
-		tail = 0;
-		parser->state = ICALPARSER_ERROR;
-		return 0;
-	    } else {
-
-		break;
-	    }
-	}
-    }
-	
-    /****************************************************************
-     * End of component parsing. 
-     *****************************************************************/
-
-    if (pvl_data(pvl_tail(parser->components)) == 0 &&
-	parser->level == 0){
-	/* HACK. Does this clause ever get executed? */
-	parser->state = ICALPARSER_SUCCESS;
-	assert(0);
-	return parser->root_component;
-    } else {
-	parser->state = ICALPARSER_IN_PROGRESS;
-	return 0;
-    }
-
-}
-
-icalparser_state icalparser_get_state(icalparser* parser)
-{
-    return parser->state;
-
-}
-
-icalcomponent* icalparser_clean(icalparser* parser)
-{
-    icalcomponent *tail; 
-
-    icalerror_check_arg_rz((parser != 0 ),"parser");
-
-    /* We won't get a clean exit if some components did not have an
-       "END" tag. Clear off any component that may be left in the list */
-    
-    while((tail=pvl_data(pvl_tail(parser->components))) != 0){
-
-	insert_error(tail," ",
-		     "Missing END tag for this component. Closing component at end of input.",
-		     ICAL_XLICERRORTYPE_COMPONENTPARSEERROR);
-	
-
-	parser->root_component = pvl_pop(parser->components);
-	tail=pvl_data(pvl_tail(parser->components));
-
-	if(tail != 0){
-	    if(icalcomponent_get_parent(parser->root_component)!=0){
-		icalerror_warn("icalparser_clean is trying to attach a component for the second time");
-	    } else {
-		icalcomponent_add_component(tail,parser->root_component);
-	    }
-	}
-	    
-    }
-
-    return parser->root_component;
-
-}
-
-struct slg_data {
-	const char* pos;
-	const char* str;
-};
-
-
-char* icalparser_string_line_generator(char *out, size_t buf_size, void *d)
-{
-    char *n;
-    size_t size;
-    struct slg_data* data = (struct slg_data*)d;
-
-    if(data->pos==0){
-	data->pos=data->str;
-    }
-
-    /* If the pointer is at the end of the string, we are done */
-    if (*(data->pos)==0){
-	return 0;
-    }
-
-    n = strchr(data->pos,'\n');
-    
-    if (n == 0){
-	size = strlen(data->pos);
-    } else {
-	n++; /* include newline in output */
-	size = (n-data->pos);	
-    }
-
-    if (size > buf_size-1){
-	size = buf_size-1;
-    }
-    
-
-    strncpy(out,data->pos,size);
-    
-    *(out+size) = '\0';
-    
-    data->pos += size;
-
-    return out;    
-}
-
-icalcomponent* icalparser_parse_string(const char* str)
-{
-    icalcomponent *c;
-    struct slg_data d;
-    icalparser *p;
-
-    icalerrorstate es = icalerror_get_error_state(ICAL_MALFORMEDDATA_ERROR);
-
-    d.pos = 0;
-    d.str = str;
-
-    p = icalparser_new();
-    icalparser_set_gen_data(p,&d);
-
-    icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR,ICAL_ERROR_NONFATAL);
-
-    c = icalparser_parse(p,icalparser_string_line_generator);
-
-    icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR,es);
-
-    icalparser_free(p);
-
-    return c;
-
-}
diff --git a/libical/src/libical/icalparser.h b/libical/src/libical/icalparser.h
deleted file mode 100644
index 7773af4d1f..0000000000
--- a/libical/src/libical/icalparser.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
-  FILE: icalparser.h
-  CREATOR: eric 20 April 1999
-  
-  $Id$
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalparser.h
-
-======================================================================*/
-
-
-#ifndef ICALPARSER_H
-#define ICALPARSER_H
-
-#include "icalenums.h"
-#include "icaltypes.h"
-#include"icalcomponent.h"
-
-#include <stdio.h> /* For FILE* */
-
-typedef struct icalparser_impl icalparser;
-
-
-/**
- * @file  icalparser.h
- * @brief Line-oriented parsing. 
- * 
- * Create a new parser via icalparse_new_parser, then add lines one at
- * a time with icalparse_add_line(). icalparser_add_line() will return
- * non-zero when it has finished with a component.
- */
-
-typedef enum icalparser_state {
-    ICALPARSER_ERROR,
-    ICALPARSER_SUCCESS,
-    ICALPARSER_BEGIN_COMP,
-    ICALPARSER_END_COMP,
-    ICALPARSER_IN_PROGRESS
-} icalparser_state;
-
-icalparser* icalparser_new(void);
-icalcomponent* icalparser_add_line(icalparser* parser, char* str );
-icalcomponent* icalparser_clean(icalparser* parser);
-icalparser_state icalparser_get_state(icalparser* parser);
-void icalparser_free(icalparser* parser);
-
-
-/**
- * Message oriented parsing.  icalparser_parse takes a string that
- * holds the text ( in RFC 2445 format ) and returns a pointer to an
- * icalcomponent. The caller owns the memory. line_gen_func is a
- * pointer to a function that returns one content line per invocation
- */
-
-icalcomponent* icalparser_parse(icalparser *parser,
-	char* (*line_gen_func)(char *s, size_t size, void *d));
-
-/**
-   Set the data that icalparser_parse will give to the line_gen_func
-   as the parameter 'd'
- */
-void icalparser_set_gen_data(icalparser* parser, void* data);
-
-
-icalcomponent* icalparser_parse_string(const char* str);
-
-
-/***********************************************************************
- * Parser support functions
- ***********************************************************************/
-
-/** Use the flex/bison parser to turn a string into a value type */
-icalvalue*  icalparser_parse_value(icalvalue_kind kind, 
-				   const char* str, icalcomponent** errors);
-
-/** Given a line generator function, return a single iCal content line.*/
-char* icalparser_get_line(icalparser* parser, char* (*line_gen_func)(char *s, size_t size, void *d));
-
-char* icalparser_string_line_generator(char *out, size_t buf_size, void *d);
-
-#endif /* !ICALPARSE_H */
diff --git a/libical/src/libical/icalperiod.c b/libical/src/libical/icalperiod.c
deleted file mode 100644
index 0dfbe81bfc..0000000000
--- a/libical/src/libical/icalperiod.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalperiod.c
-  CREATOR: eric 02 June 2000
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
- ======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "icalperiod.h"
-
-#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "icalerror.h"
-#include "icalmemory.h"
-
-
-
-
-struct icalperiodtype icalperiodtype_from_string (const char* str)
-{
-    
-    struct icalperiodtype p, null_p;
-    char *s = icalmemory_strdup(str);
-    char *start, *end = s;
-    icalerrorstate es;
-
-    /* Errors are normally generated in the following code, so save
-       the error state for resoration later */
-
-    icalerrorenum e = icalerrno;
-
-    p.start = p.end = icaltime_null_time();
-    p.duration = icaldurationtype_from_int(0);
-
-    null_p = p;
-
-    if(s == 0) goto error;
-
-    start = s;
-    end = strchr(s, '/');
-
-    if(end == 0) goto error;
-
-    *end = 0;
-    end++;
-
-    p.start = icaltime_from_string(start);
-
-    if (icaltime_is_null_time(p.start)) goto error;
-
-    es = icalerror_get_error_state(ICAL_MALFORMEDDATA_ERROR);
-    icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR,ICAL_ERROR_NONFATAL);
-
-    p.end = icaltime_from_string(end);
-
-    icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR,es);
-    
-
-    if (icaltime_is_null_time(p.end)){
-
-	p.duration = icaldurationtype_from_string(end);
-
-	if(icaldurationtype_as_int(p.duration) == 0) goto error;
-    } 
-
-    icalerrno = e;
-
-    icalmemory_free_buffer(s);
-
-    return p;
-
- error:
-    icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-
-    if (s)
-	icalmemory_free_buffer (s);
-    return null_p;
-}
-
-
-const char* icalperiodtype_as_ical_string(struct icalperiodtype p)
-{
-
-    const char* start;
-    const char* end;
-
-    char *buf;
-    size_t buf_size = 40;
-    char* buf_ptr = 0;
-
-    buf = (char*)icalmemory_new_buffer(buf_size);
-    buf_ptr = buf;
-    
-
-    start = icaltime_as_ical_string(p.start);
-
-    icalmemory_append_string(&buf, &buf_ptr, &buf_size, start); 
-
-    if(!icaltime_is_null_time(p.end)){
-	end = icaltime_as_ical_string(p.end);
-    } else {
-	end = icaldurationtype_as_ical_string(p.duration);
-    }
-
-    icalmemory_append_char(&buf, &buf_ptr, &buf_size, '/'); 
-
-    icalmemory_append_string(&buf, &buf_ptr, &buf_size, end); 
-    
-	icalmemory_add_tmp_buffer(buf);
-
-    return buf;
-}
-
-
-
-struct icalperiodtype icalperiodtype_null_period(void) {
-    struct icalperiodtype p;
-    p.start = icaltime_null_time();
-    p.end = icaltime_null_time();
-    p.duration = icaldurationtype_null_duration();
-
-    return p;
-}
-int icalperiodtype_is_null_period(struct icalperiodtype p){
-    
-    if(icaltime_is_null_time(p.start) && 
-       icaltime_is_null_time(p.end) && 
-       icaldurationtype_is_null_duration(p.duration)){
-	return 1;
-    } else {
-	return 0;
-    }
-}
-
-int icalperiodtype_is_valid_period(struct icalperiodtype p){
-    if(icaltime_is_valid_time(p.start) && 
-       (icaltime_is_valid_time(p.end) || icaltime_is_null_time(p.end)) )
-	{
-	    return 1;
-	}
-
-    return 0;
-}
-
diff --git a/libical/src/libical/icalperiod.h b/libical/src/libical/icalperiod.h
deleted file mode 100644
index 5f07dd4a88..0000000000
--- a/libical/src/libical/icalperiod.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalperiod.h
- CREATOR: eric 26 Jan 2001
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
-======================================================================*/
-
-#ifndef ICALPERIOD_H
-#define ICALPERIOD_H
-
-#include "icaltime.h"
-#include "icalduration.h"
-
-struct icalperiodtype 
-{
-	struct icaltimetype start; 
-	struct icaltimetype end; 
-	struct icaldurationtype duration;
-};
-
-struct icalperiodtype icalperiodtype_from_string (const char* str);
-
-const char* icalperiodtype_as_ical_string(struct icalperiodtype p);
-
-struct icalperiodtype icalperiodtype_null_period(void);
-
-int icalperiodtype_is_null_period(struct icalperiodtype p);
-
-int icalperiodtype_is_valid_period(struct icalperiodtype p);
-
-#endif /* !ICALTIME_H */
-
-
-
diff --git a/libical/src/libical/icalproperty.c b/libical/src/libical/icalproperty.c
deleted file mode 100644
index 16378c6da8..0000000000
--- a/libical/src/libical/icalproperty.c
+++ /dev/null
@@ -1,989 +0,0 @@
-/* -*- Mode: C -*- */
-
-/*======================================================================
-  FILE: icalproperty.c
-  CREATOR: eric 28 April 1999
-  
-  $Id$
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalproperty.c
-
-======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "icalproperty.h"
-#include "icalparameter.h"
-#include "icalcomponent.h"
-#include "pvl.h"
-#include "icalenums.h"
-#include "icalerror.h"
-#include "icalmemory.h"
-#include "icalparser.h"
-
-#include <string.h> /* For icalmemory_strdup, rindex */
-#include <assert.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <stdio.h> /* for printf */
-#include <stdarg.h> /* for va_list, va_start, etc. */
-                                               
-#ifdef WIN32
-#define snprintf      _snprintf
-#define strcasecmp    stricmp
-#endif
-
-/* Private routines for icalproperty */
-void icalvalue_set_parent(icalvalue* value,
-			     icalproperty* property);
-icalproperty* icalvalue_get_parent(icalvalue* value);
-
-void icalparameter_set_parent(icalparameter* param,
-			     icalproperty* property);
-icalproperty* icalparameter_get_parent(icalparameter* value);
-
-
-void icalproperty_set_x_name(icalproperty* prop, const char* name);
-
-struct icalproperty_impl 
-{
-	char id[5];
-	icalproperty_kind kind;
-	char* x_name;
-	pvl_list parameters;
-	pvl_elem parameter_iterator;
-	icalvalue* value;
-	icalcomponent *parent;
-};
-
-void icalproperty_add_parameters(icalproperty* prop, va_list args)
-{
-    void* vp;
-
-    while((vp = va_arg(args, void*)) != 0) {
-
-	if (icalvalue_isa_value(vp) != 0 ){
-	} else if (icalparameter_isa_parameter(vp) != 0 ){
-
-	    icalproperty_add_parameter((icalproperty*)prop,
-				       (icalparameter*)vp);
-	} else {
-	    icalerror_set_errno(ICAL_BADARG_ERROR);
-	}
-
-    }
-}
-
-
-icalproperty*
-icalproperty_new_impl(icalproperty_kind kind)
-{
-    icalproperty* prop;
-
-    if (!icalproperty_kind_is_valid(kind))
-      return NULL;
-
-    if ( ( prop = (icalproperty*) malloc(sizeof(icalproperty))) == 0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-    
-    strcpy(prop->id,"prop");
-
-    prop->kind = kind;
-    prop->parameters = pvl_newlist();
-    prop->parameter_iterator = 0;
-    prop->value = 0;
-    prop->x_name = 0;
-    prop->parent = 0;
-
-    return prop;
-}
-
-
-icalproperty*
-icalproperty_new (icalproperty_kind kind)
-{
-    if (kind == ICAL_NO_PROPERTY){
-        return 0;
-    }
-
-    return (icalproperty*)icalproperty_new_impl(kind);
-}
-
-
-icalproperty*
-icalproperty_new_clone(icalproperty* old)
-{
-    icalproperty *new = icalproperty_new_impl(old->kind);
-    pvl_elem p;
-
-    icalerror_check_arg_rz((old!=0),"old");
-    icalerror_check_arg_rz((new!=0),"new");
-
-    if (old->value !=0) {
-	new->value = icalvalue_new_clone(old->value);
-    }
-
-    if (old->x_name != 0) {
-
-	new->x_name = icalmemory_strdup(old->x_name);
-	
-	if (new->x_name == 0) {
-	    icalproperty_free(new);
-	    icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	    return 0;
-	}
-    }
-
-    for(p=pvl_head(old->parameters);p != 0; p = pvl_next(p)){
-	icalparameter *param = icalparameter_new_clone(pvl_data(p));
-	
-	if (param == 0){
-	    icalproperty_free(new);
-	    icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	    return 0;
-	}
-
-	pvl_push(new->parameters,param);
-    
-    } 
-
-    return new;
-
-}
-
-icalproperty* icalproperty_new_from_string(const char* str)
-{
-
-    size_t buf_size = 1024;
-    char* buf = icalmemory_new_buffer(buf_size);
-    char* buf_ptr = buf;  
-    icalproperty *prop;
-    icalcomponent *comp;
-    int errors  = 0;
-
-    icalerror_check_arg_rz( (str!=0),"str");
-
-    /* Is this a HACK or a crafty reuse of code? */
-
-    icalmemory_append_string(&buf, &buf_ptr, &buf_size, "BEGIN:VCALENDAR\n");
-    icalmemory_append_string(&buf, &buf_ptr, &buf_size, str);
-    icalmemory_append_string(&buf, &buf_ptr, &buf_size, "\n");    
-    icalmemory_append_string(&buf, &buf_ptr, &buf_size, "END:VCALENDAR\n");
-
-    comp = icalparser_parse_string(buf);
-
-    if(comp == 0){
-        icalerror_set_errno(ICAL_PARSE_ERROR);
-        return 0;
-    }
-
-    errors = icalcomponent_count_errors(comp);
-
-    prop = icalcomponent_get_first_property(comp,ICAL_ANY_PROPERTY);
-
-    icalcomponent_remove_property(comp,prop);
-
-    icalcomponent_free(comp);
-    free(buf);
-
-    if(errors > 0){
-        icalproperty_free(prop);
-        return 0;
-    } else {
-        return prop;
-    }
-    
-}
-
-void
-icalproperty_free (icalproperty* p)
-{
-    icalparameter* param;
-    
-    icalerror_check_arg_rv((p!=0),"prop");
-
-#ifdef ICAL_FREE_ON_LIST_IS_ERROR
-    icalerror_assert( (p->parent ==0),"Tried to free a property that is still attached to a component. ");
-    
-#else
-    if(p->parent !=0){
-	return;
-    }
-#endif
-
-    if (p->value != 0){
-        icalvalue_set_parent(p->value,0);
-	icalvalue_free(p->value);
-    }
-    
-    while( (param = pvl_pop(p->parameters)) != 0){
-	icalparameter_free(param);
-    }
-    
-    pvl_free(p->parameters);
-    
-    if (p->x_name != 0) {
-	free(p->x_name);
-    }
-    
-    p->kind = ICAL_NO_PROPERTY;
-    p->parameters = 0;
-    p->parameter_iterator = 0;
-    p->value = 0;
-    p->x_name = 0;
-    p->id[0] = 'X';
-    
-    free(p);
-
-}
-
-
-/* This returns where the start of the next line should be. chars_left does
-   not include the trailing '\0'. */
-#define MAX_LINE_LEN 75
-/*#define MAX_LINE_LEN 120*/
-
-static char*
-get_next_line_start (char *line_start, int chars_left)
-{
-    char *pos;
-
-    /* If we have 74 chars or less left, we can output all of them. 
-       we return a pointer to the '\0' at the end of the string. */
-    if (chars_left < MAX_LINE_LEN) {
-        return line_start + chars_left;
-    } 
-
-    /* Now we jump to the last possible character of the line, and step back
-       trying to find a ';' ':' or ' '. If we find one, we return the character
-       after it. */
-    pos = line_start + MAX_LINE_LEN - 2;
-    while (pos > line_start) {
-        if (*pos == ';' || *pos == ':' || *pos == ' ') {
-	    return pos + 1;
-	}
-	pos--;
-    }
-    /* Now try to split on a UTF-8 boundary defined as a 7-bit
-       value or as a byte with the two high-most bits set:
-       11xxxxxx.  See http://czyborra.com/utf/ */
-
-    pos = line_start + MAX_LINE_LEN - 1;
-    while (pos > line_start) {
-        /* plain ascii */
-        if ((*pos & 128) == 0)
-            return pos;
-
-        /* utf8 escape byte */
-        if ((*pos & 192) == 192)
-            return pos;
-
-        pos--;
-    }
-
-    /* Give up, just break at 74 chars (the 75th char is the space at
-       the start of the line).  */
-
-    return line_start + MAX_LINE_LEN - 1;
-}
-
-
-/** This splits the property into lines less than 75 octects long (as
- *  specified in RFC2445). It tries to split after a ';' if it can.
- *  It returns a tmp buffer.  NOTE: I'm not sure if it matters if we
- *  split a line in the middle of a UTF-8 character. It probably won't
- *  look nice in a text editor. 
- */
-static char*
-fold_property_line (char *text)
-{
-    size_t buf_size;
-    char *buf, *buf_ptr, *line_start, *next_line_start, *out_buf;
-    int len, chars_left, first_line;
-    char ch;
-
-    /* Start with a buffer twice the size of our property line, so we almost
-       certainly won't overflow it. */
-    len = strlen (text);
-    buf_size = len * 2;
-    buf = icalmemory_new_buffer (buf_size);
-    buf_ptr = buf;
-
-    /* Step through the text, finding each line to add to the output. */
-    line_start = text;
-    chars_left = len;
-    first_line = 1;
-    for (;;) {
-        if (chars_left <= 0)
-	    break;
-
-        /* This returns the first character for the next line. */
-        next_line_start = get_next_line_start (line_start, chars_left);
-
-	/* If this isn't the first line, we need to output a newline and space
-	   first. */
-	if (!first_line) {
-	    icalmemory_append_string (&buf, &buf_ptr, &buf_size, "\n ");
-	}
-	first_line = 0;
-
-	/* This adds the line to our tmp buffer. We temporarily place a '\0'
-	   in text, so we can copy the line in one go. */
-	ch = *next_line_start;
-	*next_line_start = '\0';
-	icalmemory_append_string (&buf, &buf_ptr, &buf_size, line_start);
-	*next_line_start = ch;
-
-	/* Now we move on to the next line. */
-	chars_left -= (next_line_start - line_start);
-	line_start = next_line_start;
-    }
-
-    /* Copy it to a temporary buffer, and then free it. */
-    out_buf = icalmemory_tmp_buffer (strlen (buf) + 1);
-    strcpy (out_buf, buf);
-    icalmemory_free_buffer (buf);
-
-    return out_buf;
-}
-
-
-/* Determine what VALUE parameter to include. The VALUE parameters
-   are ignored in the normal parameter printing ( the block after
-   this one, so we need to do it here */
-static const char *
-icalproperty_get_value_kind(icalproperty *prop)
-{
-	const char* kind_string = 0;
-
-	icalparameter *orig_val_param
-	    = icalproperty_get_first_parameter(prop,ICAL_VALUE_PARAMETER);
-
-	icalvalue *value = icalproperty_get_value(prop);
-
-	icalvalue_kind orig_kind = ICAL_NO_VALUE;
-
-	icalvalue_kind this_kind = ICAL_NO_VALUE;
-
-	icalvalue_kind default_kind 
-	    =  icalproperty_kind_to_value_kind(prop->kind);
-
-	if(orig_val_param){
-	    orig_kind = (icalvalue_kind)icalparameter_get_value(orig_val_param);
-	}
-
-	if(value != 0){
-	    this_kind = icalvalue_isa(value);
-	}
-	
-	
-	if(this_kind == default_kind &&
-	   orig_kind != ICAL_NO_VALUE){
-	    /* The kind is the default, so it does not need to be
-               included, but do it anyway, since it was explicit in
-               the property. But, use the default, not the one
-               specified in the property */
-	    
-	    kind_string = icalvalue_kind_to_string(default_kind);
-
-	} else if (this_kind != default_kind && this_kind !=  ICAL_NO_VALUE){
-	    /* Not the default, so it must be specified */
-	    kind_string = icalvalue_kind_to_string(this_kind);
-	} else {
-	    /* Don'tinclude the VALUE parameter at all */
-	}
-
-	return kind_string;
-}
-
-const char*
-icalproperty_as_ical_string (icalproperty* prop)
-{   
-    icalparameter *param;
-
-    /* Create new buffer that we can append names, parameters and a
-       value to, and reallocate as needed. Later, this buffer will be
-       copied to a icalmemory_tmp_buffer, which is managed internally
-       by libical, so it can be given to the caller without fear of
-       the caller forgetting to free it */
-
-    const char* property_name = 0; 
-    size_t buf_size = 1024;
-    char* buf = icalmemory_new_buffer(buf_size);
-    char* buf_ptr = buf;
-    icalvalue* value;
-    char *out_buf;
-    const char* kind_string = 0;
-
-    char newline[] = "\n";
-
-    
-    icalerror_check_arg_rz( (prop!=0),"prop");
-
-
-    /* Append property name */
-
-    if (prop->kind == ICAL_X_PROPERTY && prop->x_name != 0){
-	property_name = prop->x_name;
-    } else {
-	property_name = icalproperty_kind_to_string(prop->kind);
-    }
-
-    if (property_name == 0 ) {
-	icalerror_warn("Got a property of an unknown kind.");
-	icalmemory_free_buffer(buf);
-	return 0;
-	
-    }
-
-    icalmemory_append_string(&buf, &buf_ptr, &buf_size, property_name);
-
-    kind_string = icalproperty_get_value_kind(prop);
-    if(kind_string!=0){
-	icalmemory_append_string(&buf, &buf_ptr, &buf_size, ";VALUE=");
-	icalmemory_append_string(&buf, &buf_ptr, &buf_size, kind_string);
-    }
-
-    /* Append parameters */
-    for(param = icalproperty_get_first_parameter(prop,ICAL_ANY_PARAMETER);
-	param != 0; 
-	param = icalproperty_get_next_parameter(prop,ICAL_ANY_PARAMETER)) {
-
-	icalparameter_kind kind = icalparameter_isa(param);
-	kind_string = icalparameter_as_ical_string(param); 
-
-	if(kind==ICAL_VALUE_PARAMETER){
-	    continue;
-	}
-
-	if (kind_string == 0 ) {
-	  icalerror_warn("Got a parameter of unknown kind for the following property");
-
-	  icalerror_warn((property_name) ? property_name : "(NULL)");
-	    continue;
-	}
-
-	icalmemory_append_string(&buf, &buf_ptr, &buf_size, ";");
-    	icalmemory_append_string(&buf, &buf_ptr, &buf_size, kind_string);
-    }    
-
-    /* Append value */
-
-    icalmemory_append_string(&buf, &buf_ptr, &buf_size, ":");
-
-    value = icalproperty_get_value(prop);
-
-    if (value != 0){
-	const char *str = icalvalue_as_ical_string(value);
-	icalerror_assert((str !=0),"Could not get string representation of a value");
-	icalmemory_append_string(&buf, &buf_ptr, &buf_size, str);
-    } else {
-	icalmemory_append_string(&buf, &buf_ptr, &buf_size,"ERROR: No Value"); 
-	
-    }
-    
-    icalmemory_append_string(&buf, &buf_ptr, &buf_size, newline);
-
-    /* Now, copy the buffer to a tmp_buffer, which is safe to give to
-       the caller without worring about de-allocating it. */
-
-    /* We now use a function to fold the line properly every 75 characters. */
-    out_buf = fold_property_line (buf);
-
-    icalmemory_free_buffer(buf);
-
-    return out_buf;
-}
-
-
-
-icalproperty_kind
-icalproperty_isa (icalproperty* p)
-{
-   if(p != 0){
-       return p->kind;
-   }
-
-   return ICAL_NO_PROPERTY;
-}
-
-int
-icalproperty_isa_property (void* property)
-{
-    icalproperty *impl = (icalproperty *) property;
-
-    icalerror_check_arg_rz( (property!=0), "property");
-    if (strcmp(impl->id,"prop") == 0) {
-	return 1;
-    } else {
-	return 0;
-    }
-}
-
-
-void
-icalproperty_add_parameter (icalproperty* p,icalparameter* parameter)
-{
-   icalerror_check_arg_rv( (p!=0),"prop");
-   icalerror_check_arg_rv( (parameter!=0),"parameter");
-    
-   pvl_push(p->parameters, parameter);
-
-}
-
-void
-icalproperty_set_parameter (icalproperty* prop,icalparameter* parameter)
-{
-    icalparameter_kind kind;
-    
-    icalerror_check_arg_rv( (prop!=0),"prop");
-    icalerror_check_arg_rv( (parameter!=0),"parameter");
-
-    kind = icalparameter_isa(parameter);
-    if (kind != ICAL_X_PARAMETER)
-      icalproperty_remove_parameter_by_kind(prop,kind);
-    else
-      icalproperty_remove_parameter_by_name(prop, 
-					    icalparameter_get_xname(parameter));
-
-    icalproperty_add_parameter(prop,parameter);
-}
-
-void icalproperty_set_parameter_from_string(icalproperty* prop,
-                                            const char* name, const char* value)
-{
-
-    icalparameter_kind kind;
-    icalparameter *param;
-
-    icalerror_check_arg_rv( (prop!=0),"prop");
-    icalerror_check_arg_rv( (name!=0),"name");
-    icalerror_check_arg_rv( (value!=0),"value");
-    
-    kind = icalparameter_string_to_kind(name);
-
-    if(kind == ICAL_NO_PARAMETER){
-        icalerror_set_errno(ICAL_BADARG_ERROR);
-        return;
-    }
-    
-    param  = icalparameter_new_from_value_string(kind,value);
-
-    if (param == 0){
-        icalerror_set_errno(ICAL_BADARG_ERROR);
-        return;
-    }
-
-    if(kind == ICAL_X_PARAMETER){
-	icalparameter_set_xname(param, name);
-    }
-
-    icalproperty_set_parameter(prop,param);
-
-}
-
-const char* icalproperty_get_parameter_as_string(icalproperty* prop,
-                                                 const char* name)
-{
-    icalparameter_kind kind;
-    icalparameter *param;
-    char* str;
-    char* pv;
-
-    icalerror_check_arg_rz( (prop!=0),"prop");
-    icalerror_check_arg_rz( (name!=0),"name");
-    
-    kind = icalparameter_string_to_kind(name);
-
-    if(kind == ICAL_NO_PARAMETER){
-        /* icalenum_string_to_parameter_kind will set icalerrno */
-        return 0;
-    }
-    
-    for(param = icalproperty_get_first_parameter(prop,kind); 
-	    param != 0; 
-	    param = icalproperty_get_next_parameter(prop,kind)) {
-	    if (kind != ICAL_X_PARAMETER) {
-		    break;
-	    }
-
-	    if (strcmp(icalparameter_get_xname(param),name)==0) {
-		    break;
-	    }		
-    }
-
-    if (param == 0){
-        return 0;
-    }
-
-
-    str = icalparameter_as_ical_string(param);
-
-    pv = strchr(str,'=');
-
-    if(pv == 0){
-        icalerror_set_errno(ICAL_INTERNAL_ERROR);
-        return 0;
-    }
-
-    return pv+1;
-
-}
-
-/** @see icalproperty_remove_parameter_by_kind() 
- *
- *  @deprecated Please use icalproperty_remove_parameter_by_kind()
- *              instead.
- */
-
-void
-icalproperty_remove_parameter(icalproperty* prop, icalparameter_kind kind)
-{
-  icalproperty_remove_parameter_by_kind(prop, kind);
-}
-
-
-/** @brief Remove all parameters with the specified kind.
- *
- *  @param prop   A valid icalproperty.
- *  @param kind   The kind to remove (ex. ICAL_TZID_PARAMETER)
- *
- *  See icalproperty_remove_parameter_by_name() and
- *  icalproperty_remove_parameter_by_ref() for alternate ways of
- *  removing parameters
- */
-
-void
-icalproperty_remove_parameter_by_kind(icalproperty* prop, icalparameter_kind kind)
-{
-    pvl_elem p;     
-
-    icalerror_check_arg_rv((prop!=0),"prop");
-    
-    for(p=pvl_head(prop->parameters);p != 0; p = pvl_next(p)){
-	icalparameter* param = (icalparameter *)pvl_data (p);
-        if (icalparameter_isa(param) == kind) {
-            pvl_remove (prop->parameters, p);
-	    icalparameter_free(param);
-            break;
-        }
-    }                       
-}
-
-
-/** @brief Remove all parameters with the specified name.
- *
- *  @param prop   A valid icalproperty.
- *  @param name   The name of the parameter to remove
- *
- *  This function removes paramters with the given name.  The name
- *  corresponds to either a built-in name (TZID, etc.) or the name of
- *  an extended parameter (X-FOO)
- *
- *  See icalproperty_remove_parameter_by_kind() and
- *  icalproperty_remove_parameter_by_ref() for alternate ways of removing
- *  parameters
- */
-
-
-void
-icalproperty_remove_parameter_by_name(icalproperty* prop, const char *name)
-{
-    pvl_elem p;     
-
-    icalerror_check_arg_rv((prop!=0),"prop");
-    
-    for(p=pvl_head(prop->parameters);p != 0; p = pvl_next(p)){
-	icalparameter* param = (icalparameter *)pvl_data (p);
-	const char * kind_string;
-
-	if (icalparameter_isa(param) == ICAL_X_PARAMETER)
-	  kind_string = icalparameter_get_xname(param);
-	else
-	  kind_string = icalparameter_kind_to_string(icalparameter_isa(param));
-
-	if (!kind_string)
-	  continue;
-
-        if (0 == strcmp(kind_string, name)) {
-            pvl_remove (prop->parameters, p);
-            break;
-        }
-    }                       
-}
-
-
-/** @brief Remove the specified parameter reference from the property.
- *
- *  @param prop   A valid icalproperty.
- *  @param parameter   A reference to a specific icalparameter.
- *
- *  This function removes the specified parameter reference from the
- *  property.
- */
-
-void
-icalproperty_remove_parameter_by_ref(icalproperty* prop, icalparameter* parameter)
-{
-    pvl_elem p;
-    icalparameter_kind kind;
-    const char *name;
-
-    icalerror_check_arg_rv((prop!=0),"prop");
-    icalerror_check_arg_rv((parameter!=0),"parameter");
-
-    kind = icalparameter_isa(parameter);
-    name = icalparameter_get_xname(parameter);
-
-    /*
-     * FIXME If it's an X- parameter, also compare the names. It would be nice
-     * to have a better abstraction like icalparameter_equals()
-     */
-    for(p=pvl_head(prop->parameters);p != 0; p = pvl_next(p)){
-	icalparameter* p_param = (icalparameter *)pvl_data (p);
-	if (icalparameter_isa(p_param) == kind &&
-	    (kind != ICAL_X_PARAMETER ||
-	    !strcmp(icalparameter_get_xname(p_param), name))) {
-            pvl_remove (prop->parameters, p);
-            icalparameter_free(p_param);
-            break;
-	} 
-    }   
-}
-
-
-int
-icalproperty_count_parameters (const icalproperty* prop)
-{
-    if(prop != 0){
-	return pvl_count(prop->parameters);
-    }
-
-    icalerror_set_errno(ICAL_USAGE_ERROR);
-    return -1;
-}
-
-
-icalparameter*
-icalproperty_get_first_parameter(icalproperty* p, icalparameter_kind kind)
-{
-   icalerror_check_arg_rz( (p!=0),"prop");
-   
-   p->parameter_iterator = pvl_head(p->parameters);
-
-   if (p->parameter_iterator == 0) {
-       return 0;
-   }
-
-   for( p->parameter_iterator = pvl_head(p->parameters);
-	p->parameter_iterator !=0;
-	p->parameter_iterator = pvl_next(p->parameter_iterator)){
-
-       icalparameter *param = (icalparameter*)pvl_data(p->parameter_iterator);
-
-       if(icalparameter_isa(param) == kind || kind == ICAL_ANY_PARAMETER){
-	   return param;
-       }
-   }
-
-   return 0;
-}
-
-
-icalparameter*
-icalproperty_get_next_parameter (icalproperty* p, icalparameter_kind kind)
-{
-    icalerror_check_arg_rz( (p!=0),"prop");
-    
-    if (p->parameter_iterator == 0) {
-	return 0;
-    }
-    
-    for( p->parameter_iterator = pvl_next(p->parameter_iterator);
-	 p->parameter_iterator !=0;
-	 p->parameter_iterator = pvl_next(p->parameter_iterator)){
-	
-	icalparameter *param = (icalparameter*)pvl_data(p->parameter_iterator);
-	
-	if(icalparameter_isa(param) == kind || kind == ICAL_ANY_PARAMETER){
-	    return param;
-	}
-    }
-    
-    return 0;
-
-}
-
-void
-icalproperty_set_value (icalproperty* p, icalvalue* value)
-{
-    icalerror_check_arg_rv((p !=0),"prop");
-    icalerror_check_arg_rv((value !=0),"value");
-    
-    if (p->value != 0){
-	icalvalue_set_parent(p->value,0);
-	icalvalue_free(p->value);
-	p->value = 0;
-    }
-
-    p->value = value;
-    
-    icalvalue_set_parent(value,p);
-}
-
-
-void icalproperty_set_value_from_string(icalproperty* prop,const char* str,
-                                        const char* type)
-{
-    icalvalue *oval,*nval;
-    icalvalue_kind kind = ICAL_NO_VALUE;
-
-    icalerror_check_arg_rv( (prop!=0),"prop"); 
-    icalerror_check_arg_rv( (str!=0),"str");
-    icalerror_check_arg_rv( (type!=0),"type");
-   
-    if(strcmp(type,"NO")==0){
-        /* Get the type from the value the property already has, if it exists */
-        oval = icalproperty_get_value(prop);
-        if(oval != 0){
-            /* Use the existing value kind */
-            kind  = icalvalue_isa(oval);
-        } else {   
-            /* Use the default kind for the property */
-            kind = icalproperty_kind_to_value_kind(icalproperty_isa(prop));
-        }
-    } else {
-        /* Use the given kind string */
-        kind = icalvalue_string_to_kind(type);
-    }
-
-    if(kind == ICAL_NO_VALUE){
-        icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-        return;
-    }
-
-    nval = icalvalue_new_from_string(kind, str);
-
-    if(nval == 0){
-        /* icalvalue_new_from_string sets errno */
-        assert(icalerrno != ICAL_NO_ERROR);
-        return;
-    }
-
-    icalproperty_set_value(prop,nval);
-
-
-}
-
-icalvalue*
-icalproperty_get_value(const icalproperty* prop)
-{
-    icalerror_check_arg_rz( (prop!=0),"prop");
-    
-    return prop->value;
-}
-
-const char* icalproperty_get_value_as_string(const icalproperty* prop)
-{
-    icalvalue *value;
-    
-    icalerror_check_arg_rz( (prop!=0),"prop");
-
-    value = prop->value; 
-
-    return icalvalue_as_ical_string(value);
-}
-
-
-void icalproperty_set_x_name(icalproperty* prop, const char* name)
-{
-    icalerror_check_arg_rv( (name!=0),"name");
-    icalerror_check_arg_rv( (prop!=0),"prop");
-
-    if (prop->x_name != 0) {
-        free(prop->x_name);
-    }
-
-    prop->x_name = icalmemory_strdup(name);
-
-    if(prop->x_name == 0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-    }
-
-}
-                              
-const char* icalproperty_get_x_name(icalproperty* prop){
-    icalerror_check_arg_rz( (prop!=0),"prop");
-
-    return prop->x_name;
-}
-
-
-const char* icalproperty_get_property_name(const icalproperty* prop)
-{
-
-    const char* property_name = 0;
-    size_t buf_size = 256;
-    char* buf = icalmemory_new_buffer(buf_size);
-    char* buf_ptr = buf;  
-
-    icalerror_check_arg_rz( (prop!=0),"prop");
- 
-    if (prop->kind == ICAL_X_PROPERTY && prop->x_name != 0){
-        property_name = prop->x_name;
-    } else {
-        property_name = icalproperty_kind_to_string(prop->kind);
-    }
- 
-    if (property_name == 0 ) {
-        icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-        return 0;
-
-    } else {
-        /* _append_string will automatically grow the buffer if
-           property_name is longer than the initial buffer size */
-        icalmemory_append_string(&buf, &buf_ptr, &buf_size, property_name);
-    }
- 
-    /* Add the buffer to the temporary buffer ring -- the caller will
-       not have to free the memory. */
-    icalmemory_add_tmp_buffer(buf);
- 
-    return buf;
-}
-                            
-
-
-
-void icalproperty_set_parent(icalproperty* property,
-			     icalcomponent* component)
-{
-    icalerror_check_arg_rv( (property!=0),"property");
-    
-    property->parent = component;
-}
-
-icalcomponent* icalproperty_get_parent(const icalproperty* property)
-{
-    icalerror_check_arg_rz( (property!=0),"property");
-
-    return property->parent;
-}
diff --git a/libical/src/libical/icalproperty.h b/libical/src/libical/icalproperty.h
deleted file mode 100644
index 472adb9585..0000000000
--- a/libical/src/libical/icalproperty.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
-  FILE: icalproperty.h
-  CREATOR: eric 20 March 1999
-
-
-  $Id$
-  $Locker$
-
-  
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalparam.h
-
-  ======================================================================*/
-
-
-#ifndef ICALPROPERTY_H
-#define ICALPROPERTY_H
-
-#include <time.h>
-#include <stdarg.h>  /* for va_... */
-
-#include "icalderivedparameter.h"
-
-#include "icalvalue.h"  
-#include "icalrecur.h"
-
-/* Actually in icalderivedproperty.h:
-   typedef struct icalproperty_impl icalproperty; */
-
-#include "icalderivedproperty.h" /* To get icalproperty_kind enumerations */
-
-icalproperty* icalproperty_new(icalproperty_kind kind);
-
-icalproperty* icalproperty_new_clone(icalproperty * prop);
-
-icalproperty* icalproperty_new_from_string(const char* str);
-
-const char* icalproperty_as_ical_string(icalproperty* prop);
-
-void  icalproperty_free(icalproperty* prop);
-
-icalproperty_kind icalproperty_isa(icalproperty* property);
-int icalproperty_isa_property(void* property);
-
-void icalproperty_add_parameters(struct icalproperty_impl *prop,va_list args);
-void icalproperty_add_parameter(icalproperty* prop,icalparameter* parameter);
-void icalproperty_set_parameter(icalproperty* prop,icalparameter* parameter);
-void icalproperty_set_parameter_from_string(icalproperty* prop,
-                                            const char* name, const char* value);
-const char* icalproperty_get_parameter_as_string(icalproperty* prop,
-                                                 const char* name);
-
-void icalproperty_remove_parameter(icalproperty* prop,
-				   icalparameter_kind kind);
-
-void icalproperty_remove_parameter_by_kind(icalproperty* prop,
-					   icalparameter_kind kind);
-
-void icalproperty_remove_parameter_by_name(icalproperty* prop,
-					   const char *name);
-
-void icalproperty_remove_parameter_by_ref(icalproperty* prop,
-					  icalparameter *param);
-
-
-
-int icalproperty_count_parameters(const icalproperty* prop);
-
-/* Iterate through the parameters */
-icalparameter* icalproperty_get_first_parameter(icalproperty* prop,
-						icalparameter_kind kind);
-icalparameter* icalproperty_get_next_parameter(icalproperty* prop,
-						icalparameter_kind kind);
-/* Access the value of the property */
-void icalproperty_set_value(icalproperty* prop, icalvalue* value);
-void icalproperty_set_value_from_string(icalproperty* prop,const char* value, const char* kind);
-
-icalvalue* icalproperty_get_value(const icalproperty* prop);
-const char* icalproperty_get_value_as_string(const icalproperty* prop);
-
-/* Deal with X properties */
-
-void icalproperty_set_x_name(icalproperty* prop, const char* name);
-const char* icalproperty_get_x_name(icalproperty* prop);
-
-/** Return the name of the property -- the type name converted to a
- *  string, or the value of _get_x_name if the type is and X
- *  property 
- */
-const char* icalproperty_get_property_name (const icalproperty* prop);
-
-icalvalue_kind icalparameter_value_to_value_kind(icalparameter_value value);
-
-/* Convert kinds to string and get default value type */
-
-icalvalue_kind icalproperty_kind_to_value_kind(icalproperty_kind kind);
-icalproperty_kind icalproperty_value_kind_to_kind(icalvalue_kind kind);
-const char* icalproperty_kind_to_string(icalproperty_kind kind);
-icalproperty_kind icalproperty_string_to_kind(const char* string);
-
-/** Check validity of a specific icalproperty_kind **/
-int icalproperty_kind_is_valid(const icalproperty_kind kind);
-
-icalproperty_method icalproperty_string_to_method(const char* str);
-const char* icalproperty_method_to_string(icalproperty_method method);
-
-
-const char* icalproperty_enum_to_string(int e);
-int icalproperty_string_to_enum(const char* str);
-int icalproperty_kind_and_string_to_enum(const int kind, const char* str);
-
-const char* icalproperty_status_to_string(icalproperty_status);
-icalproperty_status icalproperty_string_to_status(const char* string);
-
-int icalproperty_enum_belongs_to_property(icalproperty_kind kind, int e);
-
-
-
-
-#endif /*ICALPROPERTY_H*/
diff --git a/libical/src/libical/icalproperty_cxx.cpp b/libical/src/libical/icalproperty_cxx.cpp
deleted file mode 100644
index fcd4de5719..0000000000
--- a/libical/src/libical/icalproperty_cxx.cpp
+++ /dev/null
@@ -1,702 +0,0 @@
-/* -*- Mode: C++ -*- */
-
-/**
- * @file    icalproperty_cxx.cpp
- * @author  fnguyen (12/10/01)
- * @brief   Implementation of C++ Wrapper for icalproperty.c
- *
- * (C) COPYRIGHT 2001, Critical Path
- */
-
-
-#ifndef ICALPROPERTY_CXX_H
-#include "icalproperty_cxx.h"
-#endif
-
-#ifndef ICALPARAMETER_CXX_H
-#include "icalparameter_cxx.h"
-#endif
-
-#ifndef ICALVALUE_CXX_H
-#include "icalvalue_cxx.h"
-#endif
-
-ICalProperty::ICalProperty() : imp(icalproperty_new(ICAL_ANY_PROPERTY)){
-}
-
-ICalProperty::ICalProperty(const ICalProperty& v) throw(icalerrorenum){
-	imp = icalproperty_new_clone(v.imp);
-	if (!imp) throw icalerrno;
-}
-
-ICalProperty& ICalProperty::operator=(const ICalProperty& v) throw(icalerrorenum) {
-	if (this == &v) return *this;
-
-	if (imp != NULL)
-	{
-		icalproperty_free(imp);
-		imp = icalproperty_new_clone(v.imp);
-		if (!imp) throw icalerrno;
-	}
-
-	return *this;
-}
-ICalProperty::~ICalProperty(){
-	if (imp != NULL) icalproperty_free(imp);
-}
-
-ICalProperty::ICalProperty(icalproperty* v) : imp(v) {
-}
-
-ICalProperty::ICalProperty(string str){
-	imp = icalproperty_new_from_string(str);
-}
-
-ICalProperty::ICalProperty(icalproperty_kind kind){
-	imp = icalproperty_new(kind);
-}
-
-string ICalProperty::as_ical_string(){
-	return (string)icalproperty_as_ical_string(imp);
-}
-icalproperty_kind ICalProperty::isa(){
-	return icalproperty_isa(imp);
-}
-int ICalProperty::isa_property(void* property){
-	return icalproperty_isa_property(property);
-}
-
-int ICalProperty::operator==(ICalProperty& rhs){
-	icalparameter_xliccomparetype  result;
-	ICalValue*  thisPropValue = this->get_value();
-	ICalValue*  rhsPropValue  = rhs.get_value();
-	result = icalvalue_compare((icalvalue*)*thisPropValue, (icalvalue*)*rhsPropValue);
-	return (result ==  ICAL_XLICCOMPARETYPE_EQUAL);
-}
-
-void ICalProperty::add_parameter(ICalParameter& parameter){
-	icalproperty_add_parameter(imp, parameter);
-}
-void ICalProperty::set_parameter(ICalParameter &parameter){
-	icalproperty_set_parameter(imp, parameter);
-}
-void ICalProperty::set_parameter_from_string(string name, string val){
-	icalproperty_set_parameter_from_string(imp, name, val);
-}
-string ICalProperty::get_parameter_as_string(string name){
-	return (string)icalproperty_get_parameter_as_string(imp, name);
-}
-void ICalProperty::remove_parameter(icalparameter_kind kind){
-	icalproperty_remove_parameter(imp, kind);
-}
-int ICalProperty::count_parameters(){
-	return icalproperty_count_parameters(imp);
-}
-
-/** Iterate through the parameters */
-ICalParameter* ICalProperty::get_first_parameter(icalparameter_kind kind){
-	return new ICalParameter(icalproperty_get_first_parameter(imp, kind));
-}
-ICalParameter* ICalProperty::get_next_parameter(icalparameter_kind kind){
-	return new ICalParameter(icalproperty_get_next_parameter(imp, kind));
-}
-
-/** Access the value of the property */
-void ICalProperty::set_value(const ICalValue& val){
-	icalproperty_set_value(imp, (ICalValue&)val);
-}
-void ICalProperty::set_value_from_string(string val, string kind){
-	icalproperty_set_value_from_string(imp, val, kind);
-}
-
-ICalValue* ICalProperty::get_value(){
-	return new ICalValue(icalproperty_get_value(imp));
-}
-string ICalProperty::get_value_as_string(){
-	return (string)icalproperty_get_value_as_string(imp);
-}
-
-/** Return the name of the property -- the type name converted to a
- *  string, or the value of get_x_name if the type is X property
- */
-string ICalProperty::get_name(){
-	return (string)icalproperty_get_property_name(imp);
-}
-
-/* Deal with X properties */
-void ICalProperty::set_x_name(ICalProperty &prop, string name){
-	icalproperty_set_x_name(prop, name);
-}
-string ICalProperty::get_x_name(ICalProperty &prop){
-	return (string)icalproperty_get_x_name(prop);
-}
-
-icalvalue_kind ICalProperty::icalparameter_value_to_value_kind(icalparameter_value val){
-	return icalparameter_value_to_value_kind(val);
-}
-
-/* Convert kinds to string and get default value type */
-icalvalue_kind ICalProperty::kind_to_value_kind(icalproperty_kind kind){
-	return icalproperty_kind_to_value_kind(kind);
-}
-icalproperty_kind ICalProperty::value_kind_to_kind(icalvalue_kind kind){
-	return icalproperty_value_kind_to_kind(kind);
-}
-string ICalProperty::kind_to_string(icalproperty_kind kind){
-	return (string)icalproperty_kind_to_string(kind);
-}
-icalproperty_kind ICalProperty::string_to_kind(string str){
-	return icalproperty_string_to_kind(str);
-}
-
-string ICalProperty::method_to_string(icalproperty_method method){
-	return (string)icalproperty_method_to_string(method);
-}
-icalproperty_method ICalProperty::string_to_method(string str){
-	return icalproperty_string_to_method(str);
-}
-
-string ICalProperty::enum_to_string(int e){
-	return (string)icalproperty_enum_to_string(e);
-}
-int ICalProperty::string_to_enum(string str){
-	return icalproperty_string_to_enum(str);
-}
-
-string ICalProperty::status_to_string(icalproperty_status s){
-	return (string)icalproperty_status_to_string(s);
-}
-icalproperty_status ICalProperty::string_to_status(string str){
-	return icalproperty_string_to_status(str);
-}
-
-int ICalProperty::enum_belongs_to_property(icalproperty_kind kind, int e){
-	return icalproperty_enum_belongs_to_property(kind, e);
-}
-
-/* ACTION */
-void ICalProperty::set_action(enum icalproperty_action val){
-	icalproperty_set_action(imp, val);
-}
-enum icalproperty_action ICalProperty::get_action(){
-	return icalproperty_get_action(imp);
-}
-
-/* ATTACH */
-void ICalProperty::set_attach(icalattach *val){
-	icalproperty_set_attach(imp, val);
-}
-icalattach * ICalProperty::get_attach(){
-	return icalproperty_get_attach(imp);
-}
-
-/* ATTENDEE */
-void ICalProperty::set_attendee(string val){
-	icalproperty_set_attendee(imp, val);
-}
-string ICalProperty::get_attendee(){
-	return (string)icalproperty_get_attendee(imp);
-}
-
-/* CALSCALE */
-void ICalProperty::set_calscale(string val){
-	icalproperty_set_calscale(imp, val);
-}
-string ICalProperty::get_calscale(){
-	return (string)icalproperty_get_calscale(imp);
-}
-
-/* CATEGORIES */
-void ICalProperty::set_categories(string val){
-	icalproperty_set_categories(imp, val);
-}
-string ICalProperty::get_categories(){
-	return (string)icalproperty_get_categories(imp);
-}
-
-/* CLASS */
-void ICalProperty::set_class(enum icalproperty_class val){
-	icalproperty_set_class(imp, val);
-}
-enum icalproperty_class ICalProperty::get_class(){
-	return (enum icalproperty_class)icalproperty_get_class(imp);
-}
-
-/* COMMENT */
-void ICalProperty::set_comment(string val){
-	icalproperty_set_comment(imp, val);
-}
-string ICalProperty::get_comment(){
-	return (string)icalproperty_get_comment(imp);
-}
-
-/* COMPLETED */
-void ICalProperty::set_completed(struct icaltimetype val){
-	icalproperty_set_completed(imp, val);
-}
-struct icaltimetype ICalProperty::get_completed(){
-	return icalproperty_get_completed(imp);
-}
-
-/* CONTACT */
-void ICalProperty::set_contact(string val){
-	icalproperty_set_contact(imp, val);
-}
-string ICalProperty::get_contact(){
-	return (string)icalproperty_get_contact(imp);
-}
-
-/* CREATED */
-void ICalProperty::set_created(struct icaltimetype val){
-	icalproperty_set_created(imp, val);
-}
-struct icaltimetype ICalProperty::get_created(){
-	return icalproperty_get_created(imp);
-}
-
-/* DESCRIPTION */
-void ICalProperty::set_description(string val){
-	icalproperty_set_description(imp, val);
-}
-string ICalProperty::get_description(){
-	return (string)icalproperty_get_description(imp);
-}
-
-/* DTEND */
-void ICalProperty::set_dtend(struct icaltimetype val){
-	icalproperty_set_dtend(imp, val);
-}
-struct icaltimetype ICalProperty::get_dtend(){
-	return icalproperty_get_dtend(imp);
-}
-
-/* DTSTAMP */
-void ICalProperty::set_dtstamp(struct icaltimetype val){
-	icalproperty_set_dtstamp(imp, val);
-}
-struct icaltimetype ICalProperty::get_dtstamp(){
-	return icalproperty_get_dtstamp(imp);
-}
-
-/* DTSTART */
-void ICalProperty::set_dtstart(struct icaltimetype val){
-	icalproperty_set_dtstart(imp, val);
-}
-struct icaltimetype ICalProperty::get_dtstart(){
-	return icalproperty_get_dtstart(imp);
-}
-
-/* DUE */
-void ICalProperty::set_due(struct icaltimetype val){
-	icalproperty_set_due(imp, val);
-}
-struct icaltimetype ICalProperty::get_due(){
-	return icalproperty_get_due(imp);
-}
-
-/* DURATION */
-void ICalProperty::set_duration(struct icaldurationtype val){
-	icalproperty_set_duration(imp, val);
-}
-struct icaldurationtype ICalProperty::get_duration(){
-	return icalproperty_get_duration(imp);
-}
-
-/* EXDATE */
-void ICalProperty::set_exdate(struct icaltimetype val){
-	icalproperty_set_exdate(imp, val);
-}
-struct icaltimetype ICalProperty::get_exdate(){
-	return icalproperty_get_exdate(imp);
-}
-
-/* EXPAND */
-void ICalProperty::set_expand(int val){
-        icalproperty_set_expand(imp, val);
-}
-int ICalProperty::get_expand(){
-        return icalproperty_get_expand(imp);
-}
-
-/* EXRULE */
-void ICalProperty::set_exrule(struct icalrecurrencetype val){
-	icalproperty_set_exrule(imp, val);
-}
-struct icalrecurrencetype ICalProperty::get_exrule(){
-	return icalproperty_get_exrule(imp);
-}
-
-/* FREEBUSY */
-void ICalProperty::set_freebusy(struct icalperiodtype val){
-	icalproperty_set_freebusy(imp, val);
-}
-struct icalperiodtype ICalProperty::get_freebusy(){
-	return icalproperty_get_freebusy(imp);
-}
-
-/* GEO */
-void ICalProperty::set_geo(struct icalgeotype val){
-	icalproperty_set_geo(imp, val);
-}
-struct icalgeotype ICalProperty::get_geo(){
-	return icalproperty_get_geo(imp);
-}
-
-/* LAST-MODIFIED */
-void ICalProperty::set_lastmodified(struct icaltimetype val){
-	icalproperty_set_lastmodified(imp, val);
-}
-struct icaltimetype ICalProperty::get_lastmodified(){
-	return icalproperty_get_lastmodified(imp);
-}
-
-/* LOCATION */
-void ICalProperty::set_location(string val){
-	icalproperty_set_location(imp, val);
-}
-string ICalProperty::get_location(){
-	return (string)icalproperty_get_location(imp);
-}
-
-/* MAXRESULTS */
-void ICalProperty::set_maxresults(int val){
-	icalproperty_set_maxresults(imp, val);
-}
-int ICalProperty::get_maxresults(){
-	return icalproperty_get_maxresults(imp);
-}
-
-/* MAXRESULTSSIZE */
-void ICalProperty::set_maxresultsize(int val){
-	icalproperty_set_maxresultssize(imp, val);
-}
-int ICalProperty::get_maxresultsize(){
-	return icalproperty_get_maxresultssize(imp);
-}
-
-/* METHOD */
-void ICalProperty::set_method(enum icalproperty_method val){
-	icalproperty_set_method(imp, val);
-}
-enum icalproperty_method ICalProperty::get_method(){
-	return icalproperty_get_method(imp);
-}
-
-/* ORGANIZER */
-void ICalProperty::set_organizer(string val){
-	icalproperty_set_organizer(imp, val);
-}
-string ICalProperty::get_organizer(){
-	return (string)icalproperty_get_organizer(imp);
-}
-
-/* OWNER */
-void ICalProperty::set_owner(string val){
-	icalproperty_set_owner(imp, val);
-}
-string ICalProperty::get_owner(){
-	return (string)icalproperty_get_owner(imp);
-}
-
-/* PERCENT-COMPLETE */
-void ICalProperty::set_percentcomplete(int val){
-	icalproperty_set_percentcomplete(imp, val);
-}
-int ICalProperty::get_percentcomplete(){
-	return icalproperty_get_percentcomplete(imp);
-}
-
-/* PRIORITY */
-void ICalProperty::set_priority(int val){
-	icalproperty_set_priority(imp, val);
-}
-int ICalProperty::get_priority(){
-	return icalproperty_get_priority(imp);
-}
-
-/* PRODID */
-void ICalProperty::set_prodid(string val){
-	icalproperty_set_prodid(imp, val);
-}
-string ICalProperty::get_prodid(){
-	return (string)icalproperty_get_prodid(imp);
-}
-
-/* QUERY */
-void ICalProperty::set_query(string val){
-	icalproperty_set_query(imp, val);
-}
-string ICalProperty::get_query(){
-	return (string)icalproperty_get_query(imp);
-}
-
-/* QUERYNAME */
-void ICalProperty::set_queryname(string val){
-	icalproperty_set_queryname(imp, val);
-}
-string ICalProperty::get_queryname(){
-	return (string)icalproperty_get_queryname(imp);
-}
-
-/* RDATE */
-void ICalProperty::set_rdate(struct icaldatetimeperiodtype val){
-	icalproperty_set_rdate(imp, val);
-}
-struct icaldatetimeperiodtype ICalProperty::get_rdate(){
-	return icalproperty_get_rdate(imp);
-}
-
-/* RECURRENCE-ID */
-void ICalProperty::set_recurrenceid(struct icaltimetype val){
-	icalproperty_set_recurrenceid(imp, val);
-}
-struct icaltimetype ICalProperty::get_recurrenceid(){
-	return icalproperty_get_recurrenceid(imp);
-}
-
-/* RELATED-TO */
-void ICalProperty::set_relatedto(string val){
-	icalproperty_set_relatedto(imp, val);
-}
-string ICalProperty::get_relatedto(){
-	return (string)icalproperty_get_relatedto(imp);
-}
-
-/* RELCALID */
-void ICalProperty::set_relcalid(string val){
-        icalproperty_set_relcalid(imp, val);
-}
-string ICalProperty::get_relcalid(){
-        return (string)icalproperty_get_relcalid(imp);
-}
-
-/* REPEAT */
-void ICalProperty::set_repeat(int val){
-	icalproperty_set_repeat(imp, val);
-}
-int ICalProperty::get_repeat(){
-	return icalproperty_get_repeat(imp);
-}
-
-/* REQUEST-STATUS */
-void ICalProperty::set_requeststatus(string val){
-  icalreqstattype v;
-  
-  v = icalreqstattype_from_string((char*)val);
-
-  icalproperty_set_requeststatus(imp, v);
-}
-
-string ICalProperty::get_requeststatus(){
-  icalreqstattype v;
-  v =   icalproperty_get_requeststatus(imp);
-  return (string)(icalreqstattype_as_string(v));
-}
-
-/* RESOURCES */
-void ICalProperty::set_resources(string val){
-	icalproperty_set_resources(imp, val);
-}
-string ICalProperty::get_resources(){
-	return (string)icalproperty_get_resources(imp);
-}
-
-/* RRULE */
-void ICalProperty::set_rrule(struct icalrecurrencetype val){
-	icalproperty_set_rrule(imp, val);
-}
-struct icalrecurrencetype ICalProperty::get_rrule(){
-	return icalproperty_get_rrule(imp);
-}
-
-/* SCOPE */
-void ICalProperty::set_scope(string val){
-	icalproperty_set_scope(imp, val);
-}
-string ICalProperty::get_scope(){
-	return (string)icalproperty_get_scope(imp);
-}
-
-/* SEQUENCE */
-void ICalProperty::set_sequence(int val){
-	icalproperty_set_sequence(imp, val);
-}
-int ICalProperty::get_sequence(){
-	return icalproperty_get_sequence(imp);
-}
-
-/* STATUS */
-void ICalProperty::set_status(enum icalproperty_status val){
-	icalproperty_set_status(imp, val);
-}
-enum icalproperty_status ICalProperty::get_status(){
-	return icalproperty_get_status(imp);
-}
-
-/* SUMMARY */
-void ICalProperty::set_summary(string val){
-	icalproperty_set_summary(imp, val);
-}
-string ICalProperty::get_summary(){
-	return (string)icalproperty_get_summary(imp);
-}
-
-/* TARGET */
-void ICalProperty::set_target(string val){
-	icalproperty_set_target(imp, val);
-}
-string ICalProperty::get_target(){
-	return (string)icalproperty_get_target(imp);
-}
-
-/* TRANSP */
-void ICalProperty::set_transp(enum icalproperty_transp val){
-	icalproperty_set_transp(imp, val);
-}
-enum icalproperty_transp ICalProperty::get_transp(){
-	return icalproperty_get_transp(imp);
-}
-
-/* TRIGGER */
-void ICalProperty::set_trigger(struct icaltriggertype val){
-	icalproperty_set_trigger(imp, val);
-}
-struct icaltriggertype ICalProperty::get_trigger(){
-	return icalproperty_get_trigger(imp);
-}
-
-/* TZID */
-void ICalProperty::set_tzid(string val){
-	icalproperty_set_tzid(imp, val);
-}
-string ICalProperty::get_tzid(){
-	return (string)icalproperty_get_tzid(imp);
-}
-
-/* TZNAME */
-void ICalProperty::set_tzname(string val){
-	icalproperty_set_tzname(imp, val);
-}
-string ICalProperty::get_tzname(){
-	return (string)icalproperty_get_tzname(imp);
-}
-
-/* TZOFFSETFROM */
-void ICalProperty::set_tzoffsetfrom(int val){
-	icalproperty_set_tzoffsetfrom(imp, val);
-}
-int ICalProperty::get_tzoffsetfrom(){
-	return icalproperty_get_tzoffsetfrom(imp);
-}
-
-/* TZOFFSETTO */
-void ICalProperty::set_tzoffsetto(int val){
-	icalproperty_set_tzoffsetto(imp, val);
-}
-int ICalProperty::get_tzoffsetto(){
-	return icalproperty_get_tzoffsetto(imp);
-}
-
-/* TZURL */
-void ICalProperty::set_tzurl(string val){
-	icalproperty_set_tzurl(imp, val);
-}
-string ICalProperty::get_tzurl(){
-	return (string)icalproperty_get_tzurl(imp);
-}
-
-/* UID */
-void ICalProperty::set_uid(string val){
-	icalproperty_set_uid(imp, val);
-}
-string ICalProperty::get_uid(){
-	return (string)icalproperty_get_uid(imp);
-}
-
-/* URL */
-void ICalProperty::set_url(string val){
-	icalproperty_set_url(imp, val);
-}
-string ICalProperty::get_url(){
-	return (string)icalproperty_get_url(imp);
-}
-
-/* VERSION */
-void ICalProperty::set_version(string val){
-	icalproperty_set_version(imp, val);
-}
-string ICalProperty::get_version(){
-	return (string)icalproperty_get_version(imp);
-}
-
-/* X */
-void ICalProperty::set_x(string val){
-	icalproperty_set_x(imp, val);
-}
-string ICalProperty::get_x(){
-	return (string)icalproperty_get_x(imp);
-}
-
-/* X-LIC-CLUSTERCOUNT */
-void ICalProperty::set_xlicclustercount(string val){
-	icalproperty_set_xlicclustercount(imp, val);
-}
-string ICalProperty::get_xlicclustercount(){
-	return (string)icalproperty_get_xlicclustercount(imp);
-}
-
-/* X-LIC-ERROR */
-void ICalProperty::set_xlicerror(string val){
-	icalproperty_set_xlicerror(imp, val);
-}
-string ICalProperty::get_xlicerror(){
-	return (string)icalproperty_get_xlicerror(imp);
-}
-
-/* X-LIC-MIMECHARSET */
-void ICalProperty::set_xlicmimecharset(string val){
-	icalproperty_set_xlicmimecharset(imp, val);
-}
-string ICalProperty::get_xlicmimecharset(){
-	return (string)icalproperty_get_xlicmimecharset(imp);
-}
-
-/* X-LIC-MIMECID */
-void ICalProperty::set_xlicmimecid(string val){
-	icalproperty_set_xlicmimecid(imp, val);
-}
-string ICalProperty::get_xlicmimecid(){
-	return (string)icalproperty_get_xlicmimecid(imp);
-}
-
-/* X-LIC-MIMECONTENTTYPE */
-void ICalProperty::set_xlicmimecontenttype(string val){
-	icalproperty_set_xlicmimecontenttype(imp, val);
-}
-string ICalProperty::get_xlicmimecontenttype(){
-	return (string)icalproperty_get_xlicmimecontenttype(imp);
-}
-
-/* X-LIC-MIMEENCODING */
-void ICalProperty::set_xlicmimeencoding(string val){
-	icalproperty_set_xlicmimeencoding(imp, val);
-}
-string ICalProperty::get_xlicmimeencoding(){
-	return (string)icalproperty_get_xlicmimeencoding(imp);
-}
-
-/* X-LIC-MIMEFILENAME */
-void ICalProperty::set_xlicmimefilename(string val){
-	icalproperty_set_xlicmimefilename(imp, val);
-}
-string ICalProperty::get_xlicmimefilename(){
-	return (string)icalproperty_get_xlicmimefilename(imp);
-}
-
-/* X-LIC-MIMEOPTINFO */
-void ICalProperty::set_xlicmimeoptinfo(string val){
-	icalproperty_set_xlicmimeoptinfo(imp, val);
-}
-string ICalProperty::get_xlicmimeoptinfo(){
-	return (string)icalproperty_get_xlicmimeoptinfo(imp);
-}
diff --git a/libical/src/libical/icalproperty_cxx.h b/libical/src/libical/icalproperty_cxx.h
deleted file mode 100644
index 27b0fd1a65..0000000000
--- a/libical/src/libical/icalproperty_cxx.h
+++ /dev/null
@@ -1,365 +0,0 @@
-/* -*- Mode: C++ -*- */
-
-/**
- * @file    icalproperty_cxx.h
- * @author  fnguyen (12/10/01)
- * @brief   Definition of C++ Wrapper for icalproperty.c
- *
- * (C) COPYRIGHT 2001, Critical Path
- */
-
-#ifndef ICALPROPERTY_CXX_H
-#define ICALPROPERTY_CXX_H
-
-#include "ical.h"
-#include "icptrholder.h"
-
-typedef	char* string; // Will use the string library from STL
-
-class ICalParameter;
-class ICalValue;
-
-class ICalProperty {
-public:
-	ICalProperty();
-	ICalProperty(const ICalProperty&) throw(icalerrorenum);
-	ICalProperty& operator=(const ICalProperty&) throw(icalerrorenum);
-	~ICalProperty();
-
-	ICalProperty(icalproperty* v);
-	ICalProperty(string str);
-	ICalProperty(icalproperty_kind kind);
-	ICalProperty(icalproperty_kind kind, string str);
-
-	operator icalproperty*() {return imp;}
-        int operator==(ICalProperty& rhs);
-
-	void detach() {
-	    imp = NULL;
-	}
-
-public:
-	string as_ical_string();
-	icalproperty_kind isa();
-	int isa_property(void* property);
-
-	void add_parameter(ICalParameter& parameter);
-	void set_parameter(ICalParameter& parameter);
-	void set_parameter_from_string(string name, string val);
-	string get_parameter_as_string(string name);
-	void remove_parameter(icalparameter_kind kind);
-	int count_parameters();
-
-	/** Iterate through the parameters */
-	ICalParameter* get_first_parameter(icalparameter_kind kind);
-	ICalParameter* get_next_parameter(icalparameter_kind kind);
-
-	/** Access the value of the property */
-	void set_value(const ICalValue& val);
-	void set_value_from_string(string val, string kind);
-
-	ICalValue* get_value();
-	string get_value_as_string();
-
-	/** Return the name of the property -- the type name converted
-	 *  to a string, or the value of get_x_name if the type is X
-	 *  property
-	*/
-	string get_name();
-
-public:
-	/* Deal with X properties */
-	static void set_x_name(ICalProperty &prop, string name);
-	static string get_x_name(ICalProperty &prop);
-
-	static icalvalue_kind icalparameter_value_to_value_kind(icalparameter_value val);
-
-	/* Convert kinds to string and get default value type */
-	static icalvalue_kind kind_to_value_kind(icalproperty_kind kind);
-	static icalproperty_kind value_kind_to_kind(icalvalue_kind kind);
-	static string kind_to_string(icalproperty_kind kind);
-	static icalproperty_kind string_to_kind(string str);
-
-	static icalproperty_method string_to_method(string str);
-	static string method_to_string(icalproperty_method method);
-
-	static string enum_to_string(int e);
-	static int string_to_enum(string str);
-
-	static string status_to_string(icalproperty_status);
-	static icalproperty_status string_to_status(string str);
-
-	static int enum_belongs_to_property(icalproperty_kind kind, int e);
-
-public:
-	/* ACTION */
-	void set_action(enum icalproperty_action v);
-	enum icalproperty_action get_action();
-
-	/* ATTACH */
-	void set_attach(icalattach *v);
-	icalattach *get_attach();
-
-	/* ATTENDEE */
-	void set_attendee(string val);
-	string get_attendee();
-
-	/* CALSCALE */
-	void set_calscale(string val);
-	string get_calscale();
-
-	/* CATEGORIES */
-	void set_categories(string val);
-	string get_categories();
-
-	/* CLASS */
-	void set_class(enum icalproperty_class val);
-	enum icalproperty_class get_class();
-
-	/* COMMENT */
-	void set_comment(string val);
-	string get_comment();
-
-	/* COMPLETED */
-	void set_completed(struct icaltimetype val);
-	struct icaltimetype get_completed();
-
-	/* CONTACT */
-	void set_contact(string val);
-	string get_contact();
-
-	/* CREATED */
-	void set_created(struct icaltimetype val);
-	struct icaltimetype get_created();
-
-	/* DESCRIPTION */
-	void set_description(string val);
-	string get_description();
-
-	/* DTEND */
-	void set_dtend(struct icaltimetype val);
-	struct icaltimetype get_dtend();
-
-	/* DTSTAMP */
-	void set_dtstamp(struct icaltimetype val);
-	struct icaltimetype get_dtstamp();
-
-	/* DTSTART */
-	void set_dtstart(struct icaltimetype val);
-	struct icaltimetype get_dtstart();
-
-	/* DUE */
-	void set_due(struct icaltimetype val);
-	struct icaltimetype get_due();
-
-	/* DURATION */
-	void set_duration(struct icaldurationtype val);
-	struct icaldurationtype get_duration();
-
-	/* EXDATE */
-	void set_exdate(struct icaltimetype val);
-	struct icaltimetype get_exdate();
-
-	/* EXPAND */
-	void set_expand(int val);
-	int get_expand();
-
-	/* EXRULE */
-	void set_exrule(struct icalrecurrencetype val);
-	struct icalrecurrencetype get_exrule();
-
-	/* FREEBUSY */
-	void set_freebusy(struct icalperiodtype val);
-	struct icalperiodtype get_freebusy();
-
-	/* GEO */
-	void set_geo(struct icalgeotype val);
-	struct icalgeotype get_geo();
-
-	/* GRANT */
-	void set_grant(string val);
-	string get_grant();
-
-	/* LAST-MODIFIED */
-	void set_lastmodified(struct icaltimetype val);
-	struct icaltimetype get_lastmodified();
-
-	/* LOCATION */
-	void set_location(string val);
-	string get_location();
-
-	/* MAXRESULTS */
-	void set_maxresults(int val);
-	int get_maxresults();
-
-	/* MAXRESULTSSIZE */
-	void set_maxresultsize(int val);
-	int get_maxresultsize();
-
-	/* METHOD */
-	void set_method(enum icalproperty_method val);
-	enum icalproperty_method get_method();
-
-	/* OWNER */
-	void set_owner(string val);
-	string get_owner();
-
-	/* ORGANIZER */
-	void set_organizer(string val);
-	string get_organizer();
-
-	/* PERCENT-COMPLETE */
-	void set_percentcomplete(int val);
-	int get_percentcomplete();
-
-	/* PRIORITY */
-	void set_priority(int val);
-	int get_priority();
-
-	/* PRODID */
-	void set_prodid(string val);
-	string get_prodid();
-
-	/* QUERY */
-	void set_query(string val);
-	string get_query();
-
-	/* QUERYNAME */
-	void set_queryname(string val);
-	string get_queryname();
-
-	/* RDATE */
-	void set_rdate(struct icaldatetimeperiodtype val);
-	struct icaldatetimeperiodtype get_rdate();
-
-	/* RECURRENCE-ID */
-	void set_recurrenceid(struct icaltimetype val);
-	struct icaltimetype get_recurrenceid();
-
-	/* RELATED-TO */
-	void set_relatedto(string val);
-	string get_relatedto();
-
-        /* RELCALID */
-        void set_relcalid(string val);
-        string get_relcalid();
-
-	/* REPEAT */
-	void set_repeat(int val);
-	int get_repeat();
-
-	/* REQUEST-STATUS */
-	void set_requeststatus(string val);
-	string get_requeststatus();
-
-	/* RESOURCES */
-	void set_resources(string val);
-	string get_resources();
-
-	/* RRULE */
-	void set_rrule(struct icalrecurrencetype val);
-	struct icalrecurrencetype get_rrule();
-
-	/* SCOPE */
-	void set_scope(string val);
-	string get_scope();
-
-	/* SEQUENCE */
-	void set_sequence(int val);
-	int get_sequence();
-
-	/* STATUS */
-	void set_status(enum icalproperty_status val);
-	enum icalproperty_status get_status();
-
-	/* SUMMARY */
-	void set_summary(string val);
-	string get_summary();
-
-	/* TARGET */
-	void set_target(string val);
-	string get_target();
-
-	/* TRANSP */
-	void set_transp(enum icalproperty_transp val);
-	enum icalproperty_transp get_transp();
-
-	/* TRIGGER */
-	void set_trigger(struct icaltriggertype val);
-	struct icaltriggertype get_trigger();
-
-	/* TZID */
-	void set_tzid(string val);
-	string get_tzid();
-
-	/* TZNAME */
-	void set_tzname(string val);
-	string get_tzname();
-
-	/* TZOFFSETFROM */
-	void set_tzoffsetfrom(int val);
-	int get_tzoffsetfrom();
-
-	/* TZOFFSETTO */
-	void set_tzoffsetto(int val);
-	int get_tzoffsetto();
-
-	/* TZURL */
-	void set_tzurl(string val);
-	string get_tzurl();
-
-	/* UID */
-	void set_uid(string val);
-	string get_uid();
-
-	/* URL */
-	void set_url(string val);
-	string get_url();
-
-	/* VERSION */
-	void set_version(string val);
-	string get_version();
-
-	/* X */
-	void set_x(string val);
-	string get_x();
-
-	/* X-LIC-CLUSTERCOUNT */
-	void set_xlicclustercount(string val);
-	string get_xlicclustercount();
-
-	/* X-LIC-ERROR */
-	void set_xlicerror(string val);
-	string get_xlicerror();
-
-	/* X-LIC-MIMECHARSET */
-	void set_xlicmimecharset(string val);
-	string get_xlicmimecharset();
-
-	/* X-LIC-MIMECID */
-	void set_xlicmimecid(string val);
-	string get_xlicmimecid();
-
-	/* X-LIC-MIMECONTENTTYPE */
-	void set_xlicmimecontenttype(string val);
-	string get_xlicmimecontenttype();
-
-	/* X-LIC-MIMEENCODING */
-	void set_xlicmimeencoding(string val);
-	string get_xlicmimeencoding();
-
-	/* X-LIC-MIMEFILENAME */
-	void set_xlicmimefilename(string val);
-	string get_xlicmimefilename();
-
-	/* X-LIC-MIMEOPTINFO */
-	void set_xlicmimeoptinfo(string val);
-	string get_xlicmimeoptinfo();
-
-private:
-  icalproperty* imp; /**< The actual C based icalproperty */
-};
-
-typedef ICPointerHolder<ICalProperty> ICalPropertyTmpPtr;   /* see icptrholder.h for comments */
-
-#endif /* ICalProperty_H */
diff --git a/libical/src/libical/icalrecur.c b/libical/src/libical/icalrecur.c
deleted file mode 100644
index 5c687fc6f3..0000000000
--- a/libical/src/libical/icalrecur.c
+++ /dev/null
@@ -1,2458 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalrecur.c
-  CREATOR: eric 16 May 2000
-  
-  $Id$
-  $Locker$
-    
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-*/
-
-/**
-  @file icalrecur.c
-  @brief Implementation of routines for dealing with recurring time
-
-  How this code works:
-
-  Processing starts when the caller generates a new recurrence
-  iterator via icalrecur_iterator_new(). This routine copies the
-  recurrence rule into the iterator and extracts things like start and
-  end dates. Then, it checks if the rule is legal, using some logic
-  from RFC2445 and some logic that probably should be in RFC2445.
-
-  Then, icalrecur_iterator_new() re-writes some of the BY*
-  arrays. This involves ( via a call to setup_defaults() ) :
-
-  1) For BY rule parts with no data ( ie BYSECOND was not specified )
-  copy the corresponding time part from DTSTART into the BY array. (
-  So impl->by_ptrs[BY_SECOND] will then have one element if is
-  originally had none ) This only happens if the BY* rule part data
-  would expand the number of occurrences in the occurrence set. This
-  lets the code ignore DTSTART later on and still use it to get the
-  time parts that were not specified in any other way.
-  
-  2) For the by rule part that are not the same interval as the
-  frequency -- for HOURLY anything but BYHOUR, for instance -- copy the
-  first data element from the rule part into the first occurrence. For
-  example, for "INTERVAL=MONTHLY and BYHOUR=10,30", initialize the
-  first time to be returned to have an hour of 10.
-
-  Finally, for INTERVAL=YEARLY, the routine expands the rule to get
-  all of the days specified in the rule. The code will do this for
-  each new year, and this is the first expansion. This is a special
-  case for the yearly interval; no other frequency gets expanded this
-  way. The yearly interval is the most complex, so some special
-  processing is required.
-
-  After creating a new iterator, the caller will make successive calls
-  to icalrecur_iterator_next() to get the next time specified by the
-  rule. The main part of this routine is a switch on the frequency of
-  the rule. Each different frequency is handled by a different
-  routine. 
-
-  For example, next_hour handles the case of INTERVAL=HOURLY, and it
-  is called by other routines to get the next hour. First, the routine
-  tries to get the next minute part of a time with a call to
-  next_minute(). If next_minute() returns 1, it has reached the end of
-  its data, usually the last element of the BYMINUTE array. Then, if
-  there is data in the BYHOUR array, the routine changes the hour to
-  the next one in the array. If INTERVAL=HOURLY, the routine advances
-  the hour by the interval.
-
-  If the routine used the last hour in the BYHOUR array, and the
-  INTERVAL=HOURLY, then the routine calls increment_monthday() to set
-  the next month day. The increment_* routines may call higher routine
-  to increment the month or year also.
-
-  The code for INTERVAL=DAILY is handled by next_day(). First, the
-  routine tries to get the next hour part of a time with a call to
-  next_hour. If next_hour() returns 1, it has reached the end of its
-  data, usually the last element of the BYHOUR array. This means that
-  next_day() should increment the time to the next day. If FREQUENCY==DAILY,
-  the routine increments the day by the interval; otherwise, it
-  increments the day by 1.
-
-  Next_day() differs from next_hour because it does not use the BYDAY
-  array to select an appropriate day. Instead, it returns every day (
-  incrementing by 1 if the frequency is not DAILY with INTERVAL!=1)
-  Any days that are not specified in an non-empty BYDAY array are
-  filtered out later.
-
-  Generally, the flow of these routine is for a next_* call a next_*
-  routine of a lower interval ( next_day calls next_hour) and then to
-  possibly call an increment_* routine of an equal or higher
-  interval. ( next_day calls increment_monthday() )
-
-  When the call to the original next_* routine returns,
-  icalrecur_iterator_next() will check the returned data against other
-  BYrule parts to determine if is should be excluded by calling
-  check_contracting_rules. Generally, a contracting rule is any with a
-  larger time span than the interval. For instance, if
-  INTERVAL=DAILY, BYMONTH is a contracting rule part. 
-
-  Check_contracting_rules() uses icalrecur_check_rulepart() to do its
-  work. icalrecur_check_rulepart() uses expand_map[] to determine if a rule
-  is contracting, and if it is, and if the BY rule part has some data,
-  then the routine checks if the value of a component of the time is
-  part of the byrule part. For instance, for "INTERVAL=DAILY;
-  BYMONTH=6,10", icalrecur_check_rulepart() would check that the time value
-  given to it has a month of either 6 or 10.
-
-  Finally, icalrecur_iterator_next() does a few other checks on the
-  time value, and if it passes, it returns the time.
-
-  A note about the end_of_data flag. The flag indicates that the
-  routine is at the end of its data -- the last BY rule if the routine
-  is using by rules, or the last day of the week/month/year/etc if
-  not.
-
-  This flag is usually set early in a next_* routine and returned in
-  the end. The way it is used allows the next_* routine to set the
-  last time back to the first element in a BYxx rule, and then signal
-  to the higer level routine to increment the next higher level. For
-  instance. WITH FREQ=MONTHLY;BYDAY=TU,FR, After next_weekday_by_month
-  runs though both TU and FR, it sets the week day back to TU and sets
-  end_of_data to 1x. This signals next_month to increment the month.
-
-
- ======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
-#ifndef HAVE_INTPTR_T
-#ifdef WIN32
-typedef long intptr_t;
-#endif
-#endif
-
-#include "icalrecur.h"
-
-#include "icalerror.h"
-#include "icalmemory.h"
-
-#include <stdlib.h> /* for malloc */
-#include <errno.h> /* for errno */
-#include <string.h> /* for strdup and strchr*/
-#include <assert.h>
-#include <stddef.h> /* For offsetof() macro */
-
-#include "pvl.h"
-
-/** This is the last year we will go up to, since 32-bit time_t values
-   only go up to the start of 2038. */
-#define MAX_TIME_T_YEAR	2037
-
-#define TEMP_MAX 1024
-
-
-#define BYDAYIDX impl->by_indices[BY_DAY]
-#define BYDAYPTR impl->by_ptrs[BY_DAY]
-
-#define BYMONIDX impl->by_indices[BY_MONTH]
-#define BYMONPTR impl->by_ptrs[BY_MONTH]
-
-#define BYMDIDX impl->by_indices[BY_MONTH_DAY]
-#define BYMDPTR impl->by_ptrs[BY_MONTH_DAY]
-
-#define BYWEEKIDX impl->by_indices[BY_WEEK_NO]
-#define BYWEEKPTR impl->by_ptrs[BY_WEEK_NO]
-
-const char* icalrecur_freq_to_string(icalrecurrencetype_frequency kind);
-icalrecurrencetype_frequency icalrecur_string_to_freq(const char* str);
-
-const char* icalrecur_weekday_to_string(icalrecurrencetype_weekday kind);
-icalrecurrencetype_weekday icalrecur_string_to_weekday(const char* str);
-
-
-/*********************** Rule parsing routines ************************/
-
-struct icalrecur_parser {
-	const char* rule;
-        char* copy;
-	char* this_clause;
-	char* next_clause;
-
-	struct icalrecurrencetype rt;
-};
-
-const char* icalrecur_first_clause(struct icalrecur_parser *parser)
-{
-    char *idx;
-    parser->this_clause = parser->copy;
-    
-    idx = strchr(parser->this_clause,';');
-
-    if (idx == 0){
-	parser->next_clause = 0;
-	return 0;
-    }
-
-    *idx = 0;
-    idx++;
-    parser->next_clause = idx;
-
-    return parser->this_clause;
-
-}
-
-const char* icalrecur_next_clause(struct icalrecur_parser *parser)
-{
-    char* idx;
-
-    parser->this_clause = parser->next_clause;
-
-    if(parser->this_clause == 0){
-	return 0;
-    }
-
-    idx = strchr(parser->this_clause,';');
-
-    if (idx == 0){
-	parser->next_clause = 0;
-    } else {
-
-	*idx = 0;
-	idx++;
-	parser->next_clause = idx;
-    }
-	
-    return parser->this_clause;
-
-}
-
-void icalrecur_clause_name_and_value(struct icalrecur_parser *parser,
-				     char** name, char** value)
-{
-    char *idx;
-
-    *name = parser->this_clause;
-
-    idx = strchr(parser->this_clause,'=');
-
-    if (idx == 0){
-	*name = 0;
-	*value = 0;
-	return;
-    }
-    
-    *idx = 0;
-    idx++;
-    *value = idx;
-}
-
-void icalrecur_add_byrules(struct icalrecur_parser *parser, short *array,
-			   int size, char* vals)
-{
-    char *t, *n;
-    int i=0;
-    int sign = 1;
-    int v;
-
-    n = vals;
-
-    while(n != 0){
-
-	if(i == size){
-	    return;
-	}
-	
-	t = n;
-
-	n = strchr(t,',');
-
-	if(n != 0){
-	    *n = 0;
-	    n++;
-	}
-	
-	/* Get optional sign. HACK. sign is not allowed for all BYxxx
-           rule parts */
-	if( *t == '-'){
-	    sign = -1;
-	    t++;
-	} else if (*t == '+'){
-	    sign = 1;
-	    t++;
-	} else {
-	    sign = 1;
-	}
-
-	v = atoi(t) * sign ;
-
-
-	array[i++] = (short)v;
-	array[i] =  ICAL_RECURRENCE_ARRAY_MAX;
-
-    }
-
-}
-
-/*
- * Days in the BYDAY rule are expected by the code to be sorted, and while
- * this may be the common case, the RFC doesn't actually mandate it. This
- * function sorts the days taking into account the first day of week.
- */
-static void
-sort_bydayrules(struct icalrecur_parser *parser)
-{
-    short *array;
-    int week_start, one, two, i, j;
-
-    array = parser->rt.by_day;
-    week_start = parser->rt.week_start;
-
-    for (i=0;
-	 i<ICAL_BY_DAY_SIZE && array[i] != ICAL_RECURRENCE_ARRAY_MAX;
-	 i++) {
-	for (j=0; j<i; j++) {
-	    one = icalrecurrencetype_day_day_of_week(array[j]) - week_start;
-	    if (one < 0) one += 7;
-	    two = icalrecurrencetype_day_day_of_week(array[i]) - week_start;
-	    if (two < 0) two += 7;
-
-	    if (one > two) {
-		short tmp = array[j];
-		array[j] = array[i];
-		array[i] = tmp;
-	    }
-	}
-    }
-}
-
-void icalrecur_add_bydayrules(struct icalrecur_parser *parser, const char* vals)
-{
-
-    char *t, *n;
-    int i=0;
-    int sign = 1;
-    int weekno = 0;
-    icalrecurrencetype_weekday wd;
-    short *array = parser->rt.by_day;
-    char* end;
-    char* vals_copy;
-
-    vals_copy = icalmemory_strdup(vals);
-
-    end = (char*)vals_copy+strlen(vals_copy);
-    n = vals_copy;
-
-    while(n != 0){
-	
-
-	t = n;
-
-	n = strchr(t,',');
-
-	if(n != 0){
-	    *n = 0;
-	    n++;
-	}
-	
-	/* Get optional sign. */
-	if( *t == '-'){
-	    sign = -1;
-	    t++;
-	} else if (*t == '+'){
-	    sign = 1;
-	    t++;
-	} else {
-	    sign = 1;
-	}
-
-	/* Get Optional weekno */
-	weekno = strtol(t,&t,10);
-
-	/* Outlook/Exchange generate "BYDAY=MO, FR" and "BYDAY=2 TH".
-	 * Cope with that.
-	 */
-	if (*t == ' ')
-	    t++;
-
-	wd = icalrecur_string_to_weekday(t);
-
-	array[i++] = (short)(sign* (wd + 8*weekno));
-	array[i] =  ICAL_RECURRENCE_ARRAY_MAX;
-
-    }
-
-    free(vals_copy);
-
-    sort_bydayrules(parser);
-}
-
-
-struct icalrecurrencetype icalrecurrencetype_from_string(const char* str)
-{
-    struct icalrecur_parser parser;
-
-    memset(&parser,0,sizeof(parser));
-    icalrecurrencetype_clear(&parser.rt);
-
-    icalerror_check_arg_re(str!=0,"str",parser.rt);
-
-
-    /* Set up the parser struct */
-    parser.rule = str;
-    parser.copy = icalmemory_strdup(parser.rule);
-    parser.this_clause = parser.copy;
-
-    if(parser.copy == 0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return parser.rt;
-    }
-
-    /* Loop through all of the clauses */
-    for(icalrecur_first_clause(&parser); 
-	parser.this_clause != 0;
-	icalrecur_next_clause(&parser))
-    {
-	char *name, *value;
-	icalrecur_clause_name_and_value(&parser,&name,&value);
-
-	if(name == 0){
-	    icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	    icalrecurrencetype_clear(&parser.rt);
-		free(parser.copy);
-	    return parser.rt;
-	}
-
-	if (strcmp(name,"FREQ") == 0){
-	    parser.rt.freq = icalrecur_string_to_freq(value);
-	} else if (strcmp(name,"COUNT") == 0){
-	    parser.rt.count = atoi(value);
-	} else if (strcmp(name,"UNTIL") == 0){
-	    parser.rt.until = icaltime_from_string(value);
-	} else if (strcmp(name,"INTERVAL") == 0){
-	    parser.rt.interval = (short)atoi(value);
-	} else if (strcmp(name,"WKST") == 0){
-	    parser.rt.week_start = icalrecur_string_to_weekday(value);
-	    sort_bydayrules(&parser);
-	} else if (strcmp(name,"BYSECOND") == 0){
-	    icalrecur_add_byrules(&parser,parser.rt.by_second,
-				  ICAL_BY_SECOND_SIZE,value);
-	} else if (strcmp(name,"BYMINUTE") == 0){
-	    icalrecur_add_byrules(&parser,parser.rt.by_minute,
-				  ICAL_BY_MINUTE_SIZE,value);
-	} else if (strcmp(name,"BYHOUR") == 0){
-	    icalrecur_add_byrules(&parser,parser.rt.by_hour,
-				  ICAL_BY_HOUR_SIZE,value);
-	} else if (strcmp(name,"BYDAY") == 0){
-	    icalrecur_add_bydayrules(&parser,value);
-	} else if (strcmp(name,"BYMONTHDAY") == 0){
-	    icalrecur_add_byrules(&parser,parser.rt.by_month_day,
-				  ICAL_BY_MONTHDAY_SIZE,value);
-	} else if (strcmp(name,"BYYEARDAY") == 0){
-	    icalrecur_add_byrules(&parser,parser.rt.by_year_day,
-				  ICAL_BY_YEARDAY_SIZE,value);
-	} else if (strcmp(name,"BYWEEKNO") == 0){
-	    icalrecur_add_byrules(&parser,parser.rt.by_week_no,
-				  ICAL_BY_WEEKNO_SIZE,value);
-	} else if (strcmp(name,"BYMONTH") == 0){
-	    icalrecur_add_byrules(&parser,parser.rt.by_month,
-				  ICAL_BY_MONTH_SIZE,value);
-	} else if (strcmp(name,"BYSETPOS") == 0){
-	    icalrecur_add_byrules(&parser,parser.rt.by_set_pos,
-				  ICAL_BY_SETPOS_SIZE,value);
-	} else {
-	    icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	    icalrecurrencetype_clear(&parser.rt);
-		free(parser.copy);
-	    return parser.rt;
-	}
-	
-    }
-
-    free(parser.copy);
-
-    return parser.rt;
-
-}
-
-static struct { char* str;size_t offset; int limit;  } recurmap[] = 
-{
-    {";BYSECOND=",offsetof(struct icalrecurrencetype,by_second),60},
-    {";BYMINUTE=",offsetof(struct icalrecurrencetype,by_minute),60},
-    {";BYHOUR=",offsetof(struct icalrecurrencetype,by_hour),24},
-    {";BYDAY=",offsetof(struct icalrecurrencetype,by_day),7},
-    {";BYMONTHDAY=",offsetof(struct icalrecurrencetype,by_month_day),31},
-    {";BYYEARDAY=",offsetof(struct icalrecurrencetype,by_year_day),366},
-    {";BYWEEKNO=",offsetof(struct icalrecurrencetype,by_week_no),52},
-    {";BYMONTH=",offsetof(struct icalrecurrencetype,by_month),12},
-    {";BYSETPOS=",offsetof(struct icalrecurrencetype,by_set_pos),366},
-    {0,0,0},
-};
-
-/* A private routine in icalvalue.c */
-void print_date_to_string(char* str,  struct icaltimetype *data);
-void print_datetime_to_string(char* str,  struct icaltimetype *data);
-
-char* icalrecurrencetype_as_string(struct icalrecurrencetype *recur)
-{
-    char* str;
-    char *str_p;
-    size_t buf_sz = 200;
-    char temp[20];
-    int i,j;
-
-    if(recur->freq == ICAL_NO_RECURRENCE){
-	return 0;
-    }
-
-    str = (char*)icalmemory_tmp_buffer(buf_sz);
-    str_p = str;
-
-    icalmemory_append_string(&str,&str_p,&buf_sz,"FREQ=");
-    icalmemory_append_string(&str,&str_p,&buf_sz,
-			     icalrecur_freq_to_string(recur->freq));
-
-    if(recur->until.year != 0){
-	
-	temp[0] = 0;
-	if (recur->until.is_date)
-	    print_date_to_string(temp,&(recur->until));
-	else
-	    print_datetime_to_string(temp,&(recur->until));
-	
-	icalmemory_append_string(&str,&str_p,&buf_sz,";UNTIL=");
-	icalmemory_append_string(&str,&str_p,&buf_sz, temp);
-    }
-
-    if(recur->count != 0){
-	sprintf(temp,"%d",recur->count);
-	icalmemory_append_string(&str,&str_p,&buf_sz,";COUNT=");
-	icalmemory_append_string(&str,&str_p,&buf_sz, temp);
-    }
-
-    if(recur->interval != 0){
-	sprintf(temp,"%d",recur->interval);
-	icalmemory_append_string(&str,&str_p,&buf_sz,";INTERVAL=");
-	icalmemory_append_string(&str,&str_p,&buf_sz, temp);
-    }
-    
-    for(j =0; recurmap[j].str != 0; j++){
-	short* array = (short*)(recurmap[j].offset+ (size_t)recur);
-	int limit = recurmap[j].limit;
-
-	/* Skip unused arrays */
-	if( array[0] != ICAL_RECURRENCE_ARRAY_MAX ) {
-
-	    icalmemory_append_string(&str,&str_p,&buf_sz,recurmap[j].str);
-	    
-	    for(i=0; 
-		i< limit  && array[i] != ICAL_RECURRENCE_ARRAY_MAX;
-		i++){
-		if (j == 3) { /* BYDAY */
-		    const char *daystr = icalrecur_weekday_to_string(
-			icalrecurrencetype_day_day_of_week(array[i]));
-		    int pos;
-
-		    pos = icalrecurrencetype_day_position(array[i]);  
-		    
-		    if (pos == 0)
-			icalmemory_append_string(&str,&str_p,&buf_sz,daystr);
-		    else {
-			sprintf(temp,"%d%s",pos,daystr);
-			icalmemory_append_string(&str,&str_p,&buf_sz,temp);
-		    }                  
-		    
-		} else {
-		    sprintf(temp,"%d",array[i]);
-		    icalmemory_append_string(&str,&str_p,&buf_sz, temp);
-		}
-		
-		if( (i+1)<limit &&array[i+1] 
-		    != ICAL_RECURRENCE_ARRAY_MAX){
-		    icalmemory_append_char(&str,&str_p,&buf_sz,',');
-		}
-	    }	 
-	}   
-    }
-
-    /* If week start is not monday (the default per RFC2445) append WKST */
-    if (recur->week_start != ICAL_MONDAY_WEEKDAY) {
-	sprintf(temp,"%s", icalrecur_weekday_to_string(recur->week_start));
-	icalmemory_append_string(&str,&str_p,&buf_sz,";WKST=");
-	icalmemory_append_string(&str,&str_p,&buf_sz, temp);
-    }
-
-    return  str;
-}
-
-
-/************************* occurrence iteration routiens ******************/
-
-enum byrule {
-    NO_CONTRACTION = -1,
-    BY_SECOND = 0,
-    BY_MINUTE = 1,
-    BY_HOUR = 2,
-    BY_DAY = 3,
-    BY_MONTH_DAY = 4,
-    BY_YEAR_DAY = 5,
-    BY_WEEK_NO = 6,
-    BY_MONTH = 7,
-    BY_SET_POS
-};
-
-
-
-struct icalrecur_iterator_impl {
-	
-    struct icaltimetype dtstart; /* Hack. Make into time_t */
-    struct icaltimetype last; /* last time return from _iterator_next*/
-    int occurrence_no; /* number of step made on t iterator */
-    struct icalrecurrencetype rule;
-    
-    short days[366];
-    short days_index;
-    
-    enum byrule byrule;
-    short by_indices[9];
-    short orig_data[9]; /**< 1 if there was data in the byrule */
-    
-    
-    short *by_ptrs[9]; /**< Pointers into the by_* array elements of the rule */
-    
-};
-
-static void increment_year(icalrecur_iterator* impl, int inc);
-
-int icalrecur_iterator_sizeof_byarray(short* byarray)
-{
-    int array_itr;
-
-    for(array_itr = 0; 
-	byarray[array_itr] != ICAL_RECURRENCE_ARRAY_MAX;
-	array_itr++){
-    }
-
-    return array_itr;
-}
-
-enum expand_table {
-    UNKNOWN  = 0,
-    CONTRACT = 1,
-    EXPAND =2,
-    ILLEGAL=3
-};
-
-/** 
- * The split map indicates, for a particular interval, wether a BY_*
- * rule part expands the number of instances in the occcurrence set or
- * contracts it. 1=> contract, 2=>expand, and 3 means the pairing is
- * not allowed. 
- */
-
-struct expand_split_map_struct 
-{ 
-	icalrecurrencetype_frequency frequency;
-
-	/* Elements of the 'map' array correspond to the BYxxx rules:
-           Second,Minute,Hour,Day,Month Day,Year Day,Week No,Month*/
-
-	short map[8];
-}; 
-
-static struct expand_split_map_struct expand_map[] =
-{
-    {ICAL_SECONDLY_RECURRENCE,{1,1,1,1,1,1,1,1}},
-    {ICAL_MINUTELY_RECURRENCE,{2,1,1,1,1,1,1,1}},
-    {ICAL_HOURLY_RECURRENCE,  {2,2,1,1,1,1,1,1}},
-    {ICAL_DAILY_RECURRENCE,   {2,2,2,1,1,1,1,1}},
-    {ICAL_WEEKLY_RECURRENCE,  {2,2,2,2,3,3,1,1}},
-    {ICAL_MONTHLY_RECURRENCE, {2,2,2,2,2,3,3,1}},
-    {ICAL_YEARLY_RECURRENCE,  {2,2,2,2,2,2,2,2}},
-    {ICAL_NO_RECURRENCE,      {0,0,0,0,0,0,0,0}}
-
-};
-
-
-
-/** Check that the rule has only the two given interday byrule parts. */
-static
-int icalrecur_two_byrule(icalrecur_iterator* impl,
-			 enum byrule one,enum byrule two)
-{
-    short test_array[9];
-    enum byrule itr;
-    int passes = 0;
-
-    memset(test_array,0,sizeof(test_array));
-
-    test_array[one] = 1;
-    test_array[two] = 1;
-
-    for(itr = BY_DAY; itr != BY_SET_POS; itr++){
-
-	if( (test_array[itr] == 0  &&
-	     impl->by_ptrs[itr][0] != ICAL_RECURRENCE_ARRAY_MAX
-	    ) ||
-	    (test_array[itr] == 1  &&
-	     impl->by_ptrs[itr][0] == ICAL_RECURRENCE_ARRAY_MAX
-		) 
-	    ) {
-	    /* test failed */
-	    passes = 0;
-	}
-    }
-
-    return passes;
-
-} 
-
-/** Check that the rule has only the one given interdat byrule parts. */
-static int icalrecur_one_byrule(icalrecur_iterator* impl,enum byrule one)
-{
-    int passes = 1;
-    enum byrule itr;
-
-    for(itr = BY_DAY; itr != BY_SET_POS; itr++){
-	
-	if ((itr==one && impl->by_ptrs[itr][0] == ICAL_RECURRENCE_ARRAY_MAX) ||
-	    (itr!=one && impl->by_ptrs[itr][0] != ICAL_RECURRENCE_ARRAY_MAX)) {
-	    passes = 0;
-	}
-    }
-
-    return passes;
-} 
-
-static int count_byrules(icalrecur_iterator* impl)
-{
-    int count = 0;
-    enum byrule itr;
-
-    for(itr = BY_DAY; itr <= BY_SET_POS; itr++){
-	if(impl->by_ptrs[itr][0] != ICAL_RECURRENCE_ARRAY_MAX){
-	    count++;
-	}
-    }
-
-    return count;
-}
-
-
-static void setup_defaults(icalrecur_iterator* impl, 
-		    enum byrule byrule, icalrecurrencetype_frequency req,
-		    int deftime, int *timepart)
-{
-
-    icalrecurrencetype_frequency freq;
-    freq = impl->rule.freq;
-
-    /* Re-write the BY rule arrays with data from the DTSTART time so
-       we don't have to explicitly deal with DTSTART */
-
-    if(impl->by_ptrs[byrule][0] == ICAL_RECURRENCE_ARRAY_MAX &&
-	expand_map[freq].map[byrule] != CONTRACT){
-	impl->by_ptrs[byrule][0] = (short)deftime;
-    }
-
-    /* Initialize the first occurence */
-    if( freq != req && expand_map[freq].map[byrule] != CONTRACT){
-	*timepart = impl->by_ptrs[byrule][0];
-    }
-
-
-}
-
-static int has_by_data(icalrecur_iterator* impl, enum byrule byrule){
-
-    return (impl->orig_data[byrule] == 1);
-}
-
-
-static int expand_year_days(icalrecur_iterator* impl, int year);
-
-
-icalrecur_iterator* icalrecur_iterator_new(struct icalrecurrencetype rule, 
-					   struct icaltimetype dtstart)
-{
-    icalrecur_iterator* impl;
-    icalrecurrencetype_frequency freq;
-
-    if ( ( impl = (icalrecur_iterator*)
-	   malloc(sizeof(icalrecur_iterator))) == 0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-    memset(impl,0,sizeof(icalrecur_iterator));
-
-    impl->rule = rule;
-    impl->last = dtstart;
-    impl->dtstart = dtstart;
-    impl->days_index =0;
-    impl->occurrence_no = 0;
-    freq = impl->rule.freq;
-
-    /* Set up convienience pointers to make the code simpler. Allows
-       us to iterate through all of the BY* arrays in the rule. */
-
-    impl->by_ptrs[BY_MONTH]=impl->rule.by_month;
-    impl->by_ptrs[BY_WEEK_NO]=impl->rule.by_week_no;
-    impl->by_ptrs[BY_YEAR_DAY]=impl->rule.by_year_day;
-    impl->by_ptrs[BY_MONTH_DAY]=impl->rule.by_month_day;
-    impl->by_ptrs[BY_DAY]=impl->rule.by_day;
-    impl->by_ptrs[BY_HOUR]=impl->rule.by_hour;
-    impl->by_ptrs[BY_MINUTE]=impl->rule.by_minute;
-    impl->by_ptrs[BY_SECOND]=impl->rule.by_second;
-    impl->by_ptrs[BY_SET_POS]=impl->rule.by_set_pos;
-
-    memset(impl->orig_data,0,9*sizeof(short));
-
-    /* Note which by rules had data in them when the iterator was
-       created. We can't use the actuall by_x arrays, because the
-       empty ones will be given default values later in this
-       routine. The orig_data array will be used later in has_by_data */
-
-    impl->orig_data[BY_MONTH]
-	= (short)(impl->rule.by_month[0]!=ICAL_RECURRENCE_ARRAY_MAX);
-    impl->orig_data[BY_WEEK_NO]
-      =(short)(impl->rule.by_week_no[0]!=ICAL_RECURRENCE_ARRAY_MAX);
-    impl->orig_data[BY_YEAR_DAY]
-    =(short)(impl->rule.by_year_day[0]!=ICAL_RECURRENCE_ARRAY_MAX);
-    impl->orig_data[BY_MONTH_DAY]
-    =(short)(impl->rule.by_month_day[0]!=ICAL_RECURRENCE_ARRAY_MAX);
-    impl->orig_data[BY_DAY]
-	= (short)(impl->rule.by_day[0]!=ICAL_RECURRENCE_ARRAY_MAX);
-    impl->orig_data[BY_HOUR]
-	= (short)(impl->rule.by_hour[0]!=ICAL_RECURRENCE_ARRAY_MAX);
-    impl->orig_data[BY_MINUTE]
-     = (short)(impl->rule.by_minute[0]!=ICAL_RECURRENCE_ARRAY_MAX);
-    impl->orig_data[BY_SECOND]
-     = (short)(impl->rule.by_second[0]!=ICAL_RECURRENCE_ARRAY_MAX);
-    impl->orig_data[BY_SET_POS]
-     = (short)(impl->rule.by_set_pos[0]!=ICAL_RECURRENCE_ARRAY_MAX);
-
-
-    /* Check if the recurrence rule is legal */
-
-    /* If the BYYEARDAY appears, no other date rule part may appear.   */
-
-    if(icalrecur_two_byrule(impl,BY_YEAR_DAY,BY_MONTH) ||
-       icalrecur_two_byrule(impl,BY_YEAR_DAY,BY_WEEK_NO) ||
-       icalrecur_two_byrule(impl,BY_YEAR_DAY,BY_MONTH_DAY) ||
-       icalrecur_two_byrule(impl,BY_YEAR_DAY,BY_DAY) ){
-
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-
-	return 0;
-    }
-
-    /* BYWEEKNO and BYMONTH rule parts may not both appear.*/
-
-    if(icalrecur_two_byrule(impl,BY_WEEK_NO,BY_MONTH)){
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	return 0;
-    }
-
-    /* BYWEEKNO and BYMONTHDAY rule parts may not both appear.*/
-
-    if(icalrecur_two_byrule(impl,BY_WEEK_NO,BY_MONTH_DAY)){
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	return 0;
-    }
-
-
-    /*For MONTHLY recurrences (FREQ=MONTHLY) neither BYYEARDAY nor
-      BYWEEKNO may appear. */
-
-    if(freq == ICAL_MONTHLY_RECURRENCE && 
-       icalrecur_one_byrule(impl,BY_WEEK_NO)){
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	return 0;
-    }
-
-
-    /*For WEEKLY recurrences (FREQ=WEEKLY) neither BYMONTHDAY nor
-      BYYEARDAY may appear. */
-
-    if(freq == ICAL_WEEKLY_RECURRENCE && 
-       icalrecur_one_byrule(impl,BY_MONTH_DAY )) {
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	return 0;
-    }
-
-    /* BYYEARDAY may only appear in YEARLY rules */
-    if(freq != ICAL_YEARLY_RECURRENCE && 
-       icalrecur_one_byrule(impl,BY_YEAR_DAY )) {
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	return 0;
-    }
-
-    /* Rewrite some of the rules and set up defaults to make later
-       processing easier. Primarily, t involves copying an element
-       from the start time into the coresponding BY_* array when the
-       BY_* array is empty */
-
-
-    setup_defaults(impl,BY_SECOND,ICAL_SECONDLY_RECURRENCE,
-		   impl->dtstart.second,
-		   &(impl->last.second));
-
-    setup_defaults(impl,BY_MINUTE,ICAL_MINUTELY_RECURRENCE,
-		   impl->dtstart.minute,
-		   &(impl->last.minute));
-
-    setup_defaults(impl,BY_HOUR,ICAL_HOURLY_RECURRENCE,
-		   impl->dtstart.hour,
-		   &(impl->last.hour));
-
-    setup_defaults(impl,BY_MONTH_DAY,ICAL_DAILY_RECURRENCE,
-		   impl->dtstart.day,
-		   &(impl->last.day));
-
-    setup_defaults(impl,BY_MONTH,ICAL_MONTHLY_RECURRENCE,
-		   impl->dtstart.month,
-		   &(impl->last.month));
-
-
-    if(impl->rule.freq == ICAL_WEEKLY_RECURRENCE ){
-
-       if(impl->by_ptrs[BY_DAY][0] == ICAL_RECURRENCE_ARRAY_MAX){
-
-	   /* Weekly recurrences with no BY_DAY data should occur on the
-	      same day of the week as the start time . */
-	   impl->by_ptrs[BY_DAY][0] = (short)icaltime_day_of_week(impl->dtstart);
-
-       } else {
-	  /* If there is BY_DAY data, then we need to move the initial
-	     time to the start of the BY_DAY data. That is if the
-	     start time is on a Wednesday, and the rule has
-	     BYDAY=MO,WE,FR, move the initial time back to
-	     monday. Otherwise, jumping to the next week ( jumping 7
-	     days ahead ) will skip over some occurrences in the
-	     second week. */
-
-	  /* This depends on impl->by_ptrs[BY_DAY] being correctly sorted by
-	   * day. This should probably be abstracted to make such assumption
-	   * more explicit. */
-	  short dow = (short)(impl->by_ptrs[BY_DAY][0]-icaltime_day_of_week(impl->last));
-	  if (dow > impl->rule.week_start-1) dow -= 7;
-	  impl->last.day += dow;
-	  impl->last = icaltime_normalize(impl->last);
-      }
-      
-
-    }
-
-    /* For YEARLY rule, begin by setting up the year days array . The
-       YEARLY rules work by expanding one year at a time. */
-
-    if(impl->rule.freq == ICAL_YEARLY_RECURRENCE){
-        struct icaltimetype next;
-
-	for (;;) {
-            expand_year_days(impl, impl->last.year);
-	    if (impl->days[0] != ICAL_RECURRENCE_ARRAY_MAX)
-	        break; /* break when no days are expanded */
-	    increment_year(impl,impl->rule.interval);
-	}
-
-        /* Copy the first day into last. */
-	next = icaltime_from_day_of_year(impl->days[0], impl->last.year);
-    
-	impl->last.day =  next.day;
-	impl->last.month =  next.month;
-    } 
-
-
-    /* If this is a monthly interval with by day data, then we need to
-       set the last value to the appropriate day of the month */
-
-    if(impl->rule.freq == ICAL_MONTHLY_RECURRENCE)
-	if (has_by_data(impl,BY_DAY)) {
-
-	int dow = icalrecurrencetype_day_day_of_week(
-	    impl->by_ptrs[BY_DAY][impl->by_indices[BY_DAY]]);  
-	int pos =  icalrecurrencetype_day_position(
-	    impl->by_ptrs[BY_DAY][impl->by_indices[BY_DAY]]);  
-	
-	int poscount = 0;
-	int days_in_month = 
-            icaltime_days_in_month(impl->last.month, impl->last.year); 
-	
-        if(pos >= 0){
-            /* Count up from the first day pf the month to find the
-               pos'th weekday of dow ( like the second monday. ) */
-
-            for(impl->last.day = 1;
-                impl->last.day <= days_in_month;
-                impl->last.day++){
-                
-                if(icaltime_day_of_week(impl->last) == dow){
-                    if(++poscount == pos || pos == 0){
-                        break;
-                    }
-                }
-            }
-        } else {
-            /* Count down from the last day pf the month to find the
-               pos'th weekday of dow ( like the second to last monday. ) */
-            pos = -pos;
-            for(impl->last.day = days_in_month;
-                impl->last.day != 0;
-                impl->last.day--){
-                
-                if(icaltime_day_of_week(impl->last) == dow){
-                    if(++poscount == pos ){
-                        break;
-                    }
-                }
-            }
-        }
-
-
-	if(impl->last.day > days_in_month || impl->last.day == 0){
-	    icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	    return 0;
-	}
-	
-    } else if (has_by_data(impl,BY_MONTH_DAY)) {
-	impl->last = icaltime_normalize(impl->last);
-    }
-
-
-
-    return impl;
-}
-
-
-void icalrecur_iterator_free(icalrecur_iterator* i)
-{
-    icalerror_check_arg_rv((i!=0),"impl");
-    
-    free(i);
-
-}
-
-static void increment_year(icalrecur_iterator* impl, int inc)
-{
-    impl->last.year+=inc;
-}
-
-/** Increment month is different that the other incement_* routines --
-   it figures out the interval for itself, and uses BYMONTH data if
-   available. */
-static void increment_month(icalrecur_iterator* impl)
-{
-    int years;
-
-     if(has_by_data(impl,BY_MONTH) ){
-         /* Ignore the frequency and use the byrule data */
-         
-         impl->by_indices[BY_MONTH]++;
-         
-         if (impl->by_ptrs[BY_MONTH][impl->by_indices[BY_MONTH]]
-             ==ICAL_RECURRENCE_ARRAY_MAX){
-             impl->by_indices[BY_MONTH] = 0;
-
-             increment_year(impl,1);
-             
-         }
-         
-         impl->last.month = 
-             impl->by_ptrs[BY_MONTH][impl->by_indices[BY_MONTH]];
-
-     } else {
-         
-         int inc;
-
-         if(impl->rule.freq == ICAL_MONTHLY_RECURRENCE){
-            inc =  impl->rule.interval;
-         } else {
-             inc = 1;
-         }
-
-         impl->last.month+=inc;
-         
-         /* Months are offset by one */
-         impl->last.month--;
-         
-         years = impl->last.month / 12;
-         
-         impl->last.month = impl->last.month % 12;
-         
-         impl->last.month++;
-         
-         if (years != 0){
-             increment_year(impl,years);
-         }
-     }
-}
-
-static void increment_monthday(icalrecur_iterator* impl, int inc)
-{
-    int i;
-
-    for(i=0; i<inc; i++){
-	
-	int days_in_month = 
-	    icaltime_days_in_month(impl->last.month, impl->last.year);
-
-	impl->last.day++;
-	
-	if (impl->last.day > days_in_month){
-	    impl->last.day = impl->last.day-days_in_month;
-	    increment_month(impl);
-	}
-    }
-}
-
-
-static void increment_hour(icalrecur_iterator* impl, int inc)
-{
-    int days;
-
-    impl->last.hour+=inc;
-
-    days = impl->last.hour / 24;
-    impl->last.hour = impl->last.hour % 24;
-
-    if (impl->days != 0){
-	increment_monthday(impl,days);
-    }
-}
-
-static void increment_minute(icalrecur_iterator* impl, int inc)
-{
-    int hours;
-
-    impl->last.minute+=inc;
-
-    hours = impl->last.minute / 60;
-     impl->last.minute =  impl->last.minute % 60;
-
-     if (hours != 0){
-	increment_hour(impl,hours);
-    }
-
-}
-
-static void increment_second(icalrecur_iterator* impl, int inc)
-{
-    int minutes;
-
-    impl->last.second+=inc;
-    
-    minutes = impl->last.second / 60;
-    impl->last.second = impl->last.second % 60;
-    
-    if (minutes != 0)
-    {
-	increment_minute(impl, minutes);
-    }                 
-}
-
-#if 0
-#include "ical.h"
-void test_increment()
-{
-    icalrecur_iterator impl;
-
-    impl.last =  icaltime_from_string("20000101T000000Z");
-
-    printf("Orig: %s\n",icaltime_as_ctime(impl.last));
-    
-    increment_second(&impl,5);
-    printf("+ 5 sec    : %s\n",icaltime_as_ctime(impl.last));
-
-    increment_second(&impl,355);
-    printf("+ 355 sec  : %s\n",icaltime_as_ctime(impl.last));
-
-    increment_minute(&impl,5);
-    printf("+ 5 min    : %s\n",icaltime_as_ctime(impl.last));
-
-    increment_minute(&impl,360);
-    printf("+ 360 min  : %s\n",icaltime_as_ctime(impl.last));
-    increment_hour(&impl,5);
-    printf("+ 5 hours  : %s\n",icaltime_as_ctime(impl.last));
-    increment_hour(&impl,43);
-    printf("+ 43 hours : %s\n",icaltime_as_ctime(impl.last));
-    increment_monthday(&impl,3);
-    printf("+ 3 days   : %s\n",icaltime_as_ctime(impl.last));
-    increment_monthday(&impl,600);
-    printf("+ 600 days  : %s\n",icaltime_as_ctime(impl.last));
-	
-}
-
-#endif 
-
-static int next_second(icalrecur_iterator* impl)
-{
-
-  int has_by_second = (impl->by_ptrs[BY_SECOND][0]!=ICAL_RECURRENCE_ARRAY_MAX);
-  int this_frequency = (impl->rule.freq == ICAL_SECONDLY_RECURRENCE);
-
-  int end_of_data = 0;
-
-  assert(has_by_second || this_frequency);
-
-  if(  has_by_second ){
-      /* Ignore the frequency and use the byrule data */
-
-      impl->by_indices[BY_SECOND]++;
-
-      if (impl->by_ptrs[BY_SECOND][impl->by_indices[BY_SECOND]]
-	  ==ICAL_RECURRENCE_ARRAY_MAX){
-	  impl->by_indices[BY_SECOND] = 0;
-
-	  end_of_data = 1;
-      }
-
-
-      impl->last.second = 
-	  impl->by_ptrs[BY_SECOND][impl->by_indices[BY_SECOND]];
-      
-      
-  } else if( !has_by_second &&  this_frequency ){
-      /* Compute the next value from the last time and the frequency interval*/
-      increment_second(impl, impl->rule.interval);
-
-  }
-
-  /* If we have gone through all of the seconds on the BY list, then we
-     need to move to the next minute */
-
-  if(has_by_second && end_of_data && this_frequency ){
-      increment_minute(impl,1);
-  }
-
-  return end_of_data;
-
-}
-
-static int next_minute(icalrecur_iterator* impl)
-{
-
-  int has_by_minute = (impl->by_ptrs[BY_MINUTE][0]!=ICAL_RECURRENCE_ARRAY_MAX);
-  int this_frequency = (impl->rule.freq == ICAL_MINUTELY_RECURRENCE);
-
-  int end_of_data = 0;
-
-  assert(has_by_minute || this_frequency);
-
-
-  if (next_second(impl) == 0){
-      return 0;
-  }
-
-  if(  has_by_minute ){
-      /* Ignore the frequency and use the byrule data */
-
-      impl->by_indices[BY_MINUTE]++;
-      
-      if (impl->by_ptrs[BY_MINUTE][impl->by_indices[BY_MINUTE]]
-	  ==ICAL_RECURRENCE_ARRAY_MAX){
-
-	  impl->by_indices[BY_MINUTE] = 0;
-	  
-	  end_of_data = 1;
-      }
-
-      impl->last.minute = 
-	  impl->by_ptrs[BY_MINUTE][impl->by_indices[BY_MINUTE]];
-
-  } else if( !has_by_minute &&  this_frequency ){
-      /* Compute the next value from the last time and the frequency interval*/
-      increment_minute(impl,impl->rule.interval);
-  } 
-
-/* If we have gone through all of the minutes on the BY list, then we
-     need to move to the next hour */
-
-  if(has_by_minute && end_of_data && this_frequency ){
-      increment_hour(impl,1);
-  }
-
-  return end_of_data;
-}
-
-static int next_hour(icalrecur_iterator* impl)
-{
-
-  int has_by_hour = (impl->by_ptrs[BY_HOUR][0]!=ICAL_RECURRENCE_ARRAY_MAX);
-  int this_frequency = (impl->rule.freq == ICAL_HOURLY_RECURRENCE);
-
-  int end_of_data = 0;
-
-  assert(has_by_hour || this_frequency);
-
-  if (next_minute(impl) == 0){
-      return 0;
-  }
-
-  if(  has_by_hour ){
-      /* Ignore the frequency and use the byrule data */
-
-      impl->by_indices[BY_HOUR]++;
-      
-      if (impl->by_ptrs[BY_HOUR][impl->by_indices[BY_HOUR]]
-	  ==ICAL_RECURRENCE_ARRAY_MAX){
-	  impl->by_indices[BY_HOUR] = 0;
-	  
-	  end_of_data = 1;
-      }
-
-      impl->last.hour = 
-	  impl->by_ptrs[BY_HOUR][impl->by_indices[BY_HOUR]];
-
-  } else if( !has_by_hour &&  this_frequency ){
-      /* Compute the next value from the last time and the frequency interval*/
-      increment_hour(impl,impl->rule.interval);
-
-  }
-
-  /* If we have gone through all of the hours on the BY list, then we
-     need to move to the next day */
-
-  if(has_by_hour && end_of_data && this_frequency ){
-      increment_monthday(impl,1);
-  }
-
-  return end_of_data;
-
-}
-
-static int next_day(icalrecur_iterator* impl)
-{
-
-  int has_by_day = (impl->by_ptrs[BY_DAY][0]!=ICAL_RECURRENCE_ARRAY_MAX);
-  int this_frequency = (impl->rule.freq == ICAL_DAILY_RECURRENCE);
-
-  assert(has_by_day || this_frequency);
-
-  if (next_hour(impl) == 0){
-      return 0;
-  }
-
-  /* Always increment through the interval, since this routine is not
-     called by any other next_* routine, and the days that are
-     excluded will be taken care of by restriction filtering */
-
-  if(this_frequency){
-      increment_monthday(impl,impl->rule.interval);
-  } else {
-      increment_monthday(impl,1);
-  }
-
-
-  return 0;
-
-}
-
-
-static int next_yearday(icalrecur_iterator* impl)
-{
-
-  int has_by_yearday = (impl->by_ptrs[BY_YEAR_DAY][0]!=ICAL_RECURRENCE_ARRAY_MAX);
-
-  int end_of_data = 0;
-
-  assert(has_by_yearday );
-
-  if (next_hour(impl) == 0){
-      return 0;
-  }
-
-  impl->by_indices[BY_YEAR_DAY]++;
-  
-  if (impl->by_ptrs[BY_YEAR_DAY][impl->by_indices[BY_YEAR_DAY]]
-      ==ICAL_RECURRENCE_ARRAY_MAX){
-      impl->by_indices[BY_YEAR_DAY] = 0;
-      
-      end_of_data = 1;
-  }
-  
-  impl->last.day = 
-      impl->by_ptrs[BY_YEAR_DAY][impl->by_indices[BY_YEAR_DAY]];
-  
-  if(has_by_yearday && end_of_data){
-      increment_year(impl,1);
-  }
-
-  return end_of_data;
-
-}
-
-
-/* Returns the day of the month for the current month of t that is the
-   pos'th instance of the day-of-week dow */
-
-static int nth_weekday(int dow, int pos, struct icaltimetype t){
-
-    int days_in_month = icaltime_days_in_month(t.month, t.year);
-    int end_dow, start_dow;
-    int wd;
-
-    if(pos >= 0){
-        t.day = 1;
-        start_dow = icaltime_day_of_week(t);        
-        
-        if (pos != 0) {
-            pos--;
-        }
-         
-        /* find month day of first occurrence of dow -- such as the
-           month day of the first monday */
-
-        wd = dow-start_dow+1;
-
-        if (wd <= 0){
-            wd = wd + 7;
-        }
-
-        wd = wd + pos * 7;
-        
-    } else {
-        t.day = days_in_month;
-        end_dow = icaltime_day_of_week(t);
-
-        pos++;
-
-        /* find month day of last occurrence of dow -- such as the
-           month day of the last monday */
-
-        wd = (end_dow - dow);
-
-        if (wd < 0){
-            wd = wd+ 7;
-        }
-
-        wd = days_in_month - wd;
-
-        wd = wd + pos * 7;
-    }
-        
-    return wd;
-}
-
-static int is_day_in_byday(icalrecur_iterator* impl,struct icaltimetype tt){
-
-    int idx; 
-
-    for(idx = 0; BYDAYPTR[idx] != ICAL_RECURRENCE_ARRAY_MAX; idx++){
-        int dow = icalrecurrencetype_day_day_of_week(BYDAYPTR[idx]);  
-        int pos =  icalrecurrencetype_day_position(BYDAYPTR[idx]);  
-        int this_dow = icaltime_day_of_week(tt);
-        
-        if( (pos == 0 &&  dow == this_dow ) || /* Just a dow, like "TU" or "FR" */
-            (nth_weekday(dow,pos,tt) == tt.day)){ /*pos+wod: "3FR" or -1TU" */
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
-static int next_month(icalrecur_iterator* impl)
-{
-    int data_valid = 1;
-    
-    int this_frequency = (impl->rule.freq == ICAL_MONTHLY_RECURRENCE);
-    
-    assert( has_by_data(impl,BY_MONTH) || this_frequency);
-  
-    /* Iterate through the occurrences within a day. If we don't get to
-       the end of the intra-day data, don't bother going to the next
-       month */
-    
-    if (next_hour(impl) == 0){
-        return data_valid; /* Signal that the data is valid */
-    }
-    
-    /* Now iterate through the occurrences within a month -- by days,
-       weeks or weekdays.  */
-
-   /* 
-    * Case 1: 
-    * Rules Like: FREQ=MONTHLY;INTERVAL=1;BYDAY=FR;BYMONTHDAY=13 
-    */
-    
-    if(has_by_data(impl,BY_DAY) && has_by_data(impl,BY_MONTH_DAY)){
-      int day, idx,j;
-      int days_in_month = icaltime_days_in_month(impl->last.month,
-                                                   impl->last.year);
-      /* Iterate through the remaining days in the month and check if
-         each day is listed in the BY_DAY array and in the BY_MONTHDAY
-         array. This seems very inneficient, but I think it is the
-         simplest way to account for both BYDAY=1FR (First friday in
-         month) and BYDAY=FR ( every friday in month ) */
-
-      for(day = impl->last.day+1; day <= days_in_month; day++){
-          for(idx = 0; BYDAYPTR[idx] != ICAL_RECURRENCE_ARRAY_MAX; idx++){
-              for(j = 0; BYMDPTR[j]!=ICAL_RECURRENCE_ARRAY_MAX; j++){
-                  int dow = 
-                      icalrecurrencetype_day_day_of_week(BYDAYPTR[idx]);  
-                  int pos =  icalrecurrencetype_day_position(BYDAYPTR[idx]);  
-                  int mday = BYMDPTR[j];
-                  int this_dow;
-                  
-                  impl->last.day = day;
-                  this_dow = icaltime_day_of_week(impl->last);
-                  
-                  if( (pos == 0 &&  dow == this_dow && mday == day) || 
-                      (nth_weekday(dow,pos,impl->last) == day && mday==day)){
-                      goto MDEND;
-                  }
-              }
-          }
-      }
-
-  MDEND:
-
-      if ( day > days_in_month){
-          impl->last.day = 1;
-          increment_month(impl);
-          data_valid = 0; /* signal that impl->last is invalid */
-      }
-
-    
-   /* 
-    * Case 2: 
-    * Rules Like: FREQ=MONTHLY;INTERVAL=1;BYDAY=FR 
-    */
-  
-  }  else if(has_by_data(impl,BY_DAY)){
-      /* For this case, the weekdays are relative to the
-         month. BYDAY=FR -> First Friday in month, etc. */
-
-      /* This code iterates through the remaining days in the month
-         and checks if each day is listed in the BY_DAY array. This
-         seems very inneficient, but I think it is the simplest way to
-         account for both BYDAY=1FR (First friday in month) and
-         BYDAY=FR ( every friday in month ) */
-
-      int day;
-      int days_in_month = icaltime_days_in_month(impl->last.month,
-                                                   impl->last.year);
-      assert( BYDAYPTR[0]!=ICAL_RECURRENCE_ARRAY_MAX);
-
-      for(day = impl->last.day+1; day <= days_in_month; day++){
-          impl->last.day = day;
-          if(is_day_in_byday(impl,impl->last)){
-              data_valid = 1;
-              break;
-          }
-      }
-
-      if ( day > days_in_month){
-          impl->last.day = 1;
-          increment_month(impl);
-
-          /* Did moving to the next month put us on a valid date? if
-             so, note that the new data is valid, if, not, mark it
-             invalid */
-
-          if(is_day_in_byday(impl,impl->last)){
-              data_valid = 1;
-          } else {
-              data_valid = 0; /* signal that impl->last is invalid */
-          }
-      }
-
-     /* 
-       * Case 3
-       * Rules Like: FREQ=MONTHLY;COUNT=10;BYMONTHDAY=-3  
-       */
-
-  } else if (has_by_data(impl,BY_MONTH_DAY)) {
-      int day, days_in_month;
-
-      assert( BYMDPTR[0]!=ICAL_RECURRENCE_ARRAY_MAX);
-
-      BYMDIDX++;
-          
-      /* Are we at the end of the BYDAY array? */
-      if (BYMDPTR[BYMDIDX] ==ICAL_RECURRENCE_ARRAY_MAX){
-          
-          BYMDIDX = 0; /* Reset to 0 */      
-          increment_month(impl);          
-      }
-      
-      days_in_month = icaltime_days_in_month(impl->last.month,
-                                                   impl->last.year);
-
-      day = BYMDPTR[BYMDIDX];
-      
-      if (day < 0) {
-          day = icaltime_days_in_month(impl->last.month, impl->last.year) + day + 1;
-      }
-
-      if ( day > days_in_month){
-          impl->last.day = 1;
-
-          /* Did moving to the next month put us on a valid date? if
-             so, note that the new data is valid, if, not, mark it
-             invalid */
-
-          if(is_day_in_byday(impl,impl->last)){
-              data_valid = 1;
-          } else {
-              data_valid = 0; /* signal that impl->last is invalid */
-          }
-      }
-
-      impl->last.day = day;
-
-  } else {
-      int days_in_month;
-
-      increment_month(impl);
-
-      days_in_month = icaltime_days_in_month(impl->last.month,
-                                                   impl->last.year);
-      if (impl->last.day > days_in_month){
-          data_valid = 0; /* signal that impl->last is invalid */
-      }
-  }
-
-  return data_valid;
-
-}
-
-static int next_weekday_by_week(icalrecur_iterator* impl)
-{
-
-  int end_of_data = 0;
-  int start_of_week, dow;
-  struct icaltimetype next;
-
-  if (next_hour(impl) == 0){
-      return 0;
-  }
-
-  if(!has_by_data(impl,BY_DAY)){
-      return 1;
-  }
-
-  /* If we get here, we need to step to tne next day */
-
-  for (;;) {
-      BYDAYIDX++; /* Look at next elem in BYDAY array */
-      
-      /* Are we at the end of the BYDAY array? */
-      if (BYDAYPTR[BYDAYIDX]==ICAL_RECURRENCE_ARRAY_MAX){
-	  BYDAYIDX = 0; /* Reset to 0 */      
-	  end_of_data = 1; /* Signal that we're at the end */
-      }
-      
-      /* Add the day of week offset to to the start of this week, and use
-	 that to get the next day */
-      /* ignore position of dow ("4FR"), only use dow ("FR")*/
-      dow = icalrecurrencetype_day_day_of_week(BYDAYPTR[BYDAYIDX]); 
-      dow -= impl->rule.week_start; /* Set Sunday to be 0 */
-      if (dow < 0) dow += 7;
-
-      start_of_week = icaltime_start_doy_week(impl->last, impl->rule.week_start);
-      
-      if(dow+start_of_week <1){
-          /* The selected date is in the previous year. */
-          if(!end_of_data){    
-              continue;
-          }
-      } 
- 
-      next = icaltime_from_day_of_year(start_of_week + dow,impl->last.year);
-      
-      impl->last.day =  next.day;
-      impl->last.month =  next.month;
-      impl->last.year =  next.year;
-
-      return end_of_data;
-  }
-
-}
-
-static int next_week(icalrecur_iterator* impl)
-{
-  int end_of_data = 0;
-
-  /* Increment to the next week day, if there is data at a level less than a week */
-  if (next_weekday_by_week(impl) == 0){
-      return 0; /* Have not reached end of week yet */
-  }
-
-  /* If we get here, we have incremented through the entire week, and
-     can increment to the next week */
-
-  if( has_by_data(impl,BY_WEEK_NO)){
-      /*FREQ=WEEKLY;BYWEEK=20*/
-    /* Use the Week Number byrule data */
-      int week_no;
-      struct icaltimetype t;
-      
-      impl->by_indices[BY_WEEK_NO]++;
-      
-      if (impl->by_ptrs[BY_WEEK_NO][impl->by_indices[BY_WEEK_NO]]
-	  ==ICAL_RECURRENCE_ARRAY_MAX){
-	  impl->by_indices[BY_WEEK_NO] = 0;
-	  
-	  end_of_data = 1;
-      }
-      
-      t = impl->last;
-      t.month=1; /* HACK, should be setting to the date of the first week of year*/
-      t.day=1;
-      
-      week_no = impl->by_ptrs[BY_WEEK_NO][impl->by_indices[BY_WEEK_NO]];
-      
-      impl->last.day += week_no*7;
-
-      impl->last = icaltime_normalize(impl->last);
-      
-  } else {
-      /* Jump to the next week */
-      increment_monthday(impl,7*impl->rule.interval);
-  }
-
-  if( has_by_data(impl,BY_WEEK_NO) && end_of_data){
-      increment_year(impl,1);
-  }
-
-  return end_of_data;
-  
-}
-
-/** Expand the BYDAY rule part and return a pointer to a newly allocated list of days. */
-static pvl_list expand_by_day(icalrecur_iterator* impl, int year)
-{
-    /* Try to calculate each of the occurrences. */
-    int i;
-    pvl_list days_list = pvl_newlist();
-
-    int start_dow, end_dow, end_year_day;
-    struct icaltimetype tmp = impl->last;
-    
-    tmp.year= year;
-    tmp.month = 1;
-    tmp.day = 1;
-    tmp.is_date = 1;
-    
-    /* Find the day that 1st Jan falls on, 1 (Sun) to 7 (Sat). */
-    start_dow = icaltime_day_of_week(tmp);
-    
-    /* Get the last day of the year*/
-    tmp.year= year;
-    tmp.month = 12;
-    tmp.day = 31;
-    tmp.is_date = 1;
-    
-    end_dow =  icaltime_day_of_week(tmp);
-    end_year_day = icaltime_day_of_year(tmp);
-    
-    for(i = 0; BYDAYPTR[i] != ICAL_RECURRENCE_ARRAY_MAX; i++){
-        /* This is 1 (Sun) to 7 (Sat). */
-        int dow = 
-            icalrecurrencetype_day_day_of_week(BYDAYPTR[i]);  
-        int pos =  icalrecurrencetype_day_position(BYDAYPTR[i]);
-        
-        if(pos == 0){
-            /* The day was specified without a position -- it is just
-               a bare day of the week ( BYDAY=SU) so add all of the
-               days of the year with this day-of-week*/
-            int doy, tmp_start_doy;
-                
-	    tmp_start_doy = ((dow + 7 - start_dow) % 7) + 1;
-
-            for (doy = tmp_start_doy; doy <= end_year_day; doy += 7)
-                    pvl_push(days_list,(void*)(int)doy);
-            
-        } else if ( pos > 0) {
-            int first;
-            /* First occurrence of dow in year */
-            if( dow >= start_dow) {
-                first = dow - start_dow + 1;
-            } else {
-                first = dow - start_dow + 8;
-            }
-
-            /* Then just multiple the position times 7 to get the pos'th day in the year */
-            pvl_push(days_list,(void*)(first+  (pos-1) * 7));
-            
-        } else { /* pos < 0 */ 
-            int last;
-            pos = -pos;
-
-            /* last occurrence of dow in year */
-            if( dow <= end_dow) {
-                last = end_year_day - end_dow + dow;
-            } else {
-                last = end_year_day - end_dow + dow - 7;
-            }
-
-            pvl_push(days_list,(void*)(last - (pos-1) * 7));
-        }
-    }
-    return days_list;
-}
-
-
-/* For INTERVAL=YEARLY, set up the days[] array in the iterator to
-   list all of the days of the current year that are specified in this
-   rule. */
-
-static int expand_year_days(icalrecur_iterator* impl, int year)
-{
-    int j,k;
-    int days_index=0;
-    struct icaltimetype t;
-    int flags;
-
-    t = icaltime_null_date();
-
-#define HBD(x) has_by_data(impl,x)
-
-    memset(impl->days,ICAL_RECURRENCE_ARRAY_MAX_BYTE,sizeof(impl->days));
-    
-    /* The flags and the following switch statement select which code
-       to use to expand the yers days, based on which BY-rules are
-       present. */
-
-    flags = (HBD(BY_DAY) ? 1<<BY_DAY : 0) + 
-        (HBD(BY_WEEK_NO) ? 1<<BY_WEEK_NO : 0) + 
-        (HBD(BY_MONTH_DAY) ? 1<<BY_MONTH_DAY : 0) + 
-        (HBD(BY_MONTH) ? 1<<BY_MONTH : 0) + 
-        (HBD(BY_YEAR_DAY) ? 1<<BY_YEAR_DAY : 0);
-
-    
-    switch(flags) {
-        
-    case 0: {
-        /* FREQ=YEARLY; */
-        t = impl->dtstart;
-        t.year = impl->last.year;
-        
-        impl->days[days_index++] = (short)icaltime_day_of_year(t);
-  
-        break;
-    }
-    case 1<<BY_MONTH: {
-        /* FREQ=YEARLY; BYMONTH=3,11*/
-	
-        for(j=0;impl->by_ptrs[BY_MONTH][j]!=ICAL_RECURRENCE_ARRAY_MAX;j++){
-	    int month = impl->by_ptrs[BY_MONTH][j];	    
-            int doy;
-
-	    t = impl->dtstart;
-	    t.year = year;
-	    t.month = month;
-	    t.is_date = 1;
-
-	    doy = icaltime_day_of_year(t);
-	    
-            impl->days[days_index++] = (short)doy;
-
-        }
-        break;
-    }
-
-    case 1<<BY_MONTH_DAY:  {
-        /* FREQ=YEARLY; BYMONTHDAY=1,15*/
-        for(k=0;impl->by_ptrs[BY_MONTH_DAY][k]!=ICAL_RECURRENCE_ARRAY_MAX;k++)
-            {
-                int month_day = impl->by_ptrs[BY_MONTH_DAY][k];
-                int doy;
-
-                t = impl->dtstart;
-		t.day = month_day;
-		t.year = year;
-		t.is_date = 1;
-
-		doy = icaltime_day_of_year(t);
-
-		impl->days[days_index++] = (short)doy;
-
-            }
-        break;
-    }
-
-    case (1<<BY_MONTH_DAY) + (1<<BY_MONTH): {
-        /* FREQ=YEARLY; BYMONTHDAY=1,15; BYMONTH=10 */
-
-        for(j=0;impl->by_ptrs[BY_MONTH][j]!=ICAL_RECURRENCE_ARRAY_MAX;j++){
-            for(k=0;impl->by_ptrs[BY_MONTH_DAY][k]!=ICAL_RECURRENCE_ARRAY_MAX;k++)
-           {
-                int month = impl->by_ptrs[BY_MONTH][j];
-                int month_day = impl->by_ptrs[BY_MONTH_DAY][k];
-                int doy;
-
-		t.day = month_day;
-		t.month = month;
-		t.year = year;
-		t.is_date = 1;
-
-		doy = icaltime_day_of_year(t);
-
-		impl->days[days_index++] = (short)doy;
-
-            }
-        }
-
-        break;
-    }
-
-    case 1<<BY_WEEK_NO: {
-        /* FREQ=YEARLY; BYWEEKNO=20,50 */
-
-	int dow;
-
-	t.day = impl->dtstart.day;
-	t.month = impl->dtstart.month;
-	t.year = year;
-	t.is_date = 1;
-
-        dow = icaltime_day_of_week(t);
-	/* HACK Not finished */ 
-
-        icalerror_set_errno(ICAL_UNIMPLEMENTED_ERROR);
-	
-        break;
-    }
-
-    case (1<<BY_WEEK_NO) + (1<<BY_MONTH_DAY): {
-        /*FREQ=YEARLY; WEEKNO=20,50; BYMONTH= 6,11 */
-        icalerror_set_errno(ICAL_UNIMPLEMENTED_ERROR);
-        break;
-    }
-
-    case 1<<BY_DAY: {
-        /*FREQ=YEARLY; BYDAY=TH,20MO,-10FR*/
-        pvl_elem i;
-        pvl_list days = expand_by_day(impl,year);
-
-
-        for(i=pvl_head(days);i!=0;i=pvl_next(i)){
-            short day = (short)(intptr_t)pvl_data(i);
-            impl->days[days_index++] = day;
-        }
-
-        pvl_free(days);
-
-        break;
-    }
-
-    case (1<<BY_DAY)+(1<<BY_MONTH): {
-        /*FREQ=YEARLY; BYDAY=TH,20MO,-10FR; BYMONTH = 12*/
-
-
-        for(j=0;impl->by_ptrs[BY_MONTH][j]!=ICAL_RECURRENCE_ARRAY_MAX;j++){
-	    int month = impl->by_ptrs[BY_MONTH][j];
-	    int days_in_month = icaltime_days_in_month(month,year);
-	    int first_dow, last_dow, doy_offset;
-            
-	    t.year = year;
-	    t.month = month;
-	    t.day = 1;
-	    t.is_date = 1;
-              
-	    first_dow = icaltime_day_of_week(t);
-
-	    /* This holds the day offset used to calculate the day of the year
-	       from the month day. Just add the month day to this. */
-	    doy_offset = icaltime_day_of_year(t) - 1;
-
-	    t.day = days_in_month;
-	    last_dow = icaltime_day_of_week(t);
-
-	    for(k=0;impl->by_ptrs[BY_DAY][k]!=ICAL_RECURRENCE_ARRAY_MAX;k++){
-	        short day_coded = impl->by_ptrs[BY_DAY][k];
-		enum icalrecurrencetype_weekday dow =
-		  icalrecurrencetype_day_day_of_week(day_coded);
-		int pos = icalrecurrencetype_day_position(day_coded);  
-		int first_matching_day, last_matching_day, day, month_day;
-
-		/* Calculate the first day in the month with the given weekday,
-		   and the last day. */
-		first_matching_day = ((dow + 7 - first_dow) % 7) + 1;
-		last_matching_day = days_in_month - ((last_dow + 7 - dow) % 7);
-
-		if (pos == 0) {
-		    /* Add all of instances of the weekday within the month. */
-		  for (day = first_matching_day; day <= days_in_month; day += 7)
-		      impl->days[days_index++] = (short)(doy_offset + day);
-
-		} else if (pos > 0) {
-		    /* Add the nth instance of the weekday within the month. */
-		    month_day = first_matching_day + (pos - 1) * 7;
-
-		    if (month_day <= days_in_month)
-		        impl->days[days_index++] = (short)(doy_offset + month_day);
-
-		} else {
-		    /* Add the -nth instance of the weekday within the month.*/
-		    month_day = last_matching_day + (pos + 1) * 7;
-
-		    if (month_day > 0)
-		        impl->days[days_index++] = (short)(doy_offset + month_day);
-		}
-	    }
-        }
-        break;
-    }
-
-    case (1<<BY_DAY) + (1<<BY_MONTH_DAY) : {
-        /*FREQ=YEARLY; BYDAY=TH,20MO,-10FR; BYMONTHDAY=1,15*/
-
-        pvl_elem itr;
-        pvl_list days = expand_by_day(impl,year);
-
-        for(itr=pvl_head(days);itr!=0;itr=pvl_next(itr)){
-            short day = (short)(intptr_t)pvl_data(itr);
-            struct icaltimetype tt; 
-            
-            tt = icaltime_from_day_of_year(day,year);
-            
-            for(j = 0; BYMDPTR[j]!=ICAL_RECURRENCE_ARRAY_MAX; j++){
-                    int mday = BYMDPTR[j];
-                    
-                    if(tt.day == mday){
-                        impl->days[days_index++] = day;
-                    }
-            }
-            
-        }
-
-        pvl_free(days);
-       
-        break;
-    }
-
-    case (1<<BY_DAY) + (1<<BY_MONTH_DAY) + (1<<BY_MONTH): {
-        /*FREQ=YEARLY; BYDAY=TH,20MO,-10FR; BYMONTHDAY=10; MYMONTH=6,11*/
-
-        pvl_elem itr;
-        pvl_list days = expand_by_day(impl,year);
-
-        for(itr=pvl_head(days);itr!=0;itr=pvl_next(itr)){
-            short day = (short)(intptr_t)pvl_data(itr);
-            struct icaltimetype tt; 
-            int i;
-            
-            tt = icaltime_from_day_of_year(day,year);
-            
-            for(i = 0; BYMONPTR[i] != ICAL_RECURRENCE_ARRAY_MAX; i++){
-                for(j = 0; BYMDPTR[j]!=ICAL_RECURRENCE_ARRAY_MAX; j++){
-                    int mday = BYMDPTR[j];
-                    int month = BYMONPTR[i];
-                    
-                    if(tt.month == month  && tt.day == mday){
-                        impl->days[days_index++] = day;
-                    }
-                }
-            }
-
-        }
-
-        pvl_free(days);
-
-       break;
-
-    }
-
-    case (1<<BY_DAY) + (1<<BY_WEEK_NO) : {
-        /*FREQ=YEARLY; BYDAY=TH,20MO,-10FR;  WEEKNO=20,50*/
-       
-        pvl_elem itr;
-        pvl_list days = expand_by_day(impl,year);
-
-        for(itr=pvl_head(days);itr!=0;itr=pvl_next(itr)){
-            short day = (short)(intptr_t)pvl_data(itr);
-            struct icaltimetype tt; 
-            int i;
-            
-            tt = icaltime_from_day_of_year(day,year);
-            
-            for(i = 0; BYWEEKPTR[i] != ICAL_RECURRENCE_ARRAY_MAX; i++){
-                    int weekno = BYWEEKPTR[i];
-                    int this_weekno = icaltime_week_number(tt);
-                    if(weekno== this_weekno){
-                        impl->days[days_index++] = day;
-                    }
-            }
-                    
-        }
-
-        pvl_free(days);
-        break;
-    }
-
-    case (1<<BY_DAY) + (1<<BY_WEEK_NO) + (1<<BY_MONTH_DAY): {
-        /*FREQ=YEARLY; BYDAY=TH,20MO,-10FR;  WEEKNO=20,50; BYMONTHDAY=1,15*/
-        icalerror_set_errno(ICAL_UNIMPLEMENTED_ERROR);
-        break;
-    }
-
-    case 1<<BY_YEAR_DAY: {
-	for(j=0;impl->by_ptrs[BY_YEAR_DAY][j]!=ICAL_RECURRENCE_ARRAY_MAX;j++){
-	    impl->days[days_index++] = impl->by_ptrs[BY_YEAR_DAY][j];
-        }
-        break;
-    }
-
-    default: {
-        icalerror_set_errno(ICAL_UNIMPLEMENTED_ERROR);
-        break;
-    }
-
-    }
-
-    return 0;
-}                                  
-
-
-static int next_year(icalrecur_iterator* impl)
-{
-    struct icaltimetype next;
-
-    if (next_hour(impl) == 0){
-	return 0;
-    }
-
-    if (impl->days[++impl->days_index] == ICAL_RECURRENCE_ARRAY_MAX){
-	impl->days_index = 0;
-
-	for (;;) {
-	increment_year(impl,impl->rule.interval);
-        expand_year_days(impl,impl->last.year);
-	  if (impl->days[0] != ICAL_RECURRENCE_ARRAY_MAX)
-	    break;
-    }
-    }
-
-    next = icaltime_from_day_of_year(impl->days[impl->days_index], impl->last.year);
-    
-    impl->last.day =  next.day;
-    impl->last.month =  next.month;
-  
-    return 1;
-}
-
-int icalrecur_check_rulepart(icalrecur_iterator* impl,
-		      int v, enum byrule byrule)
-{
-    int itr;
-
-    if(impl->by_ptrs[byrule][0]!=ICAL_RECURRENCE_ARRAY_MAX){
-	for(itr=0; impl->by_ptrs[byrule][itr]!=ICAL_RECURRENCE_ARRAY_MAX;itr++){
-	    if(impl->by_ptrs[byrule][itr] == v){
-		return 1;
-	    }
-	}
-    } 
-
-    return 0;
-}
-
-static int check_contract_restriction(icalrecur_iterator* impl,
-		      enum byrule byrule, int v)
-{
-    int pass = 0;
-    int itr;
-    icalrecurrencetype_frequency freq = impl->rule.freq;
-
-    if(impl->by_ptrs[byrule][0]!=ICAL_RECURRENCE_ARRAY_MAX &&
-	expand_map[freq].map[byrule] == CONTRACT){
-	for(itr=0; impl->by_ptrs[byrule][itr]!=ICAL_RECURRENCE_ARRAY_MAX;itr++){
-	    if(impl->by_ptrs[byrule][itr] == v){
-		pass=1;
-		break;
-	    }
-	}
-
-	return pass;
-    } else {
-	/* This is not a contracting byrule, or it has no data, so the
-           test passes*/
-	return 1;
-    }
-}
-
-
-static int check_contracting_rules(icalrecur_iterator* impl)
-{
-
-    int day_of_week = icaltime_day_of_week(impl->last);
-    int week_no = icaltime_week_number(impl->last);
-    int year_day = icaltime_day_of_year(impl->last);
-
-    if (
-	check_contract_restriction(impl,BY_SECOND, impl->last.second) &&
-	check_contract_restriction(impl,BY_MINUTE, impl->last.minute) &&
-	check_contract_restriction(impl,BY_HOUR, impl->last.hour) &&
-	check_contract_restriction(impl,BY_DAY, day_of_week) &&
-	check_contract_restriction(impl,BY_WEEK_NO, week_no) &&
-	check_contract_restriction(impl,BY_MONTH_DAY, impl->last.day) &&
-	check_contract_restriction(impl,BY_MONTH, impl->last.month) &&
-	check_contract_restriction(impl,BY_YEAR_DAY, year_day) )
-    {
-
-	return 1;
-    } else {
-	return 0;
-    }
-}
-
-struct icaltimetype icalrecur_iterator_next(icalrecur_iterator *impl)
-{
-    int valid = 1;
-    
-    if( (impl->rule.count!=0 &&impl->occurrence_no >= impl->rule.count) ||
-       (!icaltime_is_null_time(impl->rule.until) && 
-	icaltime_compare(impl->last,impl->rule.until) > 0)) {
-	return icaltime_null_time();
-    }
-
-    if(impl->occurrence_no == 0 
-       &&  icaltime_compare(impl->last,impl->dtstart) >= 0){
-
-	impl->occurrence_no++;
-	return impl->last;
-    }
-
-    do {
-        valid = 1;
-	switch(impl->rule.freq){
-	    
-	    case ICAL_SECONDLY_RECURRENCE: {
-		next_second(impl);
-		break;
-	    }
-	    case ICAL_MINUTELY_RECURRENCE: {
-		next_minute(impl);
-		break;
-	    }
-	    case ICAL_HOURLY_RECURRENCE: {
-		next_hour(impl);
-		break;
-	    }
-	    case ICAL_DAILY_RECURRENCE: {
-		next_day(impl);
-		break;
-	    }
-	    case ICAL_WEEKLY_RECURRENCE: {
-		next_week(impl);
-		break;
-	    }
-	    case ICAL_MONTHLY_RECURRENCE: {
-		valid = next_month(impl);
-		break;
-	    }
-	    case ICAL_YEARLY_RECURRENCE:{
-		next_year(impl);
-		break;
-	    }
-	    default:{
-		icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-                return icaltime_null_time();
-	    }
-	}    
-	
-	if(impl->last.year >= 2038 ){
-	    /* HACK */
-	    return icaltime_null_time();
-	}
-	
-    } while(!check_contracting_rules(impl) 
-	    || icaltime_compare(impl->last,impl->dtstart) < 0
-            || valid == 0);
-    
-    
-/* Ignore null times and times that are after the until time */
-    if( !icaltime_is_null_time(impl->rule.until) && 
-	icaltime_compare(impl->last,impl->rule.until) > 0 ) {
-	return icaltime_null_time();
-    }
-
-    impl->occurrence_no++;
-
-    return impl->last;
-}
-
-
-/************************** Type Routines **********************/
-
-
-void icalrecurrencetype_clear(struct icalrecurrencetype *recur)
-{
-    memset(recur,ICAL_RECURRENCE_ARRAY_MAX_BYTE,
-	   sizeof(struct icalrecurrencetype));
-
-    recur->week_start = ICAL_MONDAY_WEEKDAY;
-    recur->freq = ICAL_NO_RECURRENCE;
-    recur->interval = 1;
-    memset(&(recur->until),0,sizeof(struct icaltimetype));
-    recur->count = 0;
-}
-
-/** The 'day' element of icalrecurrencetype_weekday is encoded to
- * allow representation of both the day of the week ( Monday, Tueday),
- * but also the Nth day of the week ( First tuesday of the month, last
- * thursday of the year) These routines decode the day values.
- *
- * The day's position in the period ( Nth-ness) and the numerical
- * value of the day are encoded together as: pos*7 + dow
- * 
- * A position of 0 means 'any' or 'every'
- */
-
-enum icalrecurrencetype_weekday icalrecurrencetype_day_day_of_week(short day)
-{
-    return abs(day)%8;
-}
-
-int icalrecurrencetype_day_position(short day)
-{
-    int wd, pos;
-
-    wd = icalrecurrencetype_day_day_of_week(day);
-
-    pos = (abs(day)-wd)/8 * ((day<0)?-1:1);
-
-
-    return pos;
-}
-
-
-/****************** Enumeration Routines ******************/
-
-static struct {icalrecurrencetype_weekday wd; const char * str; } 
-wd_map[] = {
-    {ICAL_SUNDAY_WEEKDAY,"SU"},
-    {ICAL_MONDAY_WEEKDAY,"MO"},
-    {ICAL_TUESDAY_WEEKDAY,"TU"},
-    {ICAL_WEDNESDAY_WEEKDAY,"WE"},
-    {ICAL_THURSDAY_WEEKDAY,"TH"},
-    {ICAL_FRIDAY_WEEKDAY,"FR"},
-    {ICAL_SATURDAY_WEEKDAY,"SA"},
-    {ICAL_NO_WEEKDAY,0}
-};
-
-const char* icalrecur_weekday_to_string(icalrecurrencetype_weekday kind)
-{
-    int i;
-
-    for (i=0; wd_map[i].wd  != ICAL_NO_WEEKDAY; i++) {
-	if ( wd_map[i].wd ==  kind) {
-	    return wd_map[i].str;
-	}
-    }
-
-    return 0;
-}
-
-icalrecurrencetype_weekday icalrecur_string_to_weekday(const char* str)
-{
-    int i;
-
-    for (i=0; wd_map[i].wd  != ICAL_NO_WEEKDAY; i++) {
-	if ( strcmp(str,wd_map[i].str) == 0){
-	    return wd_map[i].wd;
-	}
-    }
-
-    return ICAL_NO_WEEKDAY;
-}
-
-
-
-static struct {
-	icalrecurrencetype_frequency kind;
-	const char* str;
-} freq_map[] = {
-    {ICAL_SECONDLY_RECURRENCE,"SECONDLY"},
-    {ICAL_MINUTELY_RECURRENCE,"MINUTELY"},
-    {ICAL_HOURLY_RECURRENCE,"HOURLY"},
-    {ICAL_DAILY_RECURRENCE,"DAILY"},
-    {ICAL_WEEKLY_RECURRENCE,"WEEKLY"},
-    {ICAL_MONTHLY_RECURRENCE,"MONTHLY"},
-    {ICAL_YEARLY_RECURRENCE,"YEARLY"},
-    {ICAL_NO_RECURRENCE,0}
-};
-
-const char* icalrecur_freq_to_string(icalrecurrencetype_frequency kind)
-{
-    int i;
-
-    for (i=0; freq_map[i].kind != ICAL_NO_RECURRENCE ; i++) {
-	if ( freq_map[i].kind == kind ) {
-	    return freq_map[i].str;
-	}
-    }
-    return 0;
-}
-
-icalrecurrencetype_frequency icalrecur_string_to_freq(const char* str)
-{
-    int i;
-
-    for (i=0; freq_map[i].kind != ICAL_NO_RECURRENCE ; i++) {
-	if ( strcmp(str,freq_map[i].str) == 0){
-	    return freq_map[i].kind;
-	}
-    }
-    return ICAL_NO_RECURRENCE;
-}
-
-/** Fill an array with the 'count' number of occurrences generated by
- * the rrule. Note that the times are returned in UTC, but the times
- * are calculated in local time. YOu will have to convert the results
- * back into local time before using them.
- */
-
-int icalrecur_expand_recurrence(char* rule, time_t start,
-				int count, time_t* array)
-{
-    struct icalrecurrencetype recur;
-    icalrecur_iterator* ritr;
-    time_t tt;
-    struct icaltimetype icstart, next;
-    int i = 0;
-
-    memset(array, 0, count*sizeof(time_t));
-
-    icstart = icaltime_from_timet_with_zone(start,0,0);
-
-    recur = icalrecurrencetype_from_string(rule);
-
-    for(ritr = icalrecur_iterator_new(recur,icstart),
-	next = icalrecur_iterator_next(ritr);
-	!icaltime_is_null_time(next) && i < count;
-	next = icalrecur_iterator_next(ritr)){
-
-	tt = icaltime_as_timet(next);
-	
-	if (tt >= start ){
-	    array[i++] = tt;
-	}
-
-    }
-
-    icalrecur_iterator_free(ritr);
-
-    return 1;
-}
diff --git a/libical/src/libical/icalrecur.h b/libical/src/libical/icalrecur.h
deleted file mode 100644
index 45bdd21b65..0000000000
--- a/libical/src/libical/icalrecur.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalrecur.h
- CREATOR: eric 20 March 2000
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-*/
-
-/**
-@file icalrecur.h
-@brief Routines for dealing with recurring time
-
-How to use: 
-
-1) Get a rule and a start time from a component
-
-@code
-        icalproperty rrule;
-        struct icalrecurrencetype recur;
-        struct icaltimetype dtstart;
-
-	rrule = icalcomponent_get_first_property(comp,ICAL_RRULE_PROPERTY);
-	recur = icalproperty_get_rrule(rrule);
-	start = icalproperty_get_dtstart(dtstart);
-@endcode
-
-Or, just make them up: 
-
-@code
-        recur = icalrecurrencetype_from_string("FREQ=YEARLY;BYDAY=SU,WE");
-        dtstart = icaltime_from_string("19970101T123000")
-@endcode
-
-2) Create an iterator
-
-@code
-        icalrecur_iterator* ritr;
-        ritr = icalrecur_iterator_new(recur,start);
-@endcode
-
-3) Iterator over the occurrences
-
-@code
-        struct icaltimetype next;
-        while (next = icalrecur_iterator_next(ritr) 
-               && !icaltime_is_null_time(next){
-                Do something with next
-        }
-@endcode
-
-Note that that the time returned by icalrecur_iterator_next is in
-whatever timezone that dtstart is in.
-
-*/
-
-#ifndef ICALRECUR_H
-#define ICALRECUR_H
-
-#include <time.h>
-#include "icaltime.h"
-
-/*
- * Recurrance enumerations
- */
-
-typedef enum icalrecurrencetype_frequency
-{
-    /* These enums are used to index an array, so don't change the
-       order or the integers */
-
-    ICAL_SECONDLY_RECURRENCE=0,
-    ICAL_MINUTELY_RECURRENCE=1,
-    ICAL_HOURLY_RECURRENCE=2,
-    ICAL_DAILY_RECURRENCE=3,
-    ICAL_WEEKLY_RECURRENCE=4,
-    ICAL_MONTHLY_RECURRENCE=5,
-    ICAL_YEARLY_RECURRENCE=6,
-    ICAL_NO_RECURRENCE=7
-
-} icalrecurrencetype_frequency;
-
-typedef enum icalrecurrencetype_weekday
-{
-    ICAL_NO_WEEKDAY,
-    ICAL_SUNDAY_WEEKDAY,
-    ICAL_MONDAY_WEEKDAY,
-    ICAL_TUESDAY_WEEKDAY,
-    ICAL_WEDNESDAY_WEEKDAY,
-    ICAL_THURSDAY_WEEKDAY,
-    ICAL_FRIDAY_WEEKDAY,
-    ICAL_SATURDAY_WEEKDAY
-} icalrecurrencetype_weekday;
-
-enum {
-    ICAL_RECURRENCE_ARRAY_MAX = 0x7f7f,
-    ICAL_RECURRENCE_ARRAY_MAX_BYTE = 0x7f
-};
-
-
-
-/**
- * Recurrence type routines
- */
-
-/* See RFC 2445 Section 4.3.10, RECUR Value, for an explaination of
-   the values and fields in struct icalrecurrencetype */
-
-#define ICAL_BY_SECOND_SIZE 61
-#define ICAL_BY_MINUTE_SIZE 61
-#define ICAL_BY_HOUR_SIZE 25
-#define ICAL_BY_DAY_SIZE 364 /* 7 days * 52 weeks */
-#define ICAL_BY_MONTHDAY_SIZE 32
-#define ICAL_BY_YEARDAY_SIZE 367
-#define ICAL_BY_WEEKNO_SIZE 54
-#define ICAL_BY_MONTH_SIZE 13
-#define ICAL_BY_SETPOS_SIZE 367
-
-/** Main struct for holding digested recurrence rules */
-struct icalrecurrencetype 
-{
-	icalrecurrencetype_frequency freq;
-
-
-	/* until and count are mutually exclusive. */
-       	struct icaltimetype until; 
-	int count;
-
-	short interval;
-	
-	icalrecurrencetype_weekday week_start;
-	
-	/* The BY* parameters can each take a list of values. Here I
-	 * assume that the list of values will not be larger than the
-	 * range of the value -- that is, the client will not name a
-	 * value more than once. 
-	 
-	 * Each of the lists is terminated with the value
-	 * ICAL_RECURRENCE_ARRAY_MAX unless the the list is full.
-	 */
-
-	short by_second[ICAL_BY_SECOND_SIZE];
-	short by_minute[ICAL_BY_MINUTE_SIZE];
-	short by_hour[ICAL_BY_HOUR_SIZE];
-	short by_day[ICAL_BY_DAY_SIZE]; /* Encoded value, see below */
-	short by_month_day[ICAL_BY_MONTHDAY_SIZE];
-	short by_year_day[ ICAL_BY_YEARDAY_SIZE];
-	short by_week_no[ICAL_BY_WEEKNO_SIZE];
-	short by_month[ICAL_BY_MONTH_SIZE];
-	short by_set_pos[ICAL_BY_SETPOS_SIZE];
-};
-
-
-void icalrecurrencetype_clear(struct icalrecurrencetype *r);
-
-/**
- * Array Encoding
- *
- * The 'day' element of the by_day array is encoded to allow
- * representation of both the day of the week ( Monday, Tueday), but also
- * the Nth day of the week ( First tuesday of the month, last thursday of
- * the year) These routines decode the day values 
- */
-
-/** 1 == Monday, etc. */
-enum icalrecurrencetype_weekday icalrecurrencetype_day_day_of_week(short day);
-
-/** 0 == any of day of week. 1 == first, 2 = second, -2 == second to last, etc */
-int icalrecurrencetype_day_position(short day);
-
-icalrecurrencetype_weekday icalrecur_string_to_weekday(const char* str);
-
-/** Recurrance rule parser */
-
-/** Convert between strings and recurrencetype structures. */
-struct icalrecurrencetype icalrecurrencetype_from_string(const char* str);
-char* icalrecurrencetype_as_string(struct icalrecurrencetype *recur);
-
-
-/** Recurrence iteration routines */
-
-typedef struct icalrecur_iterator_impl  icalrecur_iterator;
-
-/** Create a new recurrence rule iterator */
-icalrecur_iterator* icalrecur_iterator_new(struct icalrecurrencetype rule, 
-                                           struct icaltimetype dtstart);
-
-/** Get the next occurrence from an iterator */
-struct icaltimetype icalrecur_iterator_next(icalrecur_iterator*);
-
-void icalrecur_iterator_decrement_count(icalrecur_iterator*);
-
-/** Free the iterator */
-void icalrecur_iterator_free(icalrecur_iterator*);
-
-/**
- * Fills array up with at most 'count' time_t values, each
- *  representing an occurrence time in seconds past the POSIX epoch 
- */
-int icalrecur_expand_recurrence(char* rule, time_t start, 
-				int count, time_t* array);
-
-
-#endif
diff --git a/libical/src/libical/icalrestriction.c.in b/libical/src/libical/icalrestriction.c.in
deleted file mode 100644
index 05cdc9d413..0000000000
--- a/libical/src/libical/icalrestriction.c.in
+++ /dev/null
@@ -1,465 +0,0 @@
-/*  -*- Mode: C -*- */
-/*  ======================================================================
-  File: icalrestriction.c
-    
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
- ======================================================================*/
-/*#line 7 "icalrestriction.c.in"*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "icalrestriction.h"
-#include "icalenums.h"
-#include "icalerror.h"
-
-#include <assert.h>
-#include <stdio.h> /* For snprintf */   
-
-#define TMP_BUF_SIZE 1024
-
-#ifdef WIN32
-#define snprintf	_snprintf
-#define strcasecmp	stricmp
-#endif
-
-
-/* Define the structs for the restrictions. these data are filled out
-in machine generated code below */
-
-struct icalrestriction_property_record;
-
-typedef char* (*restriction_func)(struct icalrestriction_property_record* rec,icalcomponent* comp,icalproperty* prop);
-
-
-typedef struct icalrestriction_property_record {
-	icalproperty_method method;
-	icalcomponent_kind component;
-	icalproperty_kind property;
-	icalrestriction_kind restriction;
-	restriction_func function;
-} icalrestriction_property_record;
-
-
-typedef struct icalrestriction_component_record {
-	icalproperty_method method;
-	icalcomponent_kind component;
-	icalcomponent_kind subcomponent;
-	icalrestriction_kind restriction;
-	restriction_func function;
-} icalrestriction_component_record;
-
-icalrestriction_property_record*
-icalrestriction_get_property_restriction(icalproperty_method method,
-					 icalcomponent_kind component,
-					 icalproperty_kind property);
-icalrestriction_component_record*
-icalrestriction_get_component_restriction(icalproperty_method method,
-					  icalcomponent_kind component,
-					  icalcomponent_kind subcomponent);
-
-icalrestriction_component_record icalrestriction_component_records[];
-icalrestriction_property_record icalrestriction_property_records[]; 
-
-icalrestriction_property_record null_prop_record =   {ICAL_METHOD_NONE,ICAL_NO_COMPONENT,ICAL_NO_PROPERTY,ICAL_RESTRICTION_UNKNOWN,0};
-icalrestriction_component_record null_comp_record =   {ICAL_METHOD_NONE,ICAL_NO_COMPONENT,ICAL_NO_COMPONENT,ICAL_RESTRICTION_UNKNOWN,0};
-
-
-/** The each row gives the result of comparing a restriction against a
-   count. The columns in each row represent 0,1,2+. '-1' indicates
-   'invalid, 'don't care' or 'needs more analysis' So, for
-   ICAL_RESTRICTION_ONE, if there is 1 of a property with that
-   restriction, it passes, but if there are 0 or 2+, it fails. */
-
-char compare_map[ICAL_RESTRICTION_UNKNOWN+1][3] = {
-    { 1, 1, 1},/*ICAL_RESTRICTION_NONE*/
-    { 1, 0, 0},/*ICAL_RESTRICTION_ZERO*/
-    { 0, 1, 0},/*ICAL_RESTRICTION_ONE*/
-    { 1, 1, 1},/*ICAL_RESTRICTION_ZEROPLUS*/
-    { 0, 1, 1},/*ICAL_RESTRICTION_ONEPLUS*/
-    { 1, 1, 0},/*ICAL_RESTRICTION_ZEROORONE*/
-    { 1, 1, 0},/*ICAL_RESTRICTION_ONEEXCLUSIVE*/
-    { 1, 1, 0},/*ICAL_RESTRICTION_ONEMUTUAL*/
-    { 1, 1, 1} /*ICAL_RESTRICTION_UNKNOWN*/
-};
-
-char restr_string_map[ICAL_RESTRICTION_UNKNOWN+1][60] = {
-    "unknown number",/*ICAL_RESTRICTION_NONE*/
-    "0",/*ICAL_RESTRICTION_ZERO*/
-    "1",/*ICAL_RESTRICTION_ONE*/
-    "zero or more",/*ICAL_RESTRICTION_ZEROPLUS*/
-    "one or more" ,/*ICAL_RESTRICTION_ONEPLUS*/
-    "zero or one",/*ICAL_RESTRICTION_ZEROORONE*/
-    "zero or one, exclusive with another property",/*ICAL_RESTRICTION_ONEEXCLUSIVE*/
-    "zero or one, mutual with another property",/*ICAL_RESTRICTION_ONEMUTUAL*/
-    "unknown number" /*ICAL_RESTRICTION_UNKNOWN*/
-};
-
-
-int
-icalrestriction_compare(icalrestriction_kind restr, int count){
-
-    if ( restr < ICAL_RESTRICTION_NONE || restr > ICAL_RESTRICTION_UNKNOWN
-	 || count < 0){
-	return -1;
-    }
-
-    if (count > 2) {
-	count = 2;
-    }
-
-    return compare_map[restr][count];
-
-}
-
-/* Special case routines */
-
-char* icalrestriction_may_be_draft_final_canceled(
-    icalrestriction_property_record *rec,
-    icalcomponent* comp, 
-    icalproperty* prop)
-{
-
-    icalproperty_status stat = icalproperty_get_status(prop);
-
-    if( !( stat == ICAL_STATUS_DRAFT ||
-	   stat == ICAL_STATUS_FINAL ||
-	   stat == ICAL_STATUS_CANCELLED )){
-
-	return "Failed iTIP restrictions for STATUS property. Value must be one of DRAFT, FINAL, or CANCELED";
-
-    }
-
-    return 0;    
-}
-
-char* icalrestriction_may_be_comp_need_process(
-    icalrestriction_property_record *rec,
-    icalcomponent* comp, 
-    icalproperty* prop)
-{
-    icalproperty_status stat = icalproperty_get_status(prop);
-
-    if( !( stat == ICAL_STATUS_COMPLETED ||
-	   stat == ICAL_STATUS_NEEDSACTION ||
-	   stat == ICAL_STATUS_INPROCESS )){
-
-	return "Failed iTIP restrictions for STATUS property. Value must be one of COMPLETED, NEEDS-ACTION or IN-PROCESS";
-
-    }
-
-    return 0;    
-}
-char* icalrestriction_may_be_tent_conf(icalrestriction_property_record *rec,
-				       icalcomponent* comp, 
-				       icalproperty* prop){
-    icalproperty_status stat = icalproperty_get_status(prop);
-
-    if( !( stat == ICAL_STATUS_TENTATIVE ||
-	   stat == ICAL_STATUS_CONFIRMED )){
-
-	return "Failed iTIP restrictions for STATUS property. Value must be one of TENTATIVE or CONFIRMED";
-
-    }
-
-    return 0;    
-}
-char* icalrestriction_may_be_tent_conf_cancel(
-    icalrestriction_property_record *rec,
-    icalcomponent* comp, 
-    icalproperty* prop)
-{
-    icalproperty_status stat = icalproperty_get_status(prop);
-
-    if( !( stat == ICAL_STATUS_TENTATIVE ||
-	   stat == ICAL_STATUS_CONFIRMED ||
-	   stat == ICAL_STATUS_CANCELLED )){
-
-	return "Failed iTIP restrictions for STATUS property. Value must be one of TENTATIVE, CONFIRMED or CANCELED";
-
-    }
-
-    return 0;    
-}
-
-char* icalrestriction_must_be_cancel_if_present(
-    icalrestriction_property_record *rec,
-    icalcomponent* comp, 
-    icalproperty* prop)
-{
-    /* This routine will not be called if prop == 0 */
-    icalproperty_status stat = icalproperty_get_status(prop);
-
-    if( stat != ICAL_STATUS_CANCELLED)
-    {
-	return "Failed iTIP restrictions for STATUS property. Value must be CANCELLED";
-
-    }
- 
-
-    return 0;    
-}
-
-char* icalrestriction_must_be_canceled_no_attendee(
-    icalrestriction_property_record *rec,
-    icalcomponent* comp, 
-    icalproperty* prop)
-{
-
-    /* Hack. see rfc2446, 3.2.5 CANCEL for porperty STATUS. I don't
-       understand the note */
-
-    return 0;    
-}
-char* icalrestriction_must_be_recurring(icalrestriction_property_record *rec,
-					icalcomponent* comp, 
-					icalproperty* prop){
-    /* Hack */
-    return 0;    
-}
-char* icalrestriction_must_have_duration(icalrestriction_property_record *rec,
-					 icalcomponent* comp, 
-					 icalproperty* prop){
-    
-    if( !icalcomponent_get_first_property(comp,ICAL_DURATION_PROPERTY)){
-
-	return "Failed iTIP restrictions. This component must have a DURATION property";
-
-    }
-
-    return 0;    
-}
-char* icalrestriction_must_have_repeat(icalrestriction_property_record *rec,
-				       icalcomponent* comp, 
-				       icalproperty* prop){
-    if( !icalcomponent_get_first_property(comp,ICAL_REPEAT_PROPERTY)){
-
-	return "Failed iTIP restrictions. This component must have a REPEAT property";
-
-    }
-
-    return 0;    
-}
-char* icalrestriction_must_if_tz_ref(icalrestriction_property_record *rec,
-				     icalcomponent* comp, 
-				     icalproperty* prop){
-
-    /* Hack */
-    return 0;    
-}
-char* icalrestriction_no_dtend(icalrestriction_property_record *rec,
-			       icalcomponent* comp, 
-			       icalproperty* prop){
-
-    if( icalcomponent_get_first_property(comp,ICAL_DTEND_PROPERTY)){
-
-	return "Failed iTIP restrictions. The component must not have both DURATION and DTEND";
-
-    }
-
-    return 0;    
-}
-char* icalrestriction_no_duration(icalrestriction_property_record *rec,
-				icalcomponent* comp, 
-				  icalproperty* prop){
-
-    /* _no_dtend takes care of this one */
-    return 0;    
-}                                     
-char* icalrestriction_must_be_email(
-    icalrestriction_property_record *rec,
-    icalcomponent* comp, 
-    icalproperty* prop)
-{
-    icalproperty_status stat = icalproperty_get_action(prop);
-
-    if( !( stat == ICAL_ACTION_EMAIL)){
-
-	return "Failed iTIP restrictions for ACTION property. Value must be EMAIL.";
-
-    }
-
-    return 0;    
-}
-
-int icalrestriction_check_component(icalproperty_method method,
-				    icalcomponent* comp)
-{
-    icalproperty_kind kind;
-    icalcomponent_kind comp_kind;
-    icalrestriction_kind restr;
-    icalrestriction_property_record *prop_record;
-    char* funcr = 0;
-    icalproperty *prop;
-
-    int count;
-    int compare;
-    int valid = 1;
-
-    comp_kind = icalcomponent_isa(comp);
-
-    /* Check all of the properties in this component */
-
-    for(kind = ICAL_ANY_PROPERTY+1; kind != ICAL_NO_PROPERTY; kind++){
-	count = icalcomponent_count_properties(comp, kind);
-	
-	prop_record = icalrestriction_get_property_restriction(method, 
-							 comp_kind,
-							 kind);
-
-	restr = prop_record->restriction;
-
-	if(restr == ICAL_RESTRICTION_ONEEXCLUSIVE ||
-	    restr == ICAL_RESTRICTION_ONEMUTUAL) {
-
-	    /* First treat is as a 0/1 restriction */
-	    restr = ICAL_RESTRICTION_ZEROORONE;
-	    compare = icalrestriction_compare(restr,count);
-
-	} else {
-
-	    compare = icalrestriction_compare(restr,count);
-	}
-
-	assert(compare != -1);
-
-	if (compare == 0){
-	    char temp[TMP_BUF_SIZE];
-	    
-	    snprintf(temp, TMP_BUF_SIZE,"Failed iTIP restrictions for %s property. Expected %s instances of the property and got %d",
-		    icalenum_property_kind_to_string(kind),
-		    restr_string_map[restr], count);
-	    
-	    icalcomponent_add_property
-		(comp,
-		 icalproperty_vanew_xlicerror(
-		     temp,
-		     icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_INVALIDITIP),
-		     0));   
-	} 
-
-
-	prop = icalcomponent_get_first_property(comp, kind);
-
-	if (prop != 0 && prop_record->function !=0  ){
-	    funcr =  prop_record->function(prop_record,comp,prop);
-	}
-
-	if(funcr !=0){
-	    icalcomponent_add_property
-		(comp,
-		 icalproperty_vanew_xlicerror(
-		     funcr,
-		     icalparameter_new_xlicerrortype(
-			 ICAL_XLICERRORTYPE_INVALIDITIP),
-		     0));   
-
-	    compare = 0;
-	}
-
-	valid = valid && compare;
-    }
-
-
-
-    return valid;
-
-
-}
-
-int icalrestriction_check(icalcomponent* outer_comp)
-{
-    icalcomponent_kind comp_kind;
-    icalproperty_method method;
-    icalcomponent* inner_comp;
-    icalproperty *method_prop;
-    int valid;
-    
-    icalerror_check_arg_rz( (outer_comp!=0), "outer comp");
-
-
-    /* Get the Method value from the outer component */
-
-    comp_kind = icalcomponent_isa(outer_comp);
-
-    if (comp_kind != ICAL_VCALENDAR_COMPONENT){
-	icalerror_set_errno(ICAL_BADARG_ERROR);
-	return 0;
-    }
-
-    method_prop = icalcomponent_get_first_property(outer_comp,
-						   ICAL_METHOD_PROPERTY);
-
-    if (method_prop == 0){
-	method = ICAL_METHOD_NONE;
-    } else {
-	method = icalproperty_get_method(method_prop);
-    }
-   
-
-    /* Check the VCALENDAR wrapper */
-    valid = icalrestriction_check_component(ICAL_METHOD_NONE,outer_comp);
-
-
-    /* Now check the inner components */
-
-    for(inner_comp= icalcomponent_get_first_component(outer_comp,
-						      ICAL_ANY_COMPONENT);
-	inner_comp != 0;
-	inner_comp= icalcomponent_get_next_component(outer_comp,
-						     ICAL_ANY_COMPONENT)){
-
-	valid = valid && icalrestriction_check_component(method,inner_comp);
-
-    }
-
-
-    return valid;
-
-}
-
-icalrestriction_property_record*
-icalrestriction_get_property_restriction(icalproperty_method method,
-					 icalcomponent_kind component,
-					 icalproperty_kind property)
-{
-    int i;
-
-    for(i = 0;
-	icalrestriction_property_records[i].restriction != ICAL_RESTRICTION_NONE;
-	i++){
-
-	if (method == icalrestriction_property_records[i].method &&
-	    component == icalrestriction_property_records[i].component &&
-	    property ==  icalrestriction_property_records[i].property ){
-	    return  &icalrestriction_property_records[i];
-	}
-    }
-	
-    return &null_prop_record;
-}
-
-
-icalrestriction_component_record*
-icalrestriction_get_component_restriction(icalproperty_method method,
-					  icalcomponent_kind component,
-					  icalcomponent_kind subcomponent)
-{
-
-    int i;
-
-    for(i = 0;
-	icalrestriction_component_records[i].restriction != ICAL_RESTRICTION_NONE;
-	i++){
-
-	if (method == icalrestriction_component_records[i].method &&
-	    component == icalrestriction_component_records[i].component &&
-	    subcomponent ==  icalrestriction_component_records[i].subcomponent ){
-	    return  &icalrestriction_component_records[i];
-	}
-    }
-	
-    return &null_comp_record;
-}
-
diff --git a/libical/src/libical/icalrestriction.h b/libical/src/libical/icalrestriction.h
deleted file mode 100644
index 409334cf28..0000000000
--- a/libical/src/libical/icalrestriction.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
-  FILE: icalrestriction.h
-  CREATOR: eric 24 April 1999
-  
-  $Id$
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalrestriction.h
-
-  Contributions from:
-     Graham Davison (g.m.davison@computer.org)
-
-
-======================================================================*/
-
-#include "icalproperty.h"
-#include "icalcomponent.h"
-
-#ifndef ICALRESTRICTION_H
-#define ICALRESTRICTION_H
-
-/* These must stay in this order for icalrestriction_compare to work */
-typedef enum icalrestriction_kind {
-    ICAL_RESTRICTION_NONE=0,		/* 0 */
-    ICAL_RESTRICTION_ZERO,		/* 1 */
-    ICAL_RESTRICTION_ONE,		/* 2 */
-    ICAL_RESTRICTION_ZEROPLUS,		/* 3 */
-    ICAL_RESTRICTION_ONEPLUS,		/* 4 */
-    ICAL_RESTRICTION_ZEROORONE,		/* 5 */
-    ICAL_RESTRICTION_ONEEXCLUSIVE,	/* 6 */
-    ICAL_RESTRICTION_ONEMUTUAL,		/* 7 */
-    ICAL_RESTRICTION_UNKNOWN		/* 8 */
-} icalrestriction_kind;
-
-int 
-icalrestriction_compare(icalrestriction_kind restr, int count);
-
-
-int
-icalrestriction_is_parameter_allowed(icalproperty_kind property,
-                                       icalparameter_kind parameter);
-
-int icalrestriction_check(icalcomponent* comp);
-
-
-#endif /* !ICALRESTRICTION_H */
-
-
-
diff --git a/libical/src/libical/icaltime.c b/libical/src/libical/icaltime.c
deleted file mode 100644
index 371d679f7d..0000000000
--- a/libical/src/libical/icaltime.c
+++ /dev/null
@@ -1,1050 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icaltime.c
-  CREATOR: eric 02 June 2000
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
- ======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "icaltime.h"
-#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <time.h>
-
-#include "astime.h"		/* Julian data handling routines */
-
-#include "icalerror.h"
-#include "icalmemory.h"
-
-#include "icaltimezone.h"
-#include "icalvalue.h"
-
-#ifdef WIN32
-#include <Windows.h>
-
-#define snprintf      _snprintf
-#define strcasecmp    stricmp
-#endif
-
-/*
- *  Function to convert a struct tm time specification
- *  to an ANSI time_t using the specified time zone.
- *  This is different from the standard mktime() function
- *  in that we dont want the automatic adjustments for
- *  local daylight savings time applied to the result.
- *  This function expects well-formed input.
- */
-static time_t make_time(struct tm *tm, int tzm)
-{
-  time_t tim;
-
-  static int days[] = { -1, 30, 58, 89, 119, 150, 180, 211, 242, 272, 303, 333, 364 };
-
-  /* check that year specification within range */
-
-  if (tm->tm_year < 70 || tm->tm_year > 138)
-    return((time_t) -1);
-
-  /* check that month specification within range */
-
-  if (tm->tm_mon < 0 || tm->tm_mon > 11)
-    return((time_t) -1);
-
-  /* check for upper bound of Jan 17, 2038 (to avoid possibility of
-     32-bit arithmetic overflow) */
-  
-  if (tm->tm_year == 138) {
-    if (tm->tm_mon > 0)
-      return((time_t) -1);
-    else if (tm->tm_mday > 17)
-      return((time_t) -1);
-  }
-
-  /*
-   *  calculate elapsed days since start of the epoch (midnight Jan
-   *  1st, 1970 UTC) 17 = number of leap years between 1900 and 1970
-   *  (number of leap days to subtract)
-   */
-
-  tim = (tm->tm_year - 70) * 365 + ((tm->tm_year - 1) / 4) - 17;
-
-  /* add number of days elapsed in the current year */
-
-  tim += days[tm->tm_mon];
-
-  /* check and adjust for leap years (the leap year check only valid
-     during the 32-bit era */
-
-  if ((tm->tm_year & 3) == 0 && tm->tm_mon > 1)
-    tim += 1;
-
-  /* elapsed days to current date */
-
-  tim += tm->tm_mday;
-
-
-  /* calculate elapsed hours since start of the epoch */
-
-  tim = tim * 24 + tm->tm_hour;
-
-  /* calculate elapsed minutes since start of the epoch */
-
-  tim = tim * 60 + tm->tm_min;
-  
-  /* adjust per time zone specification */
-  
-  tim -= tzm;
-  
-  /* calculate elapsed seconds since start of the epoch */
-  
-  tim = tim * 60 + tm->tm_sec;
-  
-  /* return number of seconds since start of the epoch */
-  
-  return(tim);
-}
-
-/**	@brief Constructor (deprecated).
- *
- * Convert seconds past UNIX epoch to a timetype.
- *
- * @deprecated This constructor is deprecated and shouldn't be used in
- *   new software.  Use icaltime_from_timet_with_zone(time_t, int,
- *   icaltimezone *) instead.  In the meantime, calls to this method
- *   return a floating time, which can always be converted to a local
- *   time with an appropriate call to icaltime_convert_to_zone().
- */
-
-struct icaltimetype 
-icaltime_from_timet(const time_t tm, const int is_date)
-{
-#ifndef NO_WARN_DEPRECATED
-	icalerror_warn("icaltime_from_timet() is DEPRECATED, use icaltime_from_timet_with_zone() instead");
-#endif
-
-	return icaltime_from_timet_with_zone(tm, is_date, 0);
-}
-
-
-/**	@brief Constructor.
- *
- *	@param tm The time
- *	@param is_date Boolean: 1 means we should treat tm as a DATE
- *	@param zone The timezone tm is in, NULL means to treat tm as a
- *		floating time
- *
- *	Return a new icaltime instance, initialized to the given time
- *	expressed as seconds past UNIX epoch, optionally using the given
- *	timezone.
- *
- *	If the caller specifies the is_date param as TRUE, the returned
- *	object is of DATE type, otherwise the input is meant to be of
- *	DATE-TIME type.
- *	If the zone is not specified (NULL zone param) the time is taken
- *	to be floating, that is, valid in any timezone. Note that, in
- *	addition to the uses specified in [RFC2445], this can be used
- *	when doing simple math on couples of times.
- *	If the zone is specified (UTC or otherwise), it's stored in the
- *	object and it's used as the native timezone for this object.
- *	This means that the caller can convert this time to a different
- *	target timezone with no need to store the source timezone.
- *
- */
-struct icaltimetype 
-icaltime_from_timet_with_zone(const time_t tm, const int is_date,
-	const icaltimezone *zone)
-{
-    struct icaltimetype tt = icaltime_null_time();
-    struct tm t;
-    icaltimezone *utc_zone;
-
-    /* Convert the time_t to a struct tm. We can trust gmtime for this. */
-#ifdef HAVE_GMTIME_R
-    gmtime_r(&tm, &t);
-#else
-    {
-	struct tm *t_ptr = gmtime(&tm);
-	t = *t_ptr;
-    }
-#endif
-
-    tt.year   = t.tm_year + 1900;
-    tt.month  = t.tm_mon + 1;
-    tt.day    = t.tm_mday;
-
-    if (is_date) { 
-    	tt.is_date = 1;
-	return tt;
-    }
-
-    tt.hour   = t.tm_hour;
-    tt.minute = t.tm_min;
-    tt.second = t.tm_sec;
-
-    /* If it's a floating time, we don't do any conversion. */
-    if (zone == NULL) {
-	return tt;
-    }
-
-    utc_zone = icaltimezone_get_utc_timezone ();
-    tt.is_utc = (zone == utc_zone) ? 1 : 0;
-    tt.zone = zone;
-
-    return tt;
-}
-
-/**	@brief Constructor.
- * 
- * Returns an icaltimetype representing the current time in the given timezone.
- */
-struct icaltimetype icaltime_current_time_with_zone(const icaltimezone *zone)
-{
-    return icaltime_from_timet_with_zone (time (NULL), 0, zone);
-}
-
-/**	@brief Constructor.
- * 
- * Returns an icaltimetype representing the current day.
- */
-struct icaltimetype icaltime_today(void)
-{
-    return icaltime_from_timet_with_zone (time (NULL), 1, NULL);
-}
-
-/**	@brief	Return the time as seconds past the UNIX epoch
- *
- *	While this function is not currently deprecated, it probably won't do
- *	what you expect, unless you know what you're doing. In particular, you
- *	should only pass an icaltime in UTC, since no conversion is done. Even
- *	in that case, it's probably better to just use
- *	icaltime_as_timet_with_zone().
- */
-time_t icaltime_as_timet(const struct icaltimetype tt)
-{
-    struct tm stm;
-    time_t t;
-
-    /* If the time is the special null time, return 0. */
-    if (icaltime_is_null_time(tt)) {
-	return 0;
-    }
-
-    /* Copy the icaltimetype to a struct tm. */
-    memset (&stm, 0, sizeof (struct tm));
-
-    if (icaltime_is_date(tt)) {
-	stm.tm_sec = stm.tm_min = stm.tm_hour = 0;
-    } else {
-	stm.tm_sec = tt.second;
-	stm.tm_min = tt.minute;
-	stm.tm_hour = tt.hour;
-    }
-
-    stm.tm_mday = tt.day;
-    stm.tm_mon = tt.month-1;
-    stm.tm_year = tt.year-1900;
-    stm.tm_isdst = -1;
-
-    t = make_time(&stm, 0);
-
-    return t;
-
-}
-
-/**	Return the time as seconds past the UNIX epoch, using the
- *	given timezone.
- *
- *	This convenience method combines a call to icaltime_convert_to_zone()
- *	with a call to icaltime_as_timet().
- *	If the input timezone is null, no conversion is done; that is, the
- *	time is simply returned as time_t in its native timezone.
- */
-time_t icaltime_as_timet_with_zone(const struct icaltimetype _tt,
-	const icaltimezone *zone)
-{
-    struct icaltimetype tt = _tt;
-    struct tm stm;
-    time_t t;
-
-    /* If the time is the special null time, return 0. */
-    if (icaltime_is_null_time(tt)) {
-	return 0;
-    }
-
-    if (zone != NULL) {
-	tt = icaltime_convert_to_zone(_tt, zone);
-    }
-
-    /* Copy the icaltimetype to a struct tm. */
-    memset (&stm, 0, sizeof (struct tm));
-
-    if (icaltime_is_date(tt)) {
-	stm.tm_sec = stm.tm_min = stm.tm_hour = 0;
-    } else {
-	stm.tm_sec = tt.second;
-	stm.tm_min = tt.minute;
-	stm.tm_hour = tt.hour;
-    }
-
-    stm.tm_mday = tt.day;
-    stm.tm_mon = tt.month-1;
-    stm.tm_year = tt.year-1900;
-    stm.tm_isdst = -1;
-
-    t = make_time(&stm, 0);
-
-    return t;
-}
-
-/**
- * Return a string represention of the time, in RFC2445 format. The
- * string is owned by libical
- */
-const char* icaltime_as_ical_string(const struct icaltimetype tt)
-{
-    size_t size = 17;
-    char* buf = icalmemory_new_buffer(size);
-
-    if(tt.is_date){
-	snprintf(buf, size,"%04d%02d%02d",tt.year,tt.month,tt.day);
-    } else {
-	char* fmt;
-	if(tt.is_utc){
-	    fmt = "%04d%02d%02dT%02d%02d%02dZ";
-	} else {
-	    fmt = "%04d%02d%02dT%02d%02d%02d";
-	}
-	snprintf(buf, size,fmt,tt.year,tt.month,tt.day,
-		 tt.hour,tt.minute,tt.second);
-    }
-    
-    icalmemory_add_tmp_buffer(buf);
-
-    return buf;
-
-}
-
-/**
- *	Reset all of the time components to be in their normal ranges. For
- *	instance, given a time with minutes=70, the minutes will be reduces
- *	to 10, and the hour incremented. This allows the caller to do
- *	arithmetic on times without worrying about overflow or
- *	underflow.
- *
- *	Implementation note: we call icaltime_adjust() with no adjustment.
- */
-struct icaltimetype icaltime_normalize(const struct icaltimetype tt)
-{
-	struct icaltimetype ret = tt;
-	icaltime_adjust(&ret, 0, 0, 0, 0);
-	return ret;
-}
-
-
-
-/**	@brief Contructor.
- * 
- * Create a time from an ISO format string.
- *
- * @todo If the given string specifies a DATE-TIME not in UTC, there
- *       is no way to know if this is a floating time or really refers to a
- *       timezone. We should probably add a new constructor:
- *       icaltime_from_string_with_zone()
- */
-struct icaltimetype icaltime_from_string(const char* str)
-{
-    struct icaltimetype tt = icaltime_null_time();
-    int size;
-
-    icalerror_check_arg_re(str!=0,"str",icaltime_null_time());
-
-    size = strlen(str);
-    
-    if(size == 15) { /* floating time */
-	tt.is_utc = 0;
-	tt.is_date = 0;
-    } else if (size == 16) { /* UTC time, ends in 'Z'*/
-	if(str[15] != 'Z')
-	    goto FAIL;
-
-	tt.is_utc = 1;
-	tt.zone = icaltimezone_get_utc_timezone();
-	tt.is_date = 0;
-    } else if (size == 8) { /* A DATE */
-	tt.is_utc = 1;
-	tt.is_date = 1;
-    } else { /* error */
-	goto FAIL;
-    }
-
-    if(tt.is_date == 1){
-	if (sscanf(str,"%04d%02d%02d",&tt.year,&tt.month,&tt.day) < 3)
-	    goto FAIL;
-    } else {
-	char tsep;
-	if (sscanf(str,"%04d%02d%02d%c%02d%02d%02d",&tt.year,&tt.month,&tt.day,
-	       &tsep,&tt.hour,&tt.minute,&tt.second) < 7)
-	    goto FAIL;
-
-	if(tsep != 'T')
-	    goto FAIL;
-    }
-
-    return tt;    
-
-FAIL:
-    icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-    return icaltime_null_time();
-}
-
-
-/* Returns whether the specified year is a leap year. Year is the normal year,
-   e.g. 2001. */
-int
-icaltime_is_leap_year (const int year)
-{
-
-    if (year <= 1752)
-        return (year % 4 == 0);
-    else
-        return ( (year % 4==0) && (year % 100 !=0 )) || (year % 400 == 0);
-}
-
-static int _days_in_month[] = {0,31,28,31,30,31,30,31,31,30,31,30,31};
-
-int icaltime_days_in_month(const int month, const int year)
-{
-
-    int days = _days_in_month[month];
-
-    assert(month > 0);
-    assert(month <= 12);
-
-    if( month == 2){
-	days += icaltime_is_leap_year(year);
-    }
-
-    return days;
-}
-
-/* 1-> Sunday, 7->Saturday */
-int icaltime_day_of_week(const struct icaltimetype t){
-	UTinstant jt;
-
-	memset(&jt,0,sizeof(UTinstant));
-
-	jt.year = t.year;
-    jt.month = t.month;
-    jt.day = t.day;
-    jt.i_hour = 0;
-    jt.i_minute = 0;
-    jt.i_second = 0;
-
-	juldat(&jt);
-
-	return jt.weekday + 1;
-}
-
-/** Day of the year that the first day of the week (Sunday) is on.
- */
-int icaltime_start_doy_week(const struct icaltimetype t, int fdow){
-	UTinstant jt;
-	int delta;
-
-	memset(&jt,0,sizeof(UTinstant));
-
-	jt.year = t.year;
-    jt.month = t.month;
-    jt.day = t.day;
-    jt.i_hour = 0;
-    jt.i_minute = 0;
-    jt.i_second = 0;
-
-	juldat(&jt);
-	caldat(&jt);
-
-	delta = jt.weekday - (fdow - 1);
-	if (delta < 0) delta += 7;
-	return jt.day_of_year - delta;
-}
-
-/** Day of the year that the first day of the week (Sunday) is on.
- * 
- *  @deprecated Doesn't take into account different week start days. 
- */
-int icaltime_start_doy_of_week(const struct icaltimetype t){
-
-#ifndef NO_WARN_DEPRECATED
-    icalerror_warn("icaltime_start_doy_of_week() is DEPRECATED, use\
-	icaltime_start_doy_week() instead");
-#endif
-
-    return icaltime_start_doy_week(t, 1);
-}
-
-/** 
- * @todo Doesn't take into account the start day of the
- * week. strftime assumes that weeks start on Monday. 
- */
-int icaltime_week_number(const struct icaltimetype ictt)
-{
-	UTinstant jt;
-
-	memset(&jt,0,sizeof(UTinstant));
-
-	jt.year = ictt.year;
-    jt.month = ictt.month;
-    jt.day = ictt.day;
-    jt.i_hour = 0;
-    jt.i_minute = 0;
-    jt.i_second = 0;
-
-	juldat(&jt);
-	caldat(&jt);
-
-	return (jt.day_of_year - jt.weekday) / 7;
-}
-
-/* The first array is for non-leap years, the second for leap years*/
-static const int days_in_year[2][13] = 
-{ /* jan feb mar apr may  jun  jul  aug  sep  oct  nov  dec */
-  {  0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 }, 
-  {  0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
-};
-
-/**
- *	Returns the day of the year, counting from 1 (Jan 1st).
- */
-int icaltime_day_of_year(const struct icaltimetype t){
-  int is_leap = icaltime_is_leap_year (t.year);
-
-  return days_in_year[is_leap][t.month - 1] + t.day;
-}
-
-/**	@brief Contructor.
- *
- *	Create a new time, given a day of year and a year.
- */
-/* Jan 1 is day #1, not 0 */
-struct icaltimetype icaltime_from_day_of_year(const int _doy, const int _year)
-{
-    struct icaltimetype tt = icaltime_null_date();
-    int is_leap;
-    int month;
-    int doy = _doy;
-    int year = _year;
-
-    is_leap = icaltime_is_leap_year(year);
-
-    /* Zero and neg numbers represent days  of the previous year */
-    if(doy <1){
-        year--;
-        is_leap = icaltime_is_leap_year(year);
-        doy +=  days_in_year[is_leap][12];
-    } else if(doy > days_in_year[is_leap][12]){
-        /* Move on to the next year*/
-        is_leap = icaltime_is_leap_year(year);
-        doy -=  days_in_year[is_leap][12];
-        year++;
-    }
-
-    tt.year = year;
-
-    for (month = 11; month >= 0; month--) {
-      if (doy > days_in_year[is_leap][month]) {
-	tt.month = month + 1;
-	tt.day = doy - days_in_year[is_leap][month];
-	break;
-      }
-    }
-
-    return tt;
-}
-
-/**	@brief Constructor.
- *
- *	Return a null time, which is guaranteed not to be equal to any other time.
- */
-struct icaltimetype icaltime_null_time(void)
-{
-    struct icaltimetype t;
-    memset(&t,0,sizeof(struct icaltimetype));
-
-    return t;
-}
-
-/**	@brief Constructor.
- *
- *	Return a null date.
- */
-struct icaltimetype icaltime_null_date(void)
-{
-    struct icaltimetype t;
-    memset(&t,0,sizeof(struct icaltimetype));
-
-    t.is_date = 1;
-
-    /*
-     * Init to -1 to match what icalyacc.y used to do.
-     * Does anything depend on this?
-     */
-    t.hour = -1;
-    t.minute = -1;
-    t.second = -1;
-
-    return t;
-}
-
-
-/**
- *	Returns false if the time is clearly invalid, but is not null. This
- *	is usually the result of creating a new time type buy not clearing
- *	it, or setting one of the flags to an illegal value.
- */
-int icaltime_is_valid_time(const struct icaltimetype t){
-    if(t.is_utc > 1 || t.is_utc < 0 ||
-       t.year < 0 || t.year > 3000 ||
-       t.is_date > 1 || t.is_date < 0){
-	return 0;
-    } else {
-	return 1;
-    }
-
-}
-
-/**	@brief Returns true if time is a DATE
- */
-int icaltime_is_date(const struct icaltimetype t) {
-
-	return t.is_date;
-}
-
-/**	@brief Returns true if time is relative to UTC zone
- *
- *	@todo  We should only check the zone
- */
-int icaltime_is_utc(const struct icaltimetype t) {
-
-	return t.is_utc;
-}
-
-/**
- *	Return true if the time is null.
- */
-int icaltime_is_null_time(const struct icaltimetype t)
-{
-    if (t.second +t.minute+t.hour+t.day+t.month+t.year == 0){
-	return 1;
-    }
-
-    return 0;
-
-}
-
-/**
- *	Return -1, 0, or 1 to indicate that a<b, a==b, or a>b.
- * 	This calls icaltime_compare function after converting them to the utc
- * 	timezone.
- */
-
-int icaltime_compare(const struct icaltimetype a_in, const struct icaltimetype b_in) 
-{
-    int retval = 0;
-    struct icaltimetype a, b;
-
-    a = icaltime_convert_to_zone(a_in, icaltimezone_get_utc_timezone());
-    b = icaltime_convert_to_zone(b_in, icaltimezone_get_utc_timezone());
-
-    if (a.year > b.year)
-	retval = 1;
-    else if (a.year < b.year)
-	retval = -1;
-
-    else if (a.month > b.month)
-	retval = 1;
-    else if (a.month < b.month)
-	retval = -1;
-
-    else if (a.day > b.day)
-	retval = 1;
-    else if (a.day < b.day)
-	retval = -1;
-
-    /* if both are dates, we are done */
-    if (a.is_date && b.is_date)
-	return retval;
-
-    /* else, if we already found a difference, we are done */
-    else if (retval != 0)
-	return retval;
-
-    /* else, if only one is a date (and we already know the date part is equal),
-       then the other is greater */
-    else if (b.is_date)
-	retval = 1;
-    else if (a.is_date)
-	retval = -1;
-
-    else if (a.hour > b.hour)
-	retval = 1;
-    else if (a.hour < b.hour)
-	retval = -1;
-
-    else if (a.minute > b.minute)
-	retval = 1;
-    else if (a.minute < b.minute)
-	retval = -1;
-
-    else if (a.second > b.second)
-	retval = 1;
-    else if (a.second < b.second)
-	retval = -1;
-
-    return retval;
-}
-
-/**
- *	like icaltime_compare, but only use the date parts.
- */
-
-int
-icaltime_compare_date_only(const struct icaltimetype a_in, const struct icaltimetype b_in)
-{
-    int retval;
-    struct icaltimetype a, b;
-
-    a = icaltime_convert_to_zone(a_in, icaltimezone_get_utc_timezone());
-    b = icaltime_convert_to_zone(b_in, icaltimezone_get_utc_timezone());
-
-    if (a.year > b.year)
-	retval = 1;
-    else if (a.year < b.year)
-	retval = -1;
-
-    else if (a.month > b.month)
-	retval = 1;
-    else if (a.month < b.month)
-	retval = -1;
-
-    else if (a.day > b.day)
-	retval = 1;
-    else if (a.day < b.day)
-	retval = -1;
-
-    else
-	retval = 0;
-
-    return retval;
-}
-
-/* These are defined in icalduration.c:
-struct icaltimetype  icaltime_add(struct icaltimetype t,
-				  struct icaldurationtype  d)
-struct icaldurationtype  icaltime_subtract(struct icaltimetype t1,
-					   struct icaltimetype t2)
-*/
-
-
-
-/**	@brief Internal, shouldn't be part of the public API
- *
- *	Adds (or subtracts) a time from a icaltimetype.
- *	NOTE: This function is exactly the same as icaltimezone_adjust_change()
- *	except for the type of the first parameter.
- */
-void
-icaltime_adjust(struct icaltimetype *tt, const int days, const int hours,
-	const int minutes, const int seconds) {
-
-    int second, minute, hour, day;
-    int minutes_overflow, hours_overflow, days_overflow = 0, years_overflow;
-    int days_in_month;
-
-    /* If we are passed a date make sure to ignore hour minute and second */
-    if (tt->is_date)
-	goto IS_DATE;
-
-    /* Add on the seconds. */
-    second = tt->second + seconds;
-    tt->second = second % 60;
-    minutes_overflow = second / 60;
-    if (tt->second < 0) {
-	tt->second += 60;
-	minutes_overflow--;
-    }
-
-    /* Add on the minutes. */
-    minute = tt->minute + minutes + minutes_overflow;
-    tt->minute = minute % 60;
-    hours_overflow = minute / 60;
-    if (tt->minute < 0) {
-	tt->minute += 60;
-	hours_overflow--;
-    }
-
-    /* Add on the hours. */
-    hour = tt->hour + hours + hours_overflow;
-    tt->hour = hour % 24;
-    days_overflow = hour / 24;
-    if (tt->hour < 0) {
-	tt->hour += 24;
-	days_overflow--;
-    }
-
-IS_DATE:
-    /* Normalize the month. We do this before handling the day since we may
-       need to know what month it is to get the number of days in it.
-       Note that months are 1 to 12, so we have to be a bit careful. */
-    if (tt->month >= 13) {
-	years_overflow = (tt->month - 1) / 12;
-	tt->year += years_overflow;
-	tt->month -= years_overflow * 12;
-    } else if (tt->month <= 0) {
-	/* 0 to -11 is -1 year out, -12 to -23 is -2 years. */
-	years_overflow = (tt->month / 12) - 1;
-	tt->year += years_overflow;
-	tt->month -= years_overflow * 12;
-    }
-
-    /* Add on the days. */
-    day = tt->day + days + days_overflow;
-    if (day > 0) {
-	for (;;) {
-	    days_in_month = icaltime_days_in_month (tt->month, tt->year);
-	    if (day <= days_in_month)
-		break;
-
-	    tt->month++;
-	    if (tt->month >= 13) {
-		tt->year++;
-		tt->month = 1;
-	    }
-
-	    day -= days_in_month;
-	}
-    } else {
-	while (day <= 0) {
-	    if (tt->month == 1) {
-		tt->year--;
-		tt->month = 12;
-	    } else {
-		tt->month--;
-	    }
-
-	    day += icaltime_days_in_month (tt->month, tt->year);
-	}
-    }
-    tt->day = day;
-}
-
-/**	@brief Convert time to a given timezone
- *
- *	Convert a time from its native timezone to a given timezone.
- *
- *	If tt is a date, the returned time is an exact
- *	copy of the input. If it's a floating time, the returned object
- *	represents the same time translated to the given timezone.
- *	Otherwise the time will be converted to the new
- *	time zone, and its native timezone set to the right timezone.
- */
-struct icaltimetype icaltime_convert_to_zone(const struct icaltimetype tt,
-	icaltimezone *zone) {
-
-	struct icaltimetype ret = tt;
-
-	/* If it's a date do nothing */
-	if (tt.is_date) {
-		return ret;
-	}
-
-	if (tt.zone == zone) {
-		return ret;
-	}
-
-	/* If it's a floating time we don't want to adjust the time */
-	if (tt.zone != NULL) {
-		icaltimezone_convert_time(&ret, tt.zone, zone);
-	}
-
-	ret.zone = zone;
-	if (zone == icaltimezone_get_utc_timezone()) {
-		ret.is_utc = 1;
-	} else {
-		ret.is_utc = 0;
-	}
-
-	return ret;
-}
-
-const icaltimezone *
-icaltime_get_timezone(const struct icaltimetype t) {
-
-	return t.zone;
-}
-
-char *
-icaltime_get_tzid(const struct icaltimetype t) {
-
-	if (t.zone != NULL) {
-		return icaltimezone_get_tzid(t.zone);
-	} else {
-		return NULL;
-	}
-}
-
-/**	@brief Set the timezone
- *
- *	Force the icaltime to be interpreted relative to another timezone.
- *	If you need to do timezone conversion, applying offset adjustments,
- *	then you should use icaltime_convert_to_timezone instead.
- */
-struct icaltimetype
-icaltime_set_timezone(struct icaltimetype *t, const icaltimezone *zone) {
-
-	/* If it's a date do nothing */
-	if (t->is_date) {
-		return *t;
-	}
-
-	if (t->zone == zone) {
-		return *t;
-	}
-
-	t->zone = zone;
-	if (zone == icaltimezone_get_utc_timezone()) {
-		t->is_utc = 1;
-	} else {
-		t->is_utc = 0;
-	}
-
-	return *t;
-}
-
-
-/**
- *  @brief builds an icaltimespan given a start time, end time and busy value.
- *
- *  @param dtstart   The beginning time of the span, can be a date-time
- *                   or just a date.
- *  @param dtend     The end time of the span.
- *  @param is_busy   A boolean value, 0/1.
- *  @return          A span using the supplied values.
- *
- *  returned span contains times specified in UTC.
- */
-
-icaltime_span icaltime_span_new(struct icaltimetype dtstart,
-				       struct icaltimetype dtend,
-				       int    is_busy)
-{
-  icaltime_span span;
-
-  span.is_busy = is_busy;
-
-  span.start   = icaltime_as_timet_with_zone(dtstart,
-					     icaltimezone_get_utc_timezone());
-
-  if (icaltime_is_null_time(dtend)) {
-    if (!icaltime_is_date(dtstart)) {
-      /* If dtstart is a DATE-TIME and there is no DTEND nor DURATION
-	 it takes no time */
-      span.end = span.start;
-      return span;
-    } else {
-      dtend = dtstart;
-    }
-  }
-
-  span.end = icaltime_as_timet_with_zone(dtend, icaltimezone_get_utc_timezone());
-  
-  if (icaltime_is_date(dtstart)) {
-    /* no time specified, go until the end of the day..*/
-    span.end += 60*60*24 - 1;
-  }
-  return span;
-}
-
-
-/** @brief Returns true if the two spans overlap
- *
- *  @param s1         1st span to test
- *  @param s2         2nd span to test
- *  @return           boolean value
- *
- *  The result is calculated by testing if the start time of s1 is contained
- *  by the s2 span, or if the end time of s1 is contained by the s2 span.
- *
- *  Also returns true if the spans are equal.
- *
- *  Note, this will return false if the spans are adjacent.
- */
-
-int icaltime_span_overlaps(icaltime_span *s1, 
-			   icaltime_span *s2)
-{
-  /* s1->start in s2 */
-  if (s1->start > s2->start && s1->start < s2->end)
-    return 1;
-
-  /* s1->end in s2 */
-  if (s1->end > s2->start && s1->end < s2->end)
-    return 1;
-
-  /* s2->start in s1 */
-  if (s2->start > s1->start && s2->start < s1->end)
-    return 1;
-
-  /* s2->end in s1 */
-  if (s2->end > s1->start && s2->end < s1->end)
-    return 1;
-
-  if (s1->start == s2->start && s1->end == s2->end)
-    return 1;
-  
-  return 0;
-}
-
-/** @brief Returns true if the span is totally within the containing
- *  span
- *
- *  @param s          The span to test for.
- *  @param container  The span to test against.
- *  @return           boolean value.
- *
- */
-
-int icaltime_span_contains(icaltime_span *s,
-			   icaltime_span *container)
-{
-
-  if ((s->start >= container->start && s->start < container->end) &&
-      (s->end   <= container->end   && s->end   > container->start))
-    return 1;
-  
-  return 0;
-}
diff --git a/libical/src/libical/icaltime.h b/libical/src/libical/icaltime.h
deleted file mode 100644
index 7b7374f5df..0000000000
--- a/libical/src/libical/icaltime.h
+++ /dev/null
@@ -1,277 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icaltime.h
- CREATOR: eric 02 June 2000
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
-======================================================================*/
-
-/**	@file icaltime.h
- *	@brief struct icaltimetype is a pseudo-object that abstracts time
- *	handling.
- *
- *	It can represent either a DATE or a DATE-TIME (floating, UTC or in a
- *	given timezone), and it keeps track internally of its native timezone.
- *
- *	The typical usage is to call the correct constructor specifying the
- *	desired timezone. If this is not known until a later time, the
- *	correct behavior is to specify a NULL timezone and call
- *	icaltime_convert_to_zone() at a later time.
- *
- *	There are several ways to create a new icaltimetype:
- *
- *	- icaltime_null_time()
- *	- icaltime_null_date()
- *	- icaltime_current_time_with_zone()
- *	- icaltime_today()
- *	- icaltime_from_timet_with_zone(time_t tm, int is_date,
- *		icaltimezone *zone)
- * 	- icaltime_from_string_with_zone(const char* str, icaltimezone *zone)
- *	- icaltime_from_day_of_year(int doy,  int year)
- *	- icaltime_from_week_number(int week_number, int year)
- *
- *	italtimetype objects can be converted to different formats:
- *
- *	- icaltime_as_timet(struct icaltimetype tt)
- *	- icaltime_as_timet_with_zone(struct icaltimetype tt,
- *		icaltimezone *zone)
- *	- icaltime_as_ical_string(struct icaltimetype tt)
- *
- *	Accessor methods include:
- *
- *	- icaltime_get_timezone(struct icaltimetype t)
- *	- icaltime_get_tzid(struct icaltimetype t)
- *	- icaltime_set_timezone(struct icaltimetype t, const icaltimezone *zone)
- *	- icaltime_day_of_year(struct icaltimetype t)
- *	- icaltime_day_of_week(struct icaltimetype t)
- *	- icaltime_start_doy_week(struct icaltimetype t, int fdow)
- *	- icaltime_week_number(struct icaltimetype t)
- *
- *	Query methods include:
- *
- *	- icaltime_is_null_time(struct icaltimetype t)
- *	- icaltime_is_valid_time(struct icaltimetype t)
- *	- icaltime_is_date(struct icaltimetype t)
- *	- icaltime_is_utc(struct icaltimetype t)
- *	- icaltime_is_floating(struct icaltimetype t)
- *
- *	Modify, compare and utility methods include:
- *
- *	- icaltime_add(struct icaltimetype t, struct icaldurationtype  d)
- *	- icaltime_subtract(struct icaltimetype t1, struct icaltimetype t2)
- *      - icaltime_compare_with_zone(struct icaltimetype a,struct icaltimetype b)
- *	- icaltime_compare(struct icaltimetype a,struct icaltimetype b)
- *	- icaltime_compare_date_only(struct icaltimetype a,
- *		struct icaltimetype b)
- *	- icaltime_adjust(struct icaltimetype *tt, int days, int hours,
- *		int minutes, int seconds);
- *	- icaltime_normalize(struct icaltimetype t);
- *	- icaltime_convert_to_zone(const struct icaltimetype tt,
- *		icaltimezone *zone);
- */
-
-#ifndef ICALTIME_H
-#define ICALTIME_H
-
-#include <time.h>
-
-/* An opaque struct representing a timezone. We declare this here to avoid
-   a circular dependancy. */
-#ifndef ICALTIMEZONE_DEFINED
-#define ICALTIMEZONE_DEFINED
-typedef struct _icaltimezone		icaltimezone;
-#endif
-
-/** icaltime_span is returned by icalcomponent_get_span() */
-struct icaltime_span {
-	time_t start;   /**< in UTC */
-	time_t end;     /**< in UTC */
-	int is_busy;    /**< 1->busy time, 0-> free time */
-};
-
-typedef struct icaltime_span icaltime_span;
-
-/*
- *	FIXME
- *
- *	is_utc is redundant, and might be considered a minor optimization.
- *	It might be deprecated, so you should use icaltime_is_utc() instead.
- */
-struct icaltimetype
-{
-	int year;	/**< Actual year, e.g. 2001. */
-	int month;	/**< 1 (Jan) to 12 (Dec). */
-	int day;
-	int hour;
-	int minute;
-	int second;
-
-	int is_utc;     /**< 1-> time is in UTC timezone */
-
-	int is_date;    /**< 1 -> interpret this as date. */
-   
-	int is_daylight; /**< 1 -> time is in daylight savings time. */
-   
-	const icaltimezone *zone;	/**< timezone */
-};	
-
-typedef struct icaltimetype icaltimetype;
-
-/** Return a null time, which indicates no time has been set. 
-    This time represent the beginning of the epoch */
-struct icaltimetype icaltime_null_time(void);
-
-/** Return a null date */
-struct icaltimetype icaltime_null_date(void);
-
-/** Returns the current time in the given timezone, as an icaltimetype. */
-struct icaltimetype icaltime_current_time_with_zone(const icaltimezone *zone);
-
-/** Returns the current day as an icaltimetype, with is_date set. */
-struct icaltimetype icaltime_today(void);
-
-/** Convert seconds past UNIX epoch to a timetype*/
-struct icaltimetype icaltime_from_timet(const time_t v, const int is_date);
-
-/** Convert seconds past UNIX epoch to a timetype, using timezones. */
-struct icaltimetype icaltime_from_timet_with_zone(const time_t tm,
-	const int is_date, const icaltimezone *zone);
-
-/** create a time from an ISO format string */
-struct icaltimetype icaltime_from_string(const char* str);
-
-/** create a time from an ISO format string */
-struct icaltimetype icaltime_from_string_with_zone(const char* str,
-	const icaltimezone *zone);
-
-/** Create a new time, given a day of year and a year. */
-struct icaltimetype icaltime_from_day_of_year(const int doy,
-	const int year);
-
-/**	@brief Contructor (TODO).
- * Create a new time from a weeknumber and a year. */
-struct icaltimetype icaltime_from_week_number(const int week_number,
-	const int year);
-
-/** Return the time as seconds past the UNIX epoch */
-time_t icaltime_as_timet(const struct icaltimetype);
-
-/** Return the time as seconds past the UNIX epoch, using timezones. */
-time_t icaltime_as_timet_with_zone(const struct icaltimetype tt,
-	const icaltimezone *zone);
-
-/** Return a string represention of the time, in RFC2445 format. The
-   string is owned by libical */
-const char* icaltime_as_ical_string(const struct icaltimetype tt);
-
-/** @brief Return the timezone */
-const icaltimezone *icaltime_get_timezone(const struct icaltimetype t);
-
-/** @brief Return the tzid, or NULL for a floating time */
-char *icaltime_get_tzid(const struct icaltimetype t);
-
-/** @brief Set the timezone */
-struct icaltimetype icaltime_set_timezone(struct icaltimetype *t,
-	const icaltimezone *zone);
-
-/** Return the day of the year of the given time */
-int icaltime_day_of_year(const struct icaltimetype t);
-
-/** Return the day of the week of the given time. Sunday is 1 */
-int icaltime_day_of_week(const struct icaltimetype t);
-
-/** Return the day of the year for the Sunday of the week that the
-   given time is within. */
-int icaltime_start_doy_of_week(const struct icaltimetype t);
-
-/** Return the day of the year for the first day of the week that the
-   given time is within. */
-int icaltime_start_doy_week(const struct icaltimetype t, int fdow);
-
-/** Return the week number for the week the given time is within */
-int icaltime_week_number(const struct icaltimetype t);
-
-/** Return true of the time is null. */
-int icaltime_is_null_time(const struct icaltimetype t);
-
-/** Returns false if the time is clearly invalid, but is not null. This
-   is usually the result of creating a new time type buy not clearing
-   it, or setting one of the flags to an illegal value. */
-int icaltime_is_valid_time(const struct icaltimetype t);
-
-/** @brief Returns true if time is of DATE type, false if DATE-TIME */
-int icaltime_is_date(const struct icaltimetype t);
-
-/** @brief Returns true if time is relative to UTC zone */
-int icaltime_is_utc(const struct icaltimetype t);
-
-/** @brief Returns true if time is a floating time */
-int icaltime_is_floating(const struct icaltimetype t);
-
-/** Return -1, 0, or 1 to indicate that a<b, a==b or a>b */
-int icaltime_compare_with_zone(const struct icaltimetype a,
-        const struct icaltimetype b);
-
-/** Return -1, 0, or 1 to indicate that a<b, a==b or a>b */
-int icaltime_compare(const struct icaltimetype a,
-	const struct icaltimetype b);
-
-/** like icaltime_compare, but only use the date parts. */
-int icaltime_compare_date_only(const struct icaltimetype a,
-	const struct icaltimetype b);
-
-/** Adds or subtracts a number of days, hours, minutes and seconds. */
-void  icaltime_adjust(struct icaltimetype *tt, const int days,
-	const int hours, const int minutes, const int seconds);
-
-/** Normalize the icaltime, so that all fields are within the normal range. */
-struct icaltimetype icaltime_normalize(const struct icaltimetype t);
-
-/** convert tt, of timezone tzid, into a utc time. Does nothing if the
-   time is already UTC.  */
-struct icaltimetype icaltime_convert_to_zone(const struct icaltimetype tt,
-	icaltimezone *zone);
-
-/** Return the number of days in the given month */
-int icaltime_days_in_month(const int month, const int year);
-
-
-/** @brief calculate an icaltimespan given a start and end time. */
-struct icaltime_span icaltime_span_new(struct icaltimetype dtstart,
-				       struct icaltimetype dtend,
-				       int is_busy);
-
-/** @brief Returns true if the two spans overlap **/
-int icaltime_span_overlaps(icaltime_span *s1, 
-			   icaltime_span *s2);
-
-/** @brief Returns true if the span is totally within the containing
- *  span 
- */
-int icaltime_span_contains(icaltime_span *s,
-			   icaltime_span *container);
-
-
-#endif /* !ICALTIME_H */
-
-
diff --git a/libical/src/libical/icaltimezone.c b/libical/src/libical/icaltimezone.c
deleted file mode 100644
index c1c5e52785..0000000000
--- a/libical/src/libical/icaltimezone.c
+++ /dev/null
@@ -1,1709 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*======================================================================
- FILE: icaltimezone.c
- CREATOR: Damon Chaplin 15 March 2001
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2001, Damon Chaplin
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
-======================================================================*/
-
-/** @file icaltimezone.c
- *  @brief implementation of timezone handling routines
- **/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "icalproperty.h"
-#include "icalarray.h"
-#include "icalerror.h"
-#include "icalparser.h"
-#include "icaltimezone.h"
-
-#ifdef WIN32
-#define snprintf _snprintf
-#define PACKAGE_DATA_DIR "/Projects/libical"
-#endif
-
-/** This is the toplevel directory where the timezone data is installed in. */
-#define ZONEINFO_DIRECTORY	PACKAGE_DATA_DIR "/zoneinfo"
-
-/** The prefix we use to uniquely identify TZIDs. */
-#define TZID_PREFIX		"/softwarestudio.org/"
-#define TZID_PREFIX_LEN		20
-
-/** This is the filename of the file containing the city names and
-    coordinates of all the builtin timezones. */
-#define ZONES_TAB_FILENAME	"zones.tab"
-
-/** This is the number of years of extra coverage we do when expanding
-    the timezone changes. */
-#define ICALTIMEZONE_EXTRA_COVERAGE	5
-
-/** This is the maximum year we will expand to. time_t values only go up to
-    somewhere around 2037. */
-#define ICALTIMEZONE_MAX_YEAR		2035
-
-struct _icaltimezone {
-    char		*tzid;
-    /**< The unique ID of this timezone,
-       e.g. "/softwarestudio.org/Olson_20010601_1/Africa/Banjul".
-       This should only be used to identify a VTIMEZONE. It is not
-       meant to be displayed to the user in any form. */
-
-    char		*location;
-    /**< The location for the timezone, e.g. "Africa/Accra" for the
-       Olson database. We look for this in the "LOCATION" or
-       "X-LIC-LOCATION" properties of the VTIMEZONE component. It
-       isn't a standard property yet. This will be NULL if no location
-       is found in the VTIMEZONE. */
-
-    char		*tznames;
-    /**< This will be set to a combination of the TZNAME properties
-       from the last STANDARD and DAYLIGHT components in the
-       VTIMEZONE, e.g. "EST/EDT".  If they both use the same TZNAME,
-       or only one type of component is found, then only one TZNAME
-       will appear, e.g. "AZOT". If no TZNAME is found this will be
-       NULL. */
-
-    double		 latitude;
-    double		 longitude;
-    /**< The coordinates of the city, in degrees. */
-
-    icalcomponent	*component;
-    /**< The toplevel VTIMEZONE component loaded from the .ics file for this
-         timezone. If we need to regenerate the changes data we need this. */
-
-    icaltimezone	*builtin_timezone;
-    /**< If this is not NULL it points to the builtin icaltimezone
-       that the above TZID refers to. This icaltimezone should be used
-       instead when accessing the timezone changes data, so that the
-       expanded timezone changes data is shared between calendar
-       components. */
-
-    int			 end_year;
-    /**< This is the last year for which we have expanded the data to.
-       If we need to calculate a date past this we need to expand the
-       timezone component data from scratch. */
-
-    icalarray		*changes;
-    /**< A dynamically-allocated array of time zone changes, sorted by the
-       time of the change in local time. So we can do fast binary-searches
-       to convert from local time to UTC. */
-};
-
-typedef struct _icaltimezonechange	icaltimezonechange;
-
-struct _icaltimezonechange {
-    int		 utc_offset;
-    /**< The offset to add to UTC to get local time, in seconds. */
-
-    int		 prev_utc_offset;
-    /**< The offset to add to UTC, before this change, in seconds. */
-
-    int		 year;		/**< Actual year, e.g. 2001. */
-    int		 month;		/**< 1 (Jan) to 12 (Dec). */
-    int		 day;
-    int		 hour;
-    int		 minute;
-    int		 second;
-    /**< The time that the change came into effect, in UTC.
-       Note that the prev_utc_offset applies to this local time,
-       since we haven't changed to the new offset yet. */
-
-    int		 is_daylight;
-    /**< Whether this is STANDARD or DAYLIGHT time. */
-};
-
-
-/** An array of icaltimezones for the builtin timezones. */
-static icalarray *builtin_timezones = NULL;
-
-/** This is the special UTC timezone, which isn't in builtin_timezones. */
-static icaltimezone utc_timezone = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-
-static char* zone_files_directory = NULL;
-
-static void  icaltimezone_reset			(icaltimezone   *zone);
-static char* icaltimezone_get_location_from_vtimezone (icalcomponent *component);
-static char* icaltimezone_get_tznames_from_vtimezone (icalcomponent *component);
-static void  icaltimezone_expand_changes	(icaltimezone	*zone,
-						 int		 end_year);
-static void  icaltimezone_expand_vtimezone	(icalcomponent	*comp,
-						 int		 end_year,
-						 icalarray	*changes);
-static int   icaltimezone_compare_change_fn	(const void	*elem1,
-						 const void	*elem2);
-
-static int   icaltimezone_find_nearby_change	(icaltimezone	*zone,
-						 icaltimezonechange *change);
-
-static void  icaltimezone_adjust_change		(icaltimezonechange *tt,
-						 int		 days,
-						 int		 hours,
-						 int		 minutes,
-						 int		 seconds);
-
-static void  icaltimezone_init			(icaltimezone	*zone);
-
-/** Gets the TZID, LOCATION/X-LIC-LOCATION, and TZNAME properties from the
-   VTIMEZONE component and places them in the icaltimezone. It returns 1 on
-   success, or 0 if the TZID can't be found. */
-static int   icaltimezone_get_vtimezone_properties (icaltimezone  *zone,
-						    icalcomponent *component);
-
-
-static void  icaltimezone_load_builtin_timezone	(icaltimezone	*zone);
-
-static void  icaltimezone_ensure_coverage	(icaltimezone	*zone,
-						 int		 end_year);
-
-
-static void  icaltimezone_init_builtin_timezones(void);
-
-static void  icaltimezone_parse_zone_tab	(void);
-
-static char* icaltimezone_load_get_line_fn	(char		*s,
-						 size_t		 size,
-						 void		*data);
-
-static void  format_utc_offset			(int		 utc_offset,
-						 char		*buffer);
-
-static char* get_zone_directory(void);
-
-
-/** Creates a new icaltimezone. */
-icaltimezone*
-icaltimezone_new			(void)
-{
-    icaltimezone *zone;
-
-    zone = (icaltimezone*) malloc (sizeof (icaltimezone));
-    if (!zone) {
-	icalerror_set_errno (ICAL_NEWFAILED_ERROR);
-	return NULL;
-    }
-
-    icaltimezone_init (zone);
-
-    return zone;
-}
-
-
-/** Frees all memory used for the icaltimezone. */
-void
-icaltimezone_free			(icaltimezone *zone,
-					 int	       free_struct)
-{
-    icaltimezone_reset (zone);
-    if (free_struct)
-	free (zone);
-}
-
-
-/** Resets the icaltimezone to the initial state, freeing most of the fields. */
-static void
-icaltimezone_reset			(icaltimezone *zone)
-{
-    if (zone->tzid)
-		free (zone->tzid);
-    if (zone->location)
-		free (zone->location);
-    if (zone->tznames)
-		free (zone->tznames);
-    if (zone->component)
-		icalcomponent_free (zone->component);
-    if (zone->changes)
-		icalarray_free (zone->changes);
-	
-    icaltimezone_init (zone);
-}
-
-
-/** Initializes an icaltimezone. */
-static void
-icaltimezone_init			(icaltimezone	*zone)
-{
-    zone->tzid = NULL;
-    zone->location = NULL;
-    zone->tznames = NULL;
-    zone->latitude = 0.0;
-    zone->longitude = 0.0;
-    zone->component = NULL;
-    zone->builtin_timezone = NULL;
-    zone->end_year = 0;
-    zone->changes = NULL;
-}
-
-
-/** Gets the TZID, LOCATION/X-LIC-LOCATION and TZNAME properties of
-   the VTIMEZONE component and stores them in the icaltimezone.  It
-   returns 1 on success, or 0 if the TZID can't be found.  Note that
-   it expects the zone to be initialized or reset - it doesn't free
-   any old values. */
-static int
-icaltimezone_get_vtimezone_properties	(icaltimezone	*zone,
-					 icalcomponent	*component)
-{
-    icalproperty *prop;
-    const char *tzid;
- 
-    prop = icalcomponent_get_first_property (component, ICAL_TZID_PROPERTY);
-    if (!prop)
-	return 0;
-
-    /* A VTIMEZONE MUST have a TZID, or a lot of our code won't work. */
-    tzid = icalproperty_get_tzid (prop);
-    if (!tzid)
-	return 0;
-
-    zone->tzid = strdup (tzid);
-    zone->component = component;
-	if ( zone->location != 0 ) free ( zone->location );
-    zone->location = icaltimezone_get_location_from_vtimezone (component);
-    zone->tznames = icaltimezone_get_tznames_from_vtimezone (component);
-
-    return 1;
-}
-
-/** Gets the LOCATION or X-LIC-LOCATION property from a VTIMEZONE. */
-static char*
-icaltimezone_get_location_from_vtimezone (icalcomponent *component)
-{
-    icalproperty *prop;
-    const char *location;
-    const char *name;
-
-    prop = icalcomponent_get_first_property (component,
-					     ICAL_LOCATION_PROPERTY);
-    if (prop) {
-	location = icalproperty_get_location (prop);
-	if (location)
-	    return strdup (location);
-    }
-
-    prop = icalcomponent_get_first_property (component, ICAL_X_PROPERTY);
-    while (prop) {
-	name = icalproperty_get_x_name (prop);
-	if (name && !strcmp (name, "X-LIC-LOCATION")) {
-	    location = icalproperty_get_x (prop);
-	    if (location)
-		return strdup (location);
-	}
-	prop = icalcomponent_get_next_property (component,
-						ICAL_X_PROPERTY);
-    }
-
-    return NULL;
-}
-
-
-/** Gets the TZNAMEs used for the last STANDARD & DAYLIGHT components
-   in a VTIMEZONE. If both STANDARD and DAYLIGHT components use the
-   same TZNAME, it returns that. If they use different TZNAMEs, it
-   formats them like "EST/EDT". The returned string should be freed by
-   the caller. */
-static char*
-icaltimezone_get_tznames_from_vtimezone (icalcomponent *component)
-{
-    icalcomponent *comp;
-    icalcomponent_kind type;
-    icalproperty *prop;
-    struct icaltimetype dtstart;
-    struct icaldatetimeperiodtype rdate;
-    const char *current_tzname;
-    const char *standard_tzname = NULL, *daylight_tzname = NULL;
-    struct icaltimetype standard_max_date, daylight_max_date;
-    struct icaltimetype current_max_date;
-
-    standard_max_date = icaltime_null_time();
-    daylight_max_date = icaltime_null_time();
-
-    /* Step through the STANDARD & DAYLIGHT subcomponents. */
-    comp = icalcomponent_get_first_component (component, ICAL_ANY_COMPONENT);
-    while (comp) {
-	type = icalcomponent_isa (comp);
-	if (type == ICAL_XSTANDARD_COMPONENT
-	    || type == ICAL_XDAYLIGHT_COMPONENT) {
-	    current_max_date = icaltime_null_time ();
-	    current_tzname = NULL;
-
-	    /* Step through the properties. We want to find the TZNAME, and
-	       the largest DTSTART or RDATE. */
-	    prop = icalcomponent_get_first_property (comp, ICAL_ANY_PROPERTY);
-	    while (prop) {
-		switch (icalproperty_isa (prop)) {
-		case ICAL_TZNAME_PROPERTY:
-		    current_tzname = icalproperty_get_tzname (prop);
-		    break;
-
-		case ICAL_DTSTART_PROPERTY:
-		    dtstart = icalproperty_get_dtstart (prop);
-		    if (icaltime_compare (dtstart, current_max_date) > 0)
-			current_max_date = dtstart;
-
-		    break;
-
-		case ICAL_RDATE_PROPERTY:
-		    rdate = icalproperty_get_rdate (prop);
-		    if (icaltime_compare (rdate.time, current_max_date) > 0)
-			current_max_date = rdate.time;
-
-		    break;
-
-		default:
-		    break;
-		}
-
-		prop = icalcomponent_get_next_property (comp,
-							ICAL_ANY_PROPERTY);
-	    }
-
-	    if (current_tzname) {
-		if (type == ICAL_XSTANDARD_COMPONENT) {
-		    if (!standard_tzname
-			|| icaltime_compare (current_max_date,
-					     standard_max_date) > 0) {
-			standard_max_date = current_max_date;
-			standard_tzname = current_tzname;
-		    }
-		} else {
-		    if (!daylight_tzname
-			|| icaltime_compare (current_max_date,
-					     daylight_max_date) > 0) {
-			daylight_max_date = current_max_date;
-			daylight_tzname = current_tzname;
-		    }
-		}
-	    }
-	}
-
-        comp = icalcomponent_get_next_component (component,
-						 ICAL_ANY_COMPONENT);
-    }
-
-    /* Outlook (2000) places "Standard Time" and "Daylight Time" in the TZNAME
-       strings, which is totally useless. So we return NULL in that case. */
-    if (standard_tzname && !strcmp (standard_tzname, "Standard Time"))
-	return NULL;
-
-    /* If both standard and daylight TZNAMEs were found, if they are the same
-       we return just one, else we format them like "EST/EDT". */
-    if (standard_tzname && daylight_tzname) {
-	unsigned int standard_len, daylight_len;
-	char *tznames;
-
-	if (!strcmp (standard_tzname, daylight_tzname))
-	    return strdup (standard_tzname);
-
-	standard_len = strlen (standard_tzname);
-	daylight_len = strlen (daylight_tzname);
-	tznames = malloc (standard_len + daylight_len + 2);
-	strcpy (tznames, standard_tzname);
-	tznames[standard_len] = '/';
-	strcpy (tznames + standard_len + 1, daylight_tzname);
-	return tznames;
-    } else {
-	const char *tznames;
-
-	/* If either of the TZNAMEs was found just return that, else NULL. */
-	tznames = standard_tzname ? standard_tzname : daylight_tzname;
-	return tznames ? strdup (tznames) : NULL;
-    }
-}
-
-
-static void
-icaltimezone_ensure_coverage		(icaltimezone	*zone,
-					 int		 end_year)
-{
-    /* When we expand timezone changes we always expand at least up to this
-       year, plus ICALTIMEZONE_EXTRA_COVERAGE. */
-    static int icaltimezone_minimum_expansion_year = -1;
-
-    int changes_end_year;
-
-    if (!zone->component)
-	icaltimezone_load_builtin_timezone (zone);
-
-    if (icaltimezone_minimum_expansion_year == -1) {
-	struct icaltimetype today = icaltime_today();
-	icaltimezone_minimum_expansion_year = today.year;
-    }
-
-    changes_end_year = end_year;
-    if (changes_end_year < icaltimezone_minimum_expansion_year)
-	changes_end_year = icaltimezone_minimum_expansion_year;
-
-    changes_end_year += ICALTIMEZONE_EXTRA_COVERAGE;
-
-    if (changes_end_year > ICALTIMEZONE_MAX_YEAR)
-	changes_end_year = ICALTIMEZONE_MAX_YEAR;
-
-    if (!zone->changes || zone->end_year < end_year)
-	icaltimezone_expand_changes (zone, changes_end_year);
-}
-
-
-static void
-icaltimezone_expand_changes		(icaltimezone	*zone,
-					 int		 end_year)
-{
-    icalarray *changes;
-    icalcomponent *comp;
-
-#if 0
-    printf ("\nExpanding changes for: %s to year: %i\n", zone->tzid, end_year);
-#endif
-
-    changes = icalarray_new (sizeof (icaltimezonechange), 32);
-    if (!changes)
-	return;
-
-    /* Scan the STANDARD and DAYLIGHT subcomponents. */
-    comp = icalcomponent_get_first_component (zone->component,
-					      ICAL_ANY_COMPONENT);
-    while (comp) {
-	icaltimezone_expand_vtimezone (comp, end_year, changes);
-	comp = icalcomponent_get_next_component (zone->component,
-						 ICAL_ANY_COMPONENT);
-    }
-
-    /* Sort the changes. We may have duplicates but I don't think it will
-       matter. */
-    icalarray_sort (changes, icaltimezone_compare_change_fn);
-
-    if (zone->changes)
-	icalarray_free (zone->changes);
-
-    zone->changes = changes;
-    zone->end_year = end_year;
-}
-
-
-static void
-icaltimezone_expand_vtimezone		(icalcomponent	*comp,
-					 int		 end_year,
-					 icalarray	*changes)
-{
-    icaltimezonechange change;
-    icalproperty *prop;
-    struct icaltimetype dtstart, occ;
-    struct icalrecurrencetype rrule;
-    icalrecur_iterator* rrule_iterator;
-    struct icaldatetimeperiodtype rdate;
-    int found_dtstart = 0, found_tzoffsetto = 0, found_tzoffsetfrom = 0;
-    int has_recurrence = 0;
-
-    /* First we check if it is a STANDARD or DAYLIGHT component, and
-       just return if it isn't. */
-    if (icalcomponent_isa (comp) == ICAL_XSTANDARD_COMPONENT)
-	change.is_daylight = 0;
-    else if (icalcomponent_isa (comp) == ICAL_XDAYLIGHT_COMPONENT)
-	change.is_daylight = 1;
-    else 
-	return;
-
-    /* Step through each of the properties to find the DTSTART,
-       TZOFFSETFROM and TZOFFSETTO. We can't expand recurrences here
-       since we need these properties before we can do that. */
-    prop = icalcomponent_get_first_property (comp, ICAL_ANY_PROPERTY);
-    while (prop) {
-	switch (icalproperty_isa (prop)) {
-	case ICAL_DTSTART_PROPERTY:
-	    dtstart = icalproperty_get_dtstart (prop);
-	    found_dtstart = 1;
-	    break;
-	case ICAL_TZOFFSETTO_PROPERTY:
-	    change.utc_offset = icalproperty_get_tzoffsetto (prop);
-	    /*printf ("Found TZOFFSETTO: %i\n", change.utc_offset);*/
-	    found_tzoffsetto = 1;
-	    break;
-	case ICAL_TZOFFSETFROM_PROPERTY:
-	    change.prev_utc_offset = icalproperty_get_tzoffsetfrom (prop);
-	    /*printf ("Found TZOFFSETFROM: %i\n", change.prev_utc_offset);*/
-	    found_tzoffsetfrom = 1;
-	    break;
-	case ICAL_RDATE_PROPERTY:
-	case ICAL_RRULE_PROPERTY:
-	    has_recurrence = 1;
-	    break;
-	default:
-	    /* Just ignore any other properties. */
-	    break;
-	}
-
-	prop = icalcomponent_get_next_property (comp, ICAL_ANY_PROPERTY);
-    }
-
-    /* If we didn't find a DTSTART, TZOFFSETTO and TZOFFSETFROM we have to
-       ignore the component. FIXME: Add an error property? */
-    if (!found_dtstart || !found_tzoffsetto || !found_tzoffsetfrom)
-	return;
-
-#if 0
-    printf ("\n Expanding component DTSTART (Y/M/D): %i/%i/%i %i:%02i:%02i\n",
-	    dtstart.year, dtstart.month, dtstart.day,
-	    dtstart.hour, dtstart.minute, dtstart.second);
-#endif
-
-    /* If the STANDARD/DAYLIGHT component has no recurrence data, we just add
-       a single change for the DTSTART. */
-    if (!has_recurrence) {
-	change.year   = dtstart.year;
-	change.month  = dtstart.month;
-	change.day    = dtstart.day;
-	change.hour   = dtstart.hour;
-	change.minute = dtstart.minute;
-	change.second = dtstart.second;
-
-	/* Convert to UTC. */
-	icaltimezone_adjust_change (&change, 0, 0, 0, -change.prev_utc_offset);
-
-#if 0
-	printf ("  Appending single DTSTART (Y/M/D): %i/%02i/%02i %i:%02i:%02i\n",
-		change.year, change.month, change.day,
-		change.hour, change.minute, change.second);
-#endif
-
-	/* Add the change to the array. */
-	icalarray_append (changes, &change);
-	return;
-    }
-
-    /* The component has recurrence data, so we expand that now. */
-    prop = icalcomponent_get_first_property (comp, ICAL_ANY_PROPERTY);
-    while (prop) {
-#if 0
-	printf ("Expanding property...\n");
-#endif
-	switch (icalproperty_isa (prop)) {
-	case ICAL_RDATE_PROPERTY:
-	    rdate = icalproperty_get_rdate (prop);
-	    change.year   = rdate.time.year;
-	    change.month  = rdate.time.month;
-	    change.day    = rdate.time.day;
-	    /* RDATEs with a DATE value inherit the time from
-	       the DTSTART. */
-	    if (icaltime_is_date(rdate.time)) {
-		change.hour   = dtstart.hour;
-		change.minute = dtstart.minute;
-		change.second = dtstart.second;
-	    } else {
-		change.hour   = rdate.time.hour;
-		change.minute = rdate.time.minute;
-		change.second = rdate.time.second;
-
-		/* The spec was a bit vague about whether RDATEs were in local
-		   time or UTC so we support both to be safe. So if it is in
-		   UTC we have to add the UTC offset to get a local time. */
-		if (!icaltime_is_utc(rdate.time))
-		    icaltimezone_adjust_change (&change, 0, 0, 0,
-						-change.prev_utc_offset);
-	    }
-
-#if 0
-	    printf ("  Appending RDATE element (Y/M/D): %i/%02i/%02i %i:%02i:%02i\n",
-		    change.year, change.month, change.day,
-		    change.hour, change.minute, change.second);
-#endif
-
-	    icalarray_append (changes, &change);
-	    break;
-	case ICAL_RRULE_PROPERTY:
-	    rrule = icalproperty_get_rrule (prop);
-
-	    /* If the rrule UNTIL value is set and is in UTC, we convert it to
-	       a local time, since the recurrence code has no way to convert
-	       it itself. */
-	    if (!icaltime_is_null_time (rrule.until) && rrule.until.is_utc) {
-#if 0
-		printf ("  Found RRULE UNTIL in UTC.\n");
-#endif
-
-		/* To convert from UTC to a local time, we use the TZOFFSETFROM
-		   since that is the offset from UTC that will be in effect
-		   when each of the RRULE occurrences happens. */
-		icaltime_adjust (&rrule.until, 0, 0, 0,
-				 change.prev_utc_offset);
-		rrule.until.is_utc = 0;
-	    }
-
-	    rrule_iterator = icalrecur_iterator_new (rrule, dtstart);
-	    for (;;) {
-		occ = icalrecur_iterator_next (rrule_iterator);
-		if (occ.year > end_year || icaltime_is_null_time (occ))
-		    break;
-
-		change.year   = occ.year;
-		change.month  = occ.month;
-		change.day    = occ.day;
-		change.hour   = occ.hour;
-		change.minute = occ.minute;
-		change.second = occ.second;
-
-#if 0
-		printf ("  Appending RRULE element (Y/M/D): %i/%02i/%02i %i:%02i:%02i\n",
-			change.year, change.month, change.day,
-			change.hour, change.minute, change.second);
-#endif
-
-		icaltimezone_adjust_change (&change, 0, 0, 0,
-					    -change.prev_utc_offset);
-
-		icalarray_append (changes, &change);
-	    }
-
-	    icalrecur_iterator_free (rrule_iterator);
-	    break;
-	default:
-	    break;
-	}
-
-	prop = icalcomponent_get_next_property (comp, ICAL_ANY_PROPERTY);
-    }
-}
-
-
-/** A function to compare 2 icaltimezonechange elements, used for qsort(). */
-static int
-icaltimezone_compare_change_fn		(const void	*elem1,
-					 const void	*elem2)
-{
-    const icaltimezonechange *change1, *change2;
-    int retval;
-
-    change1 = elem1;
-    change2 = elem2;
-
-    if (change1->year < change2->year)
-	retval = -1;
-    else if (change1->year > change2->year)
-	retval = 1;
-
-    else if (change1->month < change2->month)
-	retval = -1;
-    else if (change1->month > change2->month)
-	retval = 1;
-
-    else if (change1->day < change2->day)
-	retval = -1;
-    else if (change1->day > change2->day)
-	retval = 1;
-
-    else if (change1->hour < change2->hour)
-	retval = -1;
-    else if (change1->hour > change2->hour)
-	retval = 1;
-
-    else if (change1->minute < change2->minute)
-	retval = -1;
-    else if (change1->minute > change2->minute)
-	retval = 1;
-
-    else if (change1->second < change2->second)
-	retval = -1;
-    else if (change1->second > change2->second)
-	retval = 1;
-
-    else
-	retval = 0;
-
-    return retval;
-}
-
-
-
-void
-icaltimezone_convert_time		(struct icaltimetype *tt,
-					 icaltimezone	*from_zone,
-					 icaltimezone	*to_zone)
-{
-    int utc_offset, is_daylight;
-
-    /* If the time is a DATE value or both timezones are the same, or we are
-       converting a floating time, we don't need to do anything. */
-    if (icaltime_is_date(*tt) || from_zone == to_zone || from_zone == NULL)
-	return;
-
-    /* Convert the time to UTC by getting the UTC offset and subtracting it. */
-    utc_offset = icaltimezone_get_utc_offset (from_zone, tt, NULL);
-    icaltime_adjust (tt, 0, 0, 0, -utc_offset);
-
-    /* Now we convert the time to the new timezone by getting the UTC offset
-       of our UTC time and adding it. */       
-    utc_offset = icaltimezone_get_utc_offset_of_utc_time (to_zone, tt,
-							  &is_daylight);
-    tt->is_daylight = is_daylight;
-    icaltime_adjust (tt, 0, 0, 0, utc_offset);
-}
-
-
-
-
-/** @deprecated This API wasn't updated when we changed icaltimetype to contain its own
-    timezone. Also, this takes a pointer instead of the struct. */
-/* Calculates the UTC offset of a given local time in the given
-   timezone.  It is the number of seconds to add to UTC to get local
-   time.  The is_daylight flag is set to 1 if the time is in
-   daylight-savings time. */
-int
-icaltimezone_get_utc_offset		(icaltimezone	*zone,
-					 struct icaltimetype	*tt,
-					 int		*is_daylight)
-{
-    icaltimezonechange *zone_change, *prev_zone_change, tt_change, tmp_change;
-    int change_num, step, utc_offset_change, cmp;
-    int change_num_to_use;
-    int want_daylight;
-
-    if (tt == NULL)
-	return 0;
-
-    if (is_daylight)
-	*is_daylight = 0;
-
-    /* For local times and UTC return 0. */
-    if (zone == NULL || zone == &utc_timezone)
-	return 0;
-
-    /* Use the builtin icaltimezone if possible. */
-    if (zone->builtin_timezone)
-	zone = zone->builtin_timezone;
-
-    /* Make sure the changes array is expanded up to the given time. */
-    icaltimezone_ensure_coverage (zone, tt->year);
-
-    if (!zone->changes || zone->changes->num_elements == 0)
-	return 0;
-
-    /* Copy the time parts of the icaltimetype to an icaltimezonechange so we
-       can use our comparison function on it. */
-    tt_change.year   = tt->year;
-    tt_change.month  = tt->month;
-    tt_change.day    = tt->day;
-    tt_change.hour   = tt->hour;
-    tt_change.minute = tt->minute;
-    tt_change.second = tt->second;
-
-    /* This should find a change close to the time, either the change before
-       it or the change after it. */
-    change_num = icaltimezone_find_nearby_change (zone, &tt_change);
-
-    /* Sanity check. */
-    icalerror_assert (change_num >= 0,
-		      "Negative timezone change index");
-    icalerror_assert (change_num < zone->changes->num_elements,
-		      "Timezone change index out of bounds");
-
-    /* Now move backwards or forwards to find the timezone change that applies
-       to tt. It should only have to do 1 or 2 steps. */
-    zone_change = icalarray_element_at (zone->changes, change_num);
-    step = 1;
-    change_num_to_use = -1;
-    for (;;) {
-	/* Copy the change, so we can adjust it. */
-	tmp_change = *zone_change;
-
-	/* If the clock is going backward, check if it is in the region of time
-	   that is used twice. If it is, use the change with the daylight
-	   setting which matches tt, or use standard if we don't know. */
-	if (tmp_change.utc_offset < tmp_change.prev_utc_offset) {
-	    /* If the time change is at 2:00AM local time and the clock is
-	       going back to 1:00AM we adjust the change to 1:00AM. We may
-	       have the wrong change but we'll figure that out later. */
-	    icaltimezone_adjust_change (&tmp_change, 0, 0, 0,
-					tmp_change.utc_offset);
-	} else {
-	    icaltimezone_adjust_change (&tmp_change, 0, 0, 0,
-					tmp_change.prev_utc_offset);
-	}
-
-	cmp = icaltimezone_compare_change_fn (&tt_change, &tmp_change);
-
-	/* If the given time is on or after this change, then this change may
-	   apply, but we continue as a later change may be the right one.
-	   If the given time is before this change, then if we have already
-	   found a change which applies we can use that, else we need to step
-	   backwards. */
-	if (cmp >= 0)
-	    change_num_to_use = change_num;
-	else
-	    step = -1;
-
-	/* If we are stepping backwards through the changes and we have found
-	   a change that applies, then we know this is the change to use so
-	   we exit the loop. */
-	if (step == -1 && change_num_to_use != -1)
-	    break;
-
-	change_num += step;
-
-	/* If we go past the start of the changes array, then we have no data
-	   for this time so we return a UTC offset of 0. */
-	if (change_num < 0)
-	    return 0;
-
-	if (change_num >= zone->changes->num_elements)
-	    break;
-
-	zone_change = icalarray_element_at (zone->changes, change_num);
-    }
-
-    /* If we didn't find a change to use, then we have a bug! */
-    icalerror_assert (change_num_to_use != -1,
-		      "No applicable timezone change found");
-
-    /* Now we just need to check if the time is in the overlapped region of
-       time when clocks go back. */
-    zone_change = icalarray_element_at (zone->changes, change_num_to_use);
-
-    utc_offset_change = zone_change->utc_offset - zone_change->prev_utc_offset;
-    if (utc_offset_change < 0 && change_num_to_use > 0) {
-	tmp_change = *zone_change;
-	icaltimezone_adjust_change (&tmp_change, 0, 0, 0,
-				    tmp_change.prev_utc_offset);
-
-	if (icaltimezone_compare_change_fn (&tt_change, &tmp_change) < 0) {
-	    /* The time is in the overlapped region, so we may need to use
-	       either the current zone_change or the previous one. If the
-	       time has the is_daylight field set we use the matching change,
-	       else we use the change with standard time. */
-	    prev_zone_change = icalarray_element_at (zone->changes,
-						     change_num_to_use - 1);
-
-	    /* I was going to add an is_daylight flag to struct icaltimetype,
-	       but iCalendar doesn't let us distinguish between standard and
-	       daylight time anyway, so there's no point. So we just use the
-	       standard time instead. */
-	    want_daylight = (tt->is_daylight == 1) ? 1 : 0;
-
-#if 0
-	    if (zone_change->is_daylight == prev_zone_change->is_daylight)
-		printf (" **** Same is_daylight setting\n");
-#endif
-
-	    if (zone_change->is_daylight != want_daylight
-		&& prev_zone_change->is_daylight == want_daylight)
-		zone_change = prev_zone_change;
-	}
-    }
-
-    /* Now we know exactly which timezone change applies to the time, so
-       we can return the UTC offset and whether it is a daylight time. */
-    if (is_daylight)
-	*is_daylight = zone_change->is_daylight;
-    return zone_change->utc_offset;
-}
-
-
-/** @deprecated This API wasn't updated when we changed icaltimetype to contain its own
-    timezone. Also, this takes a pointer instead of the struct. */
-/** Calculates the UTC offset of a given UTC time in the given
-   timezone.  It is the number of seconds to add to UTC to get local
-   time.  The is_daylight flag is set to 1 if the time is in
-   daylight-savings time. */
-int
-icaltimezone_get_utc_offset_of_utc_time	(icaltimezone	*zone,
-					 struct icaltimetype	*tt,
-					 int		*is_daylight)
-{
-    icaltimezonechange *zone_change, tt_change, tmp_change;
-    int change_num, step, change_num_to_use;
-
-    if (is_daylight)
-	*is_daylight = 0;
-
-    /* For local times and UTC return 0. */
-    if (zone == NULL || zone == &utc_timezone)
-	return 0;
-
-    /* Use the builtin icaltimezone if possible. */
-    if (zone->builtin_timezone)
-	zone = zone->builtin_timezone;
-
-    /* Make sure the changes array is expanded up to the given time. */
-    icaltimezone_ensure_coverage (zone, tt->year);
-
-    if (!zone->changes || zone->changes->num_elements == 0)
-	return 0;
-
-    /* Copy the time parts of the icaltimetype to an icaltimezonechange so we
-       can use our comparison function on it. */
-    tt_change.year   = tt->year;
-    tt_change.month  = tt->month;
-    tt_change.day    = tt->day;
-    tt_change.hour   = tt->hour;
-    tt_change.minute = tt->minute;
-    tt_change.second = tt->second;
-
-    /* This should find a change close to the time, either the change before
-       it or the change after it. */
-    change_num = icaltimezone_find_nearby_change (zone, &tt_change);
-
-    /* Sanity check. */
-    icalerror_assert (change_num >= 0,
-		      "Negative timezone change index");
-    icalerror_assert (change_num < zone->changes->num_elements,
-		      "Timezone change index out of bounds");
-
-    /* Now move backwards or forwards to find the timezone change that applies
-       to tt. It should only have to do 1 or 2 steps. */
-    zone_change = icalarray_element_at (zone->changes, change_num);
-    step = 1;
-    change_num_to_use = -1;
-    for (;;) {
-	/* Copy the change and adjust it to UTC. */
-	tmp_change = *zone_change;
-
-	/* If the given time is on or after this change, then this change may
-	   apply, but we continue as a later change may be the right one.
-	   If the given time is before this change, then if we have already
-	   found a change which applies we can use that, else we need to step
-	   backwards. */
-	if (icaltimezone_compare_change_fn (&tt_change, &tmp_change) >= 0)
-	    change_num_to_use = change_num;
-	else
-	    step = -1;
-
-	/* If we are stepping backwards through the changes and we have found
-	   a change that applies, then we know this is the change to use so
-	   we exit the loop. */
-	if (step == -1 && change_num_to_use != -1)
-	    break;
-
-	change_num += step;
-
-	/* If we go past the start of the changes array, then we have no data
-	   for this time so we return a UTC offset of 0. */
-	if (change_num < 0)
-	    return 0;
-
-	if (change_num >= zone->changes->num_elements)
-	    break;
-
-	zone_change = icalarray_element_at (zone->changes, change_num);
-    }
-
-    /* If we didn't find a change to use, then we have a bug! */
-    icalerror_assert (change_num_to_use != -1,
-		      "No applicable timezone change found");
-
-    /* Now we know exactly which timezone change applies to the time, so
-       we can return the UTC offset and whether it is a daylight time. */
-    zone_change = icalarray_element_at (zone->changes, change_num_to_use);
-    if (is_daylight)
-	*is_daylight = zone_change->is_daylight;
-
-    return zone_change->utc_offset;
-}
-
-
-/** Returns the index of a timezone change which is close to the time
-   given in change. */
-static int
-icaltimezone_find_nearby_change		(icaltimezone		*zone,
-					 icaltimezonechange	*change)
-{
-    icaltimezonechange *zone_change;
-    int lower, upper, middle, cmp;
-					 
-    /* Do a simple binary search. */
-    lower = middle = 0;
-    upper = zone->changes->num_elements;
-
-    while (lower < upper) {
-	middle = (lower + upper) / 2;
-	zone_change = icalarray_element_at (zone->changes, middle);
-	cmp = icaltimezone_compare_change_fn (change, zone_change);
-	if (cmp == 0)
-	    break;
-	else if (cmp < 0)
-	    upper = middle;
-	else
-	    lower = middle + 1;
-    }
-
-    return middle;
-}
-
-
-
-
-/** Adds (or subtracts) a time from a icaltimezonechange.  NOTE: This
-   function is exactly the same as icaltime_adjust() except for the
-   type of the first parameter. */
-static void
-icaltimezone_adjust_change		(icaltimezonechange *tt,
-					 int		 days,
-					 int		 hours,
-					 int		 minutes,
-					 int		 seconds)
-{
-    int second, minute, hour, day;
-    int minutes_overflow, hours_overflow, days_overflow;
-    int days_in_month;
-
-    /* Add on the seconds. */
-    second = tt->second + seconds;
-    tt->second = second % 60;
-    minutes_overflow = second / 60;
-    if (tt->second < 0) {
-	tt->second += 60;
-	minutes_overflow--;
-    }
-
-    /* Add on the minutes. */
-    minute = tt->minute + minutes + minutes_overflow;
-    tt->minute = minute % 60;
-    hours_overflow = minute / 60;
-    if (tt->minute < 0) {
-	tt->minute += 60;
-	hours_overflow--;
-    }
-
-    /* Add on the hours. */
-    hour = tt->hour + hours + hours_overflow;
-    tt->hour = hour % 24;
-    days_overflow = hour / 24;
-    if (tt->hour < 0) {
-	tt->hour += 24;
-	days_overflow--;
-    }
-
-    /* Add on the days. */
-    day = tt->day + days + days_overflow;
-    if (day > 0) {
-	for (;;) {
-	    days_in_month = icaltime_days_in_month (tt->month, tt->year);
-	    if (day <= days_in_month)
-		break;
-
-	    tt->month++;
-	    if (tt->month >= 13) {
-		tt->year++;
-		tt->month = 1;
-	    }
-
-	    day -= days_in_month;
-	}
-    } else {
-	while (day <= 0) {
-	    if (tt->month == 1) {
-		tt->year--;
-		tt->month = 12;
-	    } else {
-		tt->month--;
-	    }
-
-	    day += icaltime_days_in_month (tt->month, tt->year);
-	}
-    }
-    tt->day = day;
-}
-
-
-char*
-icaltimezone_get_tzid			(icaltimezone	*zone)
-{
-    /* If this is a floating time, without a timezone, return NULL. */
-    if (!zone)
-	return NULL;
-
-    if (!zone->tzid)
-	icaltimezone_load_builtin_timezone (zone);
-
-    return zone->tzid;
-}
-
-
-char*
-icaltimezone_get_location		(icaltimezone	*zone)
-{
-    /* If this is a floating time, without a timezone, return NULL. */
-    if (!zone)
-	return NULL;
-
-    /* Note that for builtin timezones this comes from zones.tab so we don't
-       need to check the timezone is loaded here. */
-    return zone->location;
-}
-
-
-char*
-icaltimezone_get_tznames		(icaltimezone	*zone)
-{
-    /* If this is a floating time, without a timezone, return NULL. */
-    if (!zone)
-	return NULL;
-
-    if (!zone->component)
-	icaltimezone_load_builtin_timezone (zone);
-
-    return zone->tznames;
-}
-
-
-/** Returns the latitude of a builtin timezone. */
-double
-icaltimezone_get_latitude		(icaltimezone	*zone)
-{
-    /* If this is a floating time, without a timezone, return 0. */
-    if (!zone)
-	return 0.0;
-
-    /* Note that for builtin timezones this comes from zones.tab so we don't
-       need to check the timezone is loaded here. */
-    return zone->latitude;
-}
-
-
-/** Returns the longitude of a builtin timezone. */
-double
-icaltimezone_get_longitude		(icaltimezone	*zone)
-{
-    /* If this is a floating time, without a timezone, return 0. */
-    if (!zone)
-	return 0.0;
-
-    /* Note that for builtin timezones this comes from zones.tab so we don't
-       need to check the timezone is loaded here. */
-    return zone->longitude;
-}
-
-
-/** Returns the VTIMEZONE component of a timezone. */
-icalcomponent*
-icaltimezone_get_component		(icaltimezone	*zone)
-{
-    /* If this is a floating time, without a timezone, return NULL. */
-    if (!zone)
-	return NULL;
-
-    if (!zone->component)
-	icaltimezone_load_builtin_timezone (zone);
-
-    return zone->component;
-}
-
-
-/** Sets the VTIMEZONE component of an icaltimezone, initializing the
-   tzid, location & tzname fields. It returns 1 on success or 0 on
-   failure, i.e.  no TZID was found. */
-int
-icaltimezone_set_component		(icaltimezone	*zone,
-					 icalcomponent	*comp)
-{
-    icaltimezone_reset (zone);
-    return icaltimezone_get_vtimezone_properties (zone, comp);
-}
-
-
-/* Returns the timezone name to display to the user. We prefer to use the
-   Olson city name, but fall back on the TZNAME, or finally the TZID. We don't
-   want to use "" as it may be wrongly interpreted as a floating time.
-   Do not free the returned string. */
-char*
-icaltimezone_get_display_name		(icaltimezone	*zone)
-{
-	char *display_name;
-
-	display_name = icaltimezone_get_location (zone);
-	if (!display_name)
-		display_name = icaltimezone_get_tznames (zone);
-	if (!display_name) {
-		display_name = icaltimezone_get_tzid (zone);
-		/* Outlook will strip out X-LIC-LOCATION property and so all
-		   we get back in the iTIP replies is the TZID. So we see if
-		   this is one of our TZIDs and if so we jump to the city name
-		   at the end of it. */
-		if (display_name
-		    && !strncmp (display_name, TZID_PREFIX, TZID_PREFIX_LEN)) {
-		    /* Get the location, which is after the 3rd '/' char. */
-		    char *p;
-		    int num_slashes = 0;
-		    for (p = display_name; *p; p++) {
-			if (*p == '/') {
-			    num_slashes++;
-			    if (num_slashes == 3)
-				return p + 1;
-			}
-		    }
-		}
-	}
-
-	return display_name;
-}
-
-
-icalarray*
-icaltimezone_array_new			(void)
-{
-    return icalarray_new (sizeof (icaltimezone), 16);
-}
-
-
-void
-icaltimezone_array_append_from_vtimezone (icalarray	*timezones,
-					  icalcomponent	*child)
-{
-    icaltimezone zone;
-
-    icaltimezone_init (&zone);
-    if (icaltimezone_get_vtimezone_properties (&zone, child))
-	icalarray_append (timezones, &zone);
-}
-
-
-void
-icaltimezone_array_free			(icalarray	*timezones)
-{
-    icaltimezone *zone;
-    int i;
-
-	if ( timezones )
-	{
-		for (i = 0; i < timezones->num_elements; i++) {
-		zone = icalarray_element_at (timezones, i);
-		icaltimezone_free (zone, 0);
-		}
-
-		icalarray_free (timezones);
-	}
-}
-
-
-/*
- * BUILTIN TIMEZONE HANDLING
- */
-
-
-/** Returns an icalarray of icaltimezone structs, one for each builtin
-   timezone.  This will load and parse the zones.tab file to get the
-   timezone names and their coordinates. It will not load the
-   VTIMEZONE data for any timezones. */
-icalarray*
-icaltimezone_get_builtin_timezones	(void)
-{
-    if (!builtin_timezones)
-	icaltimezone_init_builtin_timezones ();
-
-    return builtin_timezones;
-}
-
-/** Release builtin timezone memory */
-void
-icaltimezone_free_builtin_timezones(void)
-{
-	icaltimezone_array_free(builtin_timezones);
-}
-
-
-/** Returns a single builtin timezone, given its Olson city name. */
-icaltimezone*
-icaltimezone_get_builtin_timezone	(const char *location)
-{
-    icaltimezone *zone;
-    int lower, upper, middle, cmp;
-    char *zone_location;
-
-    if (!location || !location[0])
-	return NULL;
-
-    if (!strcmp (location, "UTC"))
-	return &utc_timezone;
-
-    if (!builtin_timezones)
-	icaltimezone_init_builtin_timezones ();
-
-    /* Do a simple binary search. */
-    lower = middle = 0;
-    upper = builtin_timezones->num_elements;
-
-    while (lower < upper) {
-	middle = (lower + upper) / 2;
-	zone = icalarray_element_at (builtin_timezones, middle);
-	zone_location = icaltimezone_get_location (zone);
-	cmp = strcmp (location, zone_location);
-	if (cmp == 0)
-	    return zone;
-	else if (cmp < 0)
-	    upper = middle;
-	else
-	    lower = middle + 1;
-    }
-
-    return NULL;
-}
-
-
-/** Returns a single builtin timezone, given its TZID. */
-icaltimezone*
-icaltimezone_get_builtin_timezone_from_tzid (const char *tzid)
-{
-    int num_slashes = 0;
-    const char *p, *zone_tzid;
-    icaltimezone *zone;
-
-    if (!tzid || !tzid[0])
-	return NULL;
-
-    /* Check that the TZID starts with our unique prefix. */
-    if (strncmp (tzid, TZID_PREFIX, TZID_PREFIX_LEN))
-	return NULL;
-
-    /* Get the location, which is after the 3rd '/' character. */
-    p = tzid;
-    for (p = tzid; *p; p++) {
-	if (*p == '/') {
-	    num_slashes++;
-	    if (num_slashes == 3)
-		break;
-	}
-    }
-
-    if (num_slashes != 3)
-	return NULL;
-
-    p++;
-
-    /* Now we can use the function to get the builtin timezone from the
-       location string. */
-    zone = icaltimezone_get_builtin_timezone (p);
-    if (!zone)
-	return NULL;
-
-    /* Check that the builtin TZID matches exactly. We don't want to return
-       a different version of the VTIMEZONE. */
-    zone_tzid = icaltimezone_get_tzid (zone);
-    if (!strcmp (zone_tzid, tzid))
-	return zone;
-    else
-	return NULL;
-}
-
-
-/** Returns the special UTC timezone. */
-icaltimezone*
-icaltimezone_get_utc_timezone		(void)
-{
-    if (!builtin_timezones)
-	icaltimezone_init_builtin_timezones ();
-
-    return &utc_timezone;
-}
-
-
-
-/** This initializes the builtin timezone data, i.e. the
-   builtin_timezones array and the special UTC timezone. It should be
-   called before any code that uses the timezone functions. */
-static void
-icaltimezone_init_builtin_timezones	(void)
-{
-    /* Initialize the special UTC timezone. */
-    utc_timezone.tzid = "UTC";
-
-    icaltimezone_parse_zone_tab ();
-}
-
-
-/** This parses the zones.tab file containing the names and locations
-   of the builtin timezones. It creates the builtin_timezones array
-   which is an icalarray of icaltimezone structs. It only fills in the
-   location, latitude and longtude fields; the rest are left
-   blank. The VTIMEZONE component is loaded later if it is needed. The
-   timezones in the zones.tab file are sorted by their name, which is
-   useful for binary searches. */
-static void
-icaltimezone_parse_zone_tab		(void)
-{
-    char *filename;
-    FILE *fp;
-    char buf[1024];  /* Used to store each line of zones.tab as it is read. */
-    char location[1024]; /* Stores the city name when parsing buf. */
-    unsigned int filename_len;
-    int latitude_degrees, latitude_minutes, latitude_seconds;
-    int longitude_degrees, longitude_minutes, longitude_seconds;
-    icaltimezone zone;
-
-    icalerror_assert (builtin_timezones == NULL,
-		      "Parsing zones.tab file multiple times");
-
-    builtin_timezones = icalarray_new (sizeof (icaltimezone), 32);
-
-    filename_len = strlen (get_zone_directory()) + strlen (ZONES_TAB_FILENAME)
-	+ 2;
-
-    filename = (char*) malloc (filename_len);
-    if (!filename) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return;
-    }
-
-    snprintf (filename, filename_len, "%s/%s", get_zone_directory(),
-	      ZONES_TAB_FILENAME);
-
-    fp = fopen (filename, "r");
-    free (filename);
-    if (!fp) {
-	icalerror_set_errno(ICAL_FILE_ERROR);
-	return;
-    }
-
-    while (fgets (buf, sizeof(buf), fp)) {
-	if (*buf == '#') continue;
-
-	/* The format of each line is: "latitude longitude location". */
-	if (sscanf (buf, "%4d%2d%2d %4d%2d%2d %s",
-		    &latitude_degrees, &latitude_minutes,
-		    &latitude_seconds,
-		    &longitude_degrees, &longitude_minutes,
-		    &longitude_seconds,
-		    location) != 7) {
-	    fprintf (stderr, "Invalid timezone description line: %s\n", buf);
-	    continue;
-	}
-
-	icaltimezone_init (&zone);
-	zone.location = strdup (location);
-
-	if (latitude_degrees >= 0)
-	    zone.latitude = (double) latitude_degrees
-		+ (double) latitude_minutes / 60
-		+ (double) latitude_seconds / 3600;
-	else
-	    zone.latitude = (double) latitude_degrees
-		- (double) latitude_minutes / 60
-		- (double) latitude_seconds / 3600;
-
-	if (longitude_degrees >= 0)
-	    zone.longitude = (double) longitude_degrees
-		+ (double) longitude_minutes / 60
-		+ (double) longitude_seconds / 3600;
-	else
-	    zone.longitude = (double) longitude_degrees
-		- (double) longitude_minutes / 60
-		- (double) longitude_seconds / 3600;
-
-	icalarray_append (builtin_timezones, &zone);
-
-#if 0
-	printf ("Found zone: %s %f %f\n",
-		location, zone.latitude, zone.longitude);
-#endif
-    }
-
-    fclose (fp);
-}
-
-
-/** Loads the builtin VTIMEZONE data for the given timezone. */
-static void
-icaltimezone_load_builtin_timezone	(icaltimezone	*zone)
-{
-    char *filename;
-    unsigned int filename_len;
-    FILE *fp;
-    icalparser *parser;
-    icalcomponent *comp, *subcomp;
-
-	    /* If the location isn't set, it isn't a builtin timezone. */
-    if (!zone->location || !zone->location[0])
-	return;
-
-    filename_len = strlen (get_zone_directory()) + strlen (zone->location) + 6;
-
-    filename = (char*) malloc (filename_len);
-    if (!filename) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return;
-    }
-
-    snprintf (filename, filename_len, "%s/%s.ics", get_zone_directory(),
-	      zone->location);
-
-    fp = fopen (filename, "r");
-    free (filename);
-    if (!fp) {
-	icalerror_set_errno(ICAL_FILE_ERROR);
-	return;
-    }
-
-	
-	/* ##### B.# Sun, 11 Nov 2001 04:04:29 +1100 
-	this is where the MALFORMEDDATA error is being set, after the call to 'icalparser_parse'
-	fprintf(stderr, "** WARNING ** %s: %d %s\n", __FILE__, __LINE__, icalerror_strerror(icalerrno));
-	*/
-
-    parser = icalparser_new ();
-	icalparser_set_gen_data (parser, fp);
-	comp = icalparser_parse (parser, icaltimezone_load_get_line_fn);
-    icalparser_free (parser);
-	fclose (fp);
-
-	
-	
-    /* Find the VTIMEZONE component inside the VCALENDAR. There should be 1. */
-    subcomp = icalcomponent_get_first_component (comp,
-						 ICAL_VTIMEZONE_COMPONENT);
-    if (!subcomp) {
-	icalerror_set_errno(ICAL_PARSE_ERROR);
-	return;
-    }
-
-    icaltimezone_get_vtimezone_properties (zone, subcomp);
-
-	icalcomponent_remove_component(comp,subcomp);
-
-	icalcomponent_free(comp);
-
-}
-
-
-/** Callback used from icalparser_parse() */
-static char *
-icaltimezone_load_get_line_fn		(char		*s,
-					 size_t		 size,
-					 void		*data)
-{
-    return fgets (s, size, (FILE*) data);
-}
-
-
-
-
-/*
- * DEBUGGING
- */
-
-/**
- * This outputs a list of timezone changes for the given timezone to the
- * given file, up to the maximum year given. We compare this output with the
- * output from 'vzic --dump-changes' to make sure that we are consistent.
- * (vzic is the Olson timezone database to VTIMEZONE converter.)
- * 
- * The output format is:
- *
- *	Zone-Name [tab] Date [tab] Time [tab] UTC-Offset
- *
- * The Date and Time fields specify the time change in UTC.
- *
- * The UTC Offset is for local (wall-clock) time. It is the amount of time
- * to add to UTC to get local time.
- */
-int
-icaltimezone_dump_changes		(icaltimezone	*zone,
-					 int		 max_year,
-					 FILE		*fp)
-{
-    static char *months[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-			      "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
-    icaltimezonechange *zone_change;
-    int change_num;
-    char buffer[8];
-
-    /* Make sure the changes array is expanded up to the given time. */
-    icaltimezone_ensure_coverage (zone, max_year);
-
-#if 0
-    printf ("Num changes: %i\n", zone->changes->num_elements);
-#endif
-
-    change_num = 0;
-    for (change_num = 0; change_num < zone->changes->num_elements; change_num++) {
-	zone_change = icalarray_element_at (zone->changes, change_num);
-
-	if (zone_change->year > max_year)
-	    break;
-
-	fprintf (fp, "%s\t%2i %s %04i\t%2i:%02i:%02i",
-		zone->location,
-		zone_change->day, months[zone_change->month - 1],
-		zone_change->year,
-		zone_change->hour, zone_change->minute, zone_change->second);
-
-	/* Wall Clock Time offset from UTC. */
-	format_utc_offset (zone_change->utc_offset, buffer);
-	fprintf (fp, "\t%s", buffer);
-
-	fprintf (fp, "\n");
-    }
-	return 1;
-}
-
-
-/** This formats a UTC offset as "+HHMM" or "+HHMMSS".
-   buffer should have space for 8 characters. */
-static void
-format_utc_offset			(int		 utc_offset,
-					 char		*buffer)
-{
-  char *sign = "+";
-  int hours, minutes, seconds;
-
-  if (utc_offset < 0) {
-    utc_offset = -utc_offset;
-    sign = "-";
-  }
-
-  hours = utc_offset / 3600;
-  minutes = (utc_offset % 3600) / 60;
-  seconds = utc_offset % 60;
-
-  /* Sanity check. Standard timezone offsets shouldn't be much more than 12
-     hours, and daylight saving shouldn't change it by more than a few hours.
-     (The maximum offset is 15 hours 56 minutes at present.) */
-  if (hours < 0 || hours >= 24 || minutes < 0 || minutes >= 60
-      || seconds < 0 || seconds >= 60) {
-    fprintf (stderr, "Warning: Strange timezone offset: H:%i M:%i S:%i\n",
-	     hours, minutes, seconds);
-  }
-
-  if (seconds == 0)
-    sprintf (buffer, "%s%02i%02i", sign, hours, minutes);
-  else
-    sprintf (buffer, "%s%02i%02i%02i", sign, hours, minutes, seconds);
-}
-
-static char* get_zone_directory(void)
-{
-	return zone_files_directory == NULL ? ZONEINFO_DIRECTORY : zone_files_directory;
-}
-
-void set_zone_directory(char *path)
-{
-	zone_files_directory = malloc(strlen(path)+1);
-	if ( zone_files_directory != NULL )
-	{
-		strcpy(zone_files_directory,path);
-	}
-}
-
-void free_zone_directory(void)
-{
-	if ( zone_files_directory != NULL )
-	{
-		free(zone_files_directory);
-	}
-}
diff --git a/libical/src/libical/icaltimezone.h b/libical/src/libical/icaltimezone.h
deleted file mode 100644
index b5e9aaa009..0000000000
--- a/libical/src/libical/icaltimezone.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/*======================================================================
- FILE: icaltimezone.h
- CREATOR: Damon Chaplin 15 March 2001
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2001, Damon Chaplin
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
-======================================================================*/
-/**
- * @file icaltimezone.h
- * @brief timezone handling routines
- */
-
-#ifndef ICALTIMEZONE_H
-#define ICALTIMEZONE_H
-
-#include <stdio.h> /* For FILE* */
-#include "icaltime.h"
-#include "icalarray.h"
-#include "icalcomponent.h"
-
-
-#ifndef ICALTIMEZONE_DEFINED
-#define ICALTIMEZONE_DEFINED
-/** @brief An opaque struct representing a timezone.  
- * We declare this here to avoid a circular dependancy. 
- */
-typedef struct _icaltimezone		icaltimezone;
-#endif
-
-/**
- * @par Creating/Destroying individual icaltimezones.
- */
-
-/** Creates a new icaltimezone. */
-icaltimezone *icaltimezone_new			(void);
-
-/** Frees all memory used for the icaltimezone. Set free_struct to free the
-   icaltimezone struct as well. */
-void icaltimezone_free				(icaltimezone *zone,
-						 int free_struct);
-
-
-/**
- * @par Accessing timezones.
- */
-
-/** Free any builtin timezone information **/
-void icaltimezone_free_builtin_timezones(void);
-
-/** Returns the array of builtin icaltimezones. */
-icalarray* icaltimezone_get_builtin_timezones	(void);
-
-/** Returns a single builtin timezone, given its Olson city name. */
-icaltimezone* icaltimezone_get_builtin_timezone	(const char *location);
-
-/** Returns a single builtin timezone, given its TZID. */
-icaltimezone* icaltimezone_get_builtin_timezone_from_tzid (const char *tzid);
-
-/** Returns the UTC timezone. */
-icaltimezone* icaltimezone_get_utc_timezone	(void);
-
-/** Returns the TZID of a timezone. */
-char*	icaltimezone_get_tzid			(icaltimezone	*zone);
-
-/** Returns the city name of a timezone. */
-char*	icaltimezone_get_location		(icaltimezone	*zone);
-
-/** Returns the TZNAME properties used in the latest STANDARD and DAYLIGHT
-   components. If they are the same it will return just one, e.g. "LMT".
-   If they are different it will format them like "EST/EDT". Note that this
-   may also return NULL. */
-char*	icaltimezone_get_tznames		(icaltimezone	*zone);
-
-/** Returns the latitude of a builtin timezone. */
-double	icaltimezone_get_latitude		(icaltimezone	*zone);
-
-/** Returns the longitude of a builtin timezone. */
-double	icaltimezone_get_longitude		(icaltimezone	*zone);
-
-/** Returns the VTIMEZONE component of a timezone. */
-icalcomponent*	icaltimezone_get_component	(icaltimezone	*zone);
-
-/** Sets the VTIMEZONE component of an icaltimezone, initializing the tzid,
-   location & tzname fields. It returns 1 on success or 0 on failure, i.e.
-   no TZID was found. */
-int	icaltimezone_set_component		(icaltimezone	*zone,
-						 icalcomponent	*comp);
-
-char*   icaltimezone_get_display_name           (icaltimezone   *zone);
-
-/**
- * @par Converting times between timezones.
- */
-
-void	icaltimezone_convert_time		(struct icaltimetype *tt,
-						 icaltimezone	*from_zone,
-						 icaltimezone	*to_zone);
-
-
-/**
- * @par Getting offsets from UTC.
- */
-
-/** Calculates the UTC offset of a given local time in the given
-   timezone.  It is the number of seconds to add to UTC to get local
-   time.  The is_daylight flag is set to 1 if the time is in
-   daylight-savings time. */
-int	icaltimezone_get_utc_offset		(icaltimezone	*zone,
-						 struct icaltimetype *tt,
-						 int		*is_daylight);
-
-/** Calculates the UTC offset of a given UTC time in the given
-   timezone.  It is the number of seconds to add to UTC to get local
-   time.  The is_daylight flag is set to 1 if the time is in
-   daylight-savings time. */
-int	icaltimezone_get_utc_offset_of_utc_time	(icaltimezone	*zone,
-						 struct icaltimetype *tt,
-						 int		*is_daylight);
-
-
-
-/*
- * Handling arrays of timezones. Mainly for internal use.
- */
-icalarray*  icaltimezone_array_new		(void);
-
-void	    icaltimezone_array_append_from_vtimezone (icalarray	    *timezones,
-						      icalcomponent *child);
-void	    icaltimezone_array_free		(icalarray	*timezones);
-
-
-/*
- * @par Handling the default location the timezone files
- */
-
-/** Set the directory to look for the zonefiles */
-void set_zone_directory(char *path);
-
-/** Free memory dedicated to the zonefile directory */
-void free_zone_directory(void);
-
-/*
- * @par Debugging Output.
- */
-
-/** Dumps information about changes in the timezone up to and including
-   max_year. */
-int	icaltimezone_dump_changes		(icaltimezone	*zone,
-						 int		 max_year,
-						 FILE		*fp);
-
-#endif /* ICALTIMEZONE_H */
diff --git a/libical/src/libical/icaltypes.c b/libical/src/libical/icaltypes.c
deleted file mode 100644
index 19719f8aa7..0000000000
--- a/libical/src/libical/icaltypes.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icaltypes.c
-  CREATOR: eric 16 May 1999
-  
-  $Id$
-  $Locker$
-    
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icaltypes.c
-
- ======================================================================*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "icaltypes.h"
-#include "icalerror.h"
-#include "icalmemory.h"
-#include <stdlib.h> /* for malloc and abs() */
-#include <errno.h> /* for errno */
-#include <string.h> /* for icalmemory_strdup */
-#include <assert.h>
-
-#ifdef WIN32
-#define snprintf      _snprintf
-#define strcasecmp    stricmp
-#endif
-
-#define TEMP_MAX 1024
-
-
-int icaltriggertype_is_null_trigger(struct icaltriggertype tr)
-{
-    if(icaltime_is_null_time(tr.time) && 
-       icaldurationtype_is_null_duration(tr.duration)){
-        return 1;
-    }
-
-    return 0;
-}
-    
-int icaltriggertype_is_bad_trigger(struct icaltriggertype tr)
-{
-    if(icaldurationtype_is_bad_duration(tr.duration)){
-        return 1;
-    }
-
-    return 0;
-}
-
-struct icaltriggertype icaltriggertype_from_int(const int reltime)
-{
-    struct icaltriggertype tr;
-
-    tr.time	= icaltime_null_time();
-    tr.duration = icaldurationtype_from_int(reltime);
-
-    return tr;
-}
-
-struct icaltriggertype icaltriggertype_from_string(const char* str)
-{
-
-    
-    struct icaltriggertype tr, null_tr;
-    icalerrorstate es;
-    icalerrorenum e;
-
-    tr.time= icaltime_null_time();
-    tr.duration = icaldurationtype_from_int(0);
-
-    null_tr = tr;
-
-    if(str == 0) goto error;
-
-    /* Suppress errors so a failure in icaltime_from_string() does not cause an abort */
-    es = icalerror_get_error_state(ICAL_MALFORMEDDATA_ERROR);
-    icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR,ICAL_ERROR_NONFATAL);
-    e = icalerrno;
-    icalerror_set_errno(ICAL_NO_ERROR);
-
-    tr.time = icaltime_from_string(str);
-
-    if (icaltime_is_null_time(tr.time)){
-
-	tr.duration = icaldurationtype_from_string(str);
-
-        if (icaldurationtype_is_bad_duration(tr.duration)) goto error;
-    } 
-
-    icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR,es);
-    icalerror_set_errno(e);
-    return tr;
-
- error:
-    icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR,es);
-    icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-    return tr;
-
-}
-
-
-struct icalreqstattype icalreqstattype_from_string(const char* str)
-{
-  const char *p1,*p2;
-  struct icalreqstattype stat;
-  short major=0, minor=0;
-
-  icalerror_check_arg((str != 0),"str");
-
-  stat.code = ICAL_UNKNOWN_STATUS;
-  stat.debug = 0; 
-   stat.desc = 0;
-
-  /* Get the status numbers */
-
-  sscanf(str, "%hd.%hd",&major, &minor);
-
-  if (major <= 0 || minor < 0){
-    icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-    return stat;
-  }
-
-  stat.code = icalenum_num_to_reqstat(major, minor);
-
-  if (stat.code == ICAL_UNKNOWN_STATUS){
-    icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-    return stat;
-  }
-  
-
-  p1 = strchr(str,';');
-
-  if (p1 == 0){
-/*    icalerror_set_errno(ICAL_BADARG_ERROR);*/
-    return stat;
-  }
-
-  /* Just ignore the second clause; it will be taken from inside the library 
-   */
-
-
-
-  p2 = strchr(p1+1,';');
-  if (p2 != 0 && *p2 != 0){
-    stat.debug = p2+1;
-  } 
-
-  return stat;
-  
-}
-
-const char* icalreqstattype_as_string(struct icalreqstattype stat)
-{
-  char *temp;
-
-  temp = (char*)icalmemory_tmp_buffer(TEMP_MAX);
-
-  icalerror_check_arg_rz((stat.code != ICAL_UNKNOWN_STATUS),"Status");
-  
-  if (stat.desc == 0){
-    stat.desc = icalenum_reqstat_desc(stat.code);
-  }
-  
-  if(stat.debug != 0){
-    snprintf(temp,TEMP_MAX,"%d.%d;%s;%s", icalenum_reqstat_major(stat.code),
-             icalenum_reqstat_minor(stat.code),
-             stat.desc, stat.debug);
-    
-  } else {
-    snprintf(temp,TEMP_MAX,"%d.%d;%s", icalenum_reqstat_major(stat.code),
-             icalenum_reqstat_minor(stat.code),
-             stat.desc);
-  }
-
-  return temp;
-}
diff --git a/libical/src/libical/icaltypes.h b/libical/src/libical/icaltypes.h
deleted file mode 100644
index 1e5c5e09bb..0000000000
--- a/libical/src/libical/icaltypes.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icaltypes.h
- CREATOR: eric 20 March 1999
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icaltypes.h
-
-======================================================================*/
-
-#ifndef ICALTYPES_H
-#define ICALTYPES_H
-
-#include <time.h>
-#include "icalenums.h"
-#include "icaltime.h"
-#include "icalduration.h"
-#include "icalperiod.h"
-
-
-struct icalgeotype 
-{
-	float lat;
-	float lon;
-};
-
-
-struct icaldatetimeperiodtype 
-{
-	struct icaltimetype time;
-	struct icalperiodtype period;
-};
-
-
-struct icaltriggertype 
-{
-	struct icaltimetype time; 
-	struct icaldurationtype duration;
-};
-
-struct icaltriggertype icaltriggertype_from_int(const int reltime);
-struct icaltriggertype icaltriggertype_from_string(const char* str);
-
-int icaltriggertype_is_null_trigger(struct icaltriggertype tr);
-int icaltriggertype_is_bad_trigger(struct icaltriggertype tr);
-
-/* struct icalreqstattype. This struct contains two string pointers,
-but don't try to free either of them. The "desc" string is a pointer
-to a static table inside the library.  Don't try to free it. The
-"debug" string is a pointer into the string that the called passed
-into to icalreqstattype_from_string. Don't try to free it either, and
-don't use it after the original string has been freed.
-
-BTW, you would get that original string from
-*icalproperty_get_requeststatus() or icalvalue_get_text(), when
-operating on a the value of a request_status property. */
-
-struct icalreqstattype {
-
-	icalrequeststatus code;
-	const char* desc;
-	const char* debug;
-};
-
-struct icalreqstattype icalreqstattype_from_string(const char* str);
-const char* icalreqstattype_as_string(struct icalreqstattype);
-
-
-
-struct icaltimezonephase {
-    const char* tzname;
-    int is_stdandard; /* 1 = standard tme, 0 = daylight savings time */
-    struct icaltimetype dtstart;
-    int offsetto;
-    int tzoffsetfrom;
-    const char* comment;
-    struct icaldatetimeperiodtype rdate;
-    const char* rrule;    
-};
-
-
-struct icaltimezonetype {
-    const char* tzid;
-    struct icaltimetype last_mod;
-    const char* tzurl;
-    
-    /* Array of phases. The end of the array is a phase with tzname == 0 */
-    struct icaltimezonephase *phases;
-};
-
-void icaltimezonetype_free(struct icaltimezonetype tzt);
-
-
-#endif /* !ICALTYPES_H */
diff --git a/libical/src/libical/icalvalue.c b/libical/src/libical/icalvalue.c
deleted file mode 100644
index 2e52670c61..0000000000
--- a/libical/src/libical/icalvalue.c
+++ /dev/null
@@ -1,1322 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* vi:set ts=4 sts=4 sw=4 expandtab : */
-/*======================================================================
-  FILE: icalvalue.c
-  CREATOR: eric 02 May 1999
-  
-  $Id$
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalvalue.c
-
-  Contributions from:
-     Graham Davison (g.m.davison@computer.org)
-
-
-======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "icalerror.h"
-#include "icalmemory.h"
-#include "icalparser.h"
-#include "icalenums.h"
-#include "icalvalueimpl.h"
-
-#include <stdlib.h> /* for malloc */
-#include <stdio.h> /* for sprintf */
-#include <string.h> /* For memset, others */
-#include <stddef.h> /* For offsetof() macro */
-#include <errno.h>
-#include <time.h> /* for mktime */
-#include <stdlib.h> /* for atoi and atof */
-#include <limits.h> /* for SHRT_MAX */         
-
-#ifdef WIN32
-#define snprintf      _snprintf
-#define strcasecmp    stricmp
-#endif
-
-#if _MAC_OS_
-#include "icalmemory_strdup.h"
-#endif
-
-#define TMP_BUF_SIZE 1024
-
-void print_datetime_to_string(char* str,  const struct icaltimetype *data);
-void print_date_to_string(char* str,  const struct icaltimetype *data);
-void print_time_to_string(char* str,  const struct icaltimetype *data);
-
-
-struct icalvalue_impl*  icalvalue_new_impl(icalvalue_kind kind){
-
-    struct icalvalue_impl* v;
-
-    if (!icalvalue_kind_is_valid(kind))
-      return NULL;
-
-    if ( ( v = (struct icalvalue_impl*)
-	   malloc(sizeof(struct icalvalue_impl))) == 0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-    
-    strcpy(v->id,"val");
-    
-    v->kind = kind;
-    v->size = 0;
-    v->parent = 0;
-    v->x_value = 0;
-    memset(&(v->data),0,sizeof(v->data));
-    
-    return v;
-
-}
-
-
-
-icalvalue*
-icalvalue_new (icalvalue_kind kind)
-{
-    return (icalvalue*)icalvalue_new_impl(kind);
-}
-
-icalvalue* icalvalue_new_clone(const icalvalue* old) {
-    struct icalvalue_impl* new;
-
-    new = icalvalue_new_impl(old->kind);
-
-    if (new == 0){
-	return 0;
-    }
-
-    strcpy(new->id, old->id);
-    new->kind = old->kind;
-    new->size = old->size;
-
-    switch (new->kind){
-	case ICAL_ATTACH_VALUE: 
-	case ICAL_BINARY_VALUE: 
-	{
-	    /* Hmm.  We just ref the attach value, which may not be the right
-	     * thing to do.  We cannot quite copy the data, anyways, since we
-	     * don't know how long it is.
-	     */
-	    new->data.v_attach = old->data.v_attach;
-	    if (new->data.v_attach)
-		icalattach_ref (new->data.v_attach);
-
-	    break;
-	}
-	case ICAL_QUERY_VALUE:
-	case ICAL_STRING_VALUE:
-	case ICAL_TEXT_VALUE:
-	case ICAL_CALADDRESS_VALUE:
-	case ICAL_URI_VALUE:
-	{
-	    if (old->data.v_string != 0) { 
-		new->data.v_string=icalmemory_strdup(old->data.v_string);
-
-		if ( new->data.v_string == 0 ) {
-		    return 0;
-		}		    
-
-	    }
-	    break;
-	}
-	case ICAL_RECUR_VALUE:
-	{
-	    if(old->data.v_recur != 0){
-		new->data.v_recur = malloc(sizeof(struct icalrecurrencetype));
-
-		if(new->data.v_recur == 0){
-		    return 0;
-		}
-
-		memcpy(	new->data.v_recur, old->data.v_recur,
-			sizeof(struct icalrecurrencetype));	
-	    }
-	    break;
-	}
-
-	case ICAL_X_VALUE: 
-	{
-	    if (old->x_value != 0) {
-		new->x_value=icalmemory_strdup(old->x_value);
-
-		if (new->x_value == 0) {
-		    return 0;
-		}
-	    }
-
-	    break;
-	}
-
-	default:
-	{
-	    /* all of the other types are stored as values, not
-               pointers, so we can just copy the whole structure. */
-
-	    new->data = old->data;
-	}
-    }
-
-    return new;
-}
-
-static char* icalmemory_strdup_and_dequote(const char* str)
-{
-    const char* p;
-    char* out = (char*)malloc(sizeof(char) * strlen(str) +1);
-    char* pout;
-
-    if (out == 0){
-	return 0;
-    }
-
-    pout = out;
-
-    for (p = str; *p!=0; p++){
-	
-	if( *p == '\\')
-	{
-	    p++;
-	    switch(*p){
-		case 0:
-		{
-		    *pout = '\0';
-		    break;
-
-		}
-		case 'n':
-		case 'N':
-		{
-		    *pout = '\n';
-		    break;
-		}
-		case 't':
-		case 'T':
-		{
-		    *pout = '\t';
-		    break;
-		}
-		case 'r':
-		case 'R':
-		{
-		    *pout = '\r';
-		    break;
-		}
-		case 'b':
-		case 'B':
-		{
-		    *pout = '\b';
-		    break;
-		}
-		case 'f':
-		case 'F':
-		{
-		    *pout = '\f';
-		    break;
-		}
-		case ';':
-		case ',':
-		case '"':
-		case '\\':
-		{
-		    *pout = *p;
-		    break;
-		}
-		default:
-		{
-		    *pout = ' ';
-		}		
-	    }
-	} else {
-	    *pout = *p;
-	}
-
-	pout++;
-	
-    }
-
-    *pout = '\0';
-
-    return out;
-}
-
-/*
- * FIXME
- *
- * This is a bad API, as it forces callers to specify their own X type.
- * This function should take care of this by itself.
- */
-static
-icalvalue* icalvalue_new_enum(icalvalue_kind kind, int x_type, const char* str)
-{
-    int e = icalproperty_kind_and_string_to_enum(kind, str);
-    struct icalvalue_impl *value; 
-
-    if(e != 0 && icalproperty_enum_belongs_to_property(
-                   icalproperty_value_kind_to_kind(kind),e)) {
-        
-        value = icalvalue_new_impl(kind);
-        value->data.v_enum = e;
-    } else {
-        /* Make it an X value */
-        value = icalvalue_new_impl(kind);
-        value->data.v_enum = x_type;
-        icalvalue_set_x(value,str);
-    }
-
-    return value;
-}
-
-
-icalvalue* icalvalue_new_from_string_with_error(icalvalue_kind kind,const char* str,icalproperty** error)
-{
-
-    struct icalvalue_impl *value = 0;
-    
-    icalerror_check_arg_rz(str!=0,"str");
-
-    if (error != 0){
-	*error = 0;
-    }
-
-    switch (kind){
-	
-    case ICAL_ATTACH_VALUE:
-	{
-	    icalattach *attach;
-
-	    attach = icalattach_new_from_url (str);
-	    if (!attach)
-		break;
-
-	    value = icalvalue_new_attach (attach);
-	    icalattach_unref (attach);
-	    break;
-	}
-
-    case ICAL_BINARY_VALUE:
-    case ICAL_BOOLEAN_VALUE:
-        {
-            /* HACK */
-            value = 0;
-            
-	    if (error != 0){
-		char temp[TMP_BUF_SIZE];
-		sprintf(temp,"%s Values are not implemented",
-                        icalvalue_kind_to_string(kind)); 
-		*error = icalproperty_vanew_xlicerror( 
-                                   temp, 
-                                   icalparameter_new_xlicerrortype( 
-                                        ICAL_XLICERRORTYPE_VALUEPARSEERROR), 
-                                   0); 
-	    }
-	    break;
-	}
-        
-
-    case ICAL_TRANSP_VALUE:
-        value = icalvalue_new_enum(kind, (int)ICAL_TRANSP_X,str);
-        break;
-    case ICAL_METHOD_VALUE:
-        value = icalvalue_new_enum(kind, (int)ICAL_METHOD_X,str);
-        break;
-    case ICAL_STATUS_VALUE:
-        value = icalvalue_new_enum(kind, (int)ICAL_STATUS_X,str);
-        break;
-    case ICAL_ACTION_VALUE:
-        value = icalvalue_new_enum(kind, (int)ICAL_ACTION_X,str);
-        break;
-
-    case ICAL_QUERY_VALUE:
-	    value = icalvalue_new_query(str);
-	    break;
-
-    case ICAL_CLASS_VALUE:
-        value = icalvalue_new_enum(kind, (int)ICAL_CLASS_X,str);
-        break;
-
-    case ICAL_CMD_VALUE:
-        value = icalvalue_new_enum(kind, ICAL_CMD_X,str);
-        break;
-    case ICAL_QUERYLEVEL_VALUE:
-        value = icalvalue_new_enum(kind, ICAL_QUERYLEVEL_X,str);
-        break;
-    case ICAL_CARLEVEL_VALUE:
-        value = icalvalue_new_enum(kind, ICAL_CARLEVEL_X,str);
-        break;
-
-
-    case ICAL_INTEGER_VALUE:
-	    value = icalvalue_new_integer(atoi(str));
-	    break;
-
-    case ICAL_FLOAT_VALUE:
-	    value = icalvalue_new_float((float)atof(str));
-	    break;
-
-    case ICAL_UTCOFFSET_VALUE:
-	{
-            int t,utcoffset, hours, minutes, seconds;
-            /* treat the UTCOFSET string a a decimal number, disassemble its digits
-               and reconstruct it as sections */
-            t = strtol(str,0,10);
-            /* add phantom seconds field */
-            if(abs(t)<9999){t *= 100; }
-            hours = (t/10000);
-            minutes = (t-hours*10000)/100;
-            seconds = (t-hours*10000-minutes*100);
-            utcoffset = hours*3600+minutes*60+seconds;
-
-	    value = icalvalue_new_utcoffset(utcoffset);
-
-	    break;
-	}
-        
-    case ICAL_TEXT_VALUE:
-	{
-	    char* dequoted_str = icalmemory_strdup_and_dequote(str);
-	    value = icalvalue_new_text(dequoted_str);
-	    free(dequoted_str);
-	    break;
-	}
-        
-    case ICAL_STRING_VALUE:
-	    value = icalvalue_new_string(str);
-	    break;
-        
-    case ICAL_CALADDRESS_VALUE:
-	    value = icalvalue_new_caladdress(str);
-	    break;
-        
-    case ICAL_URI_VALUE:
-	    value = icalvalue_new_uri(str);
-	    break;
-        
-    case ICAL_GEO_VALUE:
-	    value = 0;
-	    /* HACK */
-            
-	    if (error != 0){
-		char temp[TMP_BUF_SIZE];
-		sprintf(temp,"GEO Values are not implemented"); 
-		*error = icalproperty_vanew_xlicerror( 
-		    temp, 
-		    icalparameter_new_xlicerrortype( 
-			ICAL_XLICERRORTYPE_VALUEPARSEERROR), 
-		    0); 
-	    }
-
-	    /*icalerror_warn("Parsing GEO properties is unimplmeneted");*/
-
-	    break;
-        
-    case ICAL_RECUR_VALUE:
-	{
-	    struct icalrecurrencetype rt;
-	    rt = icalrecurrencetype_from_string(str);
-            if(rt.freq != ICAL_NO_RECURRENCE){
-                value = icalvalue_new_recur(rt);
-            }
-	    break;
-	}
-        
-    case ICAL_DATE_VALUE:
-    case ICAL_DATETIME_VALUE:
-	{
-	    struct icaltimetype tt;
-      
-	    tt = icaltime_from_string(str);
-            if(!icaltime_is_null_time(tt)){
-                value = icalvalue_new_impl(kind);
-                value->data.v_time = tt;
-
-                icalvalue_reset_kind(value);
-            }
-	    break;
-	}
-        
-    case ICAL_DATETIMEPERIOD_VALUE:
-	{
-	    struct icaltimetype tt;
-            struct icalperiodtype p;
-            tt = icaltime_from_string(str);
-
-            if(!icaltime_is_null_time(tt)){
-                value = icalvalue_new_datetime(tt);		
-		break;
-            }  
-	    
-            p = icalperiodtype_from_string(str);	    
-	    if (!icalperiodtype_is_null_period(p)){
-                value = icalvalue_new_period(p);
-            }            
-
-            break;
-	}
-        
-    case ICAL_DURATION_VALUE:
-	{
-            struct icaldurationtype dur = icaldurationtype_from_string(str);
-            
-            if (!icaldurationtype_is_bad_duration(dur)) {    /* failed to parse */
-                value = icalvalue_new_duration(dur);
-            }
-            
-	    break;
-	}
-        
-    case ICAL_PERIOD_VALUE:
-	{
-            struct icalperiodtype p;
-            p = icalperiodtype_from_string(str);  
-            
-            if(!icalperiodtype_is_null_period(p)){
-                value = icalvalue_new_period(p);
-            }
-            break; 
-	}
-	
-    case ICAL_TRIGGER_VALUE:
-	{
-	    struct icaltriggertype tr = icaltriggertype_from_string(str);
-            if (!icaltriggertype_is_bad_trigger(tr)) {
-                value = icalvalue_new_trigger(tr);
-            }
-	    break;
-	}
-        
-    case ICAL_REQUESTSTATUS_VALUE:
-        {
-            struct icalreqstattype rst = icalreqstattype_from_string(str);
-            if(rst.code != ICAL_UNKNOWN_STATUS){
-                value = icalvalue_new_requeststatus(rst);
-            }
-            break;
-
-        }
-
-    case ICAL_X_VALUE:
-        {
-            char* dequoted_str = icalmemory_strdup_and_dequote(str);
-            value = icalvalue_new_x(dequoted_str);
-            free(dequoted_str);
-        }
-        break;
-
-    default:
-        {
-            if (error != 0 ){
-		char temp[TMP_BUF_SIZE];
-                
-                snprintf(temp,TMP_BUF_SIZE,"Unknown type for \'%s\'",str);
-			    
-		*error = icalproperty_vanew_xlicerror( 
-		    temp, 
-		    icalparameter_new_xlicerrortype( 
-			ICAL_XLICERRORTYPE_VALUEPARSEERROR), 
-		    0); 
-	    }
-
-	    icalerror_warn("icalvalue_new_from_string got an unknown value type");
-            value=0;
-	}
-    }
-
-
-    if (error != 0 && *error == 0 && value == 0){
-	char temp[TMP_BUF_SIZE];
-	
-        snprintf(temp,TMP_BUF_SIZE,"Failed to parse value: \'%s\'",str);
-	
-	*error = icalproperty_vanew_xlicerror( 
-	    temp, 
-	    icalparameter_new_xlicerrortype( 
-		ICAL_XLICERRORTYPE_VALUEPARSEERROR), 
-	    0); 
-    }
-
-
-    return value;
-
-}
-
-icalvalue* icalvalue_new_from_string(icalvalue_kind kind,const char* str)
-{
-    return icalvalue_new_from_string_with_error(kind,str,(icalproperty**)0);
-}
-
-
-
-void
-icalvalue_free (icalvalue* v)
-{
-    icalerror_check_arg_rv((v != 0),"value");
-
-#ifdef ICAL_FREE_ON_LIST_IS_ERROR
-    icalerror_assert( (v->parent ==0),"This value is still attached to a property");
-    
-#else
-    if(v->parent !=0){
-	return;
-    }
-#endif
-
-    if(v->x_value != 0){
-        free(v->x_value);
-    }
-
-    switch (v->kind){
-	case ICAL_BINARY_VALUE: 
-	case ICAL_ATTACH_VALUE: {
-	    if (v->data.v_attach) {
-		icalattach_unref (v->data.v_attach);
-		v->data.v_attach = NULL;
-	    }
-
-	    break;
-	}
-	case ICAL_TEXT_VALUE:
-	case ICAL_CALADDRESS_VALUE:
-	case ICAL_URI_VALUE:
-	case ICAL_QUERY_VALUE:
-	{
-	    if (v->data.v_string != 0) { 
-		free((void*)v->data.v_string);
-		v->data.v_string = 0;
-	    }
-	    break;
-	}
-	case ICAL_RECUR_VALUE:
-	{
-	    if(v->data.v_recur != 0){
-		free((void*)v->data.v_recur);
-		v->data.v_recur = 0;
-	    }
-	    break;
-	}
-
-	default:
-	{
-	    /* Nothing to do */
-	}
-    }
-
-    v->kind = ICAL_NO_VALUE;
-    v->size = 0;
-    v->parent = 0;
-    memset(&(v->data),0,sizeof(v->data));
-    v->id[0] = 'X';
-    free(v);
-}
-
-int
-icalvalue_is_valid (const icalvalue* value)
-{
-    if(value == 0){
-	return 0;
-    }
-    
-    return 1;
-}
-
-static char* icalvalue_binary_as_ical_string(const icalvalue* value) {
-
-    const char* data;
-    char* str;
-    icalerror_check_arg_rz( (value!=0),"value");
-
-    data = icalvalue_get_binary(value);
-
-    str = (char*)icalmemory_tmp_buffer(60);
-    sprintf(str,"icalvalue_binary_as_ical_string is not implemented yet");
-
-    return str;
-}
-
-
-#define MAX_INT_DIGITS 12 /* Enough for 2^32 + sign*/ 
-    
-static char* icalvalue_int_as_ical_string(const icalvalue* value) {
-    int data;
-    char* str = (char*)icalmemory_tmp_buffer(MAX_INT_DIGITS); 
-
-    icalerror_check_arg_rz( (value!=0),"value");
-
-    data = icalvalue_get_integer(value);
-	
-    snprintf(str,MAX_INT_DIGITS,"%d",data);
-
-    return str;
-}
-
-static char* icalvalue_utcoffset_as_ical_string(const icalvalue* value)
-{    
-    int data,h,m,s;
-    char sign;
-    char* str = (char*)icalmemory_tmp_buffer(9);
-
-    icalerror_check_arg_rz( (value!=0),"value");
-
-    data = icalvalue_get_utcoffset(value);
-
-    if (abs(data) == data){
-	sign = '+';
-    } else {
-	sign = '-';
-    }
-
-    h = data/3600;
-    m = (data - (h*3600))/ 60;
-    s = (data - (h*3600) - (m*60));
-
-    if (s > 0)
-	sprintf(str,"%c%02d%02d%02d",sign,abs(h),abs(m),abs(s));
-    else
-	sprintf(str,"%c%02d%02d",sign,abs(h),abs(m));
-
-    return str;
-}
-
-static char* icalvalue_string_as_ical_string(const icalvalue* value) {
-
-    const char* data;
-    char* str = 0;
-    icalerror_check_arg_rz( (value!=0),"value");
-    data = value->data.v_string;
-
-    str = (char*)icalmemory_tmp_buffer(strlen(data)+1);   
-
-    strcpy(str,data);
-
-    return str;
-}
-
-
-static char* icalvalue_recur_as_ical_string(const icalvalue* value) 
-{
-    struct icalrecurrencetype *recur = value->data.v_recur;
-
-    return icalrecurrencetype_as_string(recur);
-}
-
- /* @todo This is not RFC2445 compliant.
- * The RFC only allows:
- * TSAFE-CHAR = %x20-21 / %x23-2B / %x2D-39 / %x3C-5B / %x5D-7E / NON-US-ASCII
- * As such, \t\r\b\f are not allowed, not even escaped
- */
-
-static char* icalvalue_text_as_ical_string(const icalvalue* value) {
-    char *str;
-    char *str_p;
-    char *rtrn;
-    const char *p;
-    size_t buf_sz;
-
-    buf_sz = strlen(value->data.v_string)+1;
-
-    str_p = str = (char*)icalmemory_new_buffer(buf_sz);
-
-    if (str_p == 0){
-      return 0;
-    }
-
-    for(p=value->data.v_string; *p!=0; p++){
-
-	switch(*p){
-	    case '\n': {
-		icalmemory_append_string(&str,&str_p,&buf_sz,"\\n");
-		break;
-	    }
-
-	    case '\t': {
-		icalmemory_append_string(&str,&str_p,&buf_sz,"\\t");
-		break;
-	    }
-	    case '\r': {
-		icalmemory_append_string(&str,&str_p,&buf_sz,"\\r");
-		break;
-	    }
-	    case '\b': {
-		icalmemory_append_string(&str,&str_p,&buf_sz,"\\b");
-		break;
-	    }
-	    case '\f': {
-		icalmemory_append_string(&str,&str_p,&buf_sz,"\\f");
-		break;
-	    }
-
-	    case ';':
-	    case ',':
-	    case '"':
-	    case '\\':{
-		icalmemory_append_char(&str,&str_p,&buf_sz,'\\');
-		icalmemory_append_char(&str,&str_p,&buf_sz,*p);
-		break;
-	    }
-
-	    default: {
-		icalmemory_append_char(&str,&str_p,&buf_sz,*p);
-	    }
-	}
-    }
-
-    /* Assume the last character is not a '\0' and add one. We could
-       check *str_p != 0, but that would be an uninitialized memory
-       read. */
-
-
-    icalmemory_append_char(&str,&str_p,&buf_sz,'\0');
-
-    rtrn = icalmemory_tmp_copy(str);
-
-    icalmemory_free_buffer(str);
-
-    return rtrn;
-}
-
-
-static char* 
-icalvalue_attach_as_ical_string(const icalvalue* value) 
-{
-    icalattach *a;
-    char * str;
-
-    icalerror_check_arg_rz( (value!=0),"value");
-
-    a = icalvalue_get_attach(value);
-
-    if (icalattach_get_is_url (a)) {
-	const char *url;
-
-	url = icalattach_get_url (a);
-	str = icalmemory_tmp_buffer (strlen (url) + 1);
-	strcpy (str, url);
-	return str;
-    } else
-	return icalvalue_binary_as_ical_string (value);
-}
-
-
-static char* icalvalue_duration_as_ical_string(const icalvalue* value) {
-
-    struct icaldurationtype data;
-
-    icalerror_check_arg_rz( (value!=0),"value");
-    data = icalvalue_get_duration(value);
-
-    return icaldurationtype_as_ical_string(data);
-}
-
-void print_time_to_string(char* str, const struct icaltimetype *data)
-{
-    char temp[20];
-
-    if (icaltime_is_utc(*data)){
-	sprintf(temp,"%02d%02d%02dZ",data->hour,data->minute,data->second);
-    } else {
-	sprintf(temp,"%02d%02d%02d",data->hour,data->minute,data->second);
-    }   
-
-    strcat(str,temp);
-}
-
- 
-void print_date_to_string(char* str,  const struct icaltimetype *data)
-{
-    char temp[20];
-
-    sprintf(temp,"%04d%02d%02d",data->year,data->month,data->day);
-
-    strcat(str,temp);
-}
-
-static char* icalvalue_date_as_ical_string(const icalvalue* value) {
-
-    struct icaltimetype data;
-    char* str;
-    icalerror_check_arg_rz( (value!=0),"value");
-    data = icalvalue_get_date(value);
-
-    str = (char*)icalmemory_tmp_buffer(9);
- 
-    str[0] = 0;
-    print_date_to_string(str,&data);
-   
-    return str;
-}
-
-void print_datetime_to_string(char* str,  const struct icaltimetype *data)
-{
-    print_date_to_string(str,data);
-    strcat(str,"T");
-    print_time_to_string(str,data);
-}
-
-static const char* icalvalue_datetime_as_ical_string(const icalvalue* value) {
-    
-    struct icaltimetype data;
-    char* str;
-    icalvalue_kind kind = icalvalue_isa(value);    
-
-    icalerror_check_arg_rz( (value!=0),"value");
-
-
-    if( !(kind == ICAL_DATE_VALUE || kind == ICAL_DATETIME_VALUE ))
-	{
-	    icalerror_set_errno(ICAL_BADARG_ERROR);
-	    return 0;
-	}
-
-    data = icalvalue_get_datetime(value);
-
-    str = (char*)icalmemory_tmp_buffer(20);
- 
-    str[0] = 0;
-
-    print_datetime_to_string(str,&data);
-   
-    return str;
-
-}
-
-static char* icalvalue_float_as_ical_string(const icalvalue* value) {
-
-    float data;
-    char* str;
-    icalerror_check_arg_rz( (value!=0),"value");
-    data = icalvalue_get_float(value);
-
-    str = (char*)icalmemory_tmp_buffer(15);
-
-    sprintf(str,"%f",data);
-
-    return str;
-}
-
-static char* icalvalue_geo_as_ical_string(const icalvalue* value) {
-
-    struct icalgeotype data;
-    char* str;
-    icalerror_check_arg_rz( (value!=0),"value");
-
-    data = icalvalue_get_geo(value);
-
-    str = (char*)icalmemory_tmp_buffer(25);
-
-    sprintf(str,"%f;%f",data.lat,data.lon);
-
-    return str;
-}
-
-static const char* icalvalue_datetimeperiod_as_ical_string(const icalvalue* value) {
-    struct icaldatetimeperiodtype dtp = icalvalue_get_datetimeperiod(value);
-
-    icalerror_check_arg_rz( (value!=0),"value");
-
-    if(!icaltime_is_null_time(dtp.time)){
-	return icaltime_as_ical_string(dtp.time);
-    } else {
-	return icalperiodtype_as_ical_string(dtp.period);
-    }
-}
-
-static const char* icalvalue_period_as_ical_string(const icalvalue* value) {
-    struct icalperiodtype data;
-    icalerror_check_arg_rz( (value!=0),"value");
-    data = icalvalue_get_period(value);
-
-    return icalperiodtype_as_ical_string(data);
-
-}
-
-static const char* icalvalue_trigger_as_ical_string(const icalvalue* value) {
-
-    struct icaltriggertype data;
-
-    icalerror_check_arg_rz( (value!=0),"value");
-    data = icalvalue_get_trigger(value);
-
-    if(!icaltime_is_null_time(data.time)){
-	return icaltime_as_ical_string(data.time);
-    } else {
-	return icaldurationtype_as_ical_string(data.duration);
-    }   
-
-}
-
-const char*
-icalvalue_as_ical_string(const icalvalue* value)
-{
-    if(value == 0){
-	return 0;
-    }
-
-    switch (value->kind){
-
-    case ICAL_ATTACH_VALUE:
-        return icalvalue_attach_as_ical_string(value);
-        
-    case ICAL_BINARY_VALUE:
-        return icalvalue_binary_as_ical_string(value);
-        
-    case ICAL_BOOLEAN_VALUE:
-    case ICAL_INTEGER_VALUE:
-        return icalvalue_int_as_ical_string(value);                  
-        
-    case ICAL_UTCOFFSET_VALUE:
-        return icalvalue_utcoffset_as_ical_string(value);                  
-        
-    case ICAL_TEXT_VALUE:
-        return icalvalue_text_as_ical_string(value);
-        
-    case ICAL_QUERY_VALUE:
-        return icalvalue_string_as_ical_string(value);
-        
-    case ICAL_STRING_VALUE:
-    case ICAL_URI_VALUE:
-    case ICAL_CALADDRESS_VALUE:
-        return icalvalue_string_as_ical_string(value);
-        
-    case ICAL_DATE_VALUE:
-        return icalvalue_date_as_ical_string(value);
-    case ICAL_DATETIME_VALUE:
-        return icalvalue_datetime_as_ical_string(value);
-    case ICAL_DURATION_VALUE:
-        return icalvalue_duration_as_ical_string(value);
-        
-    case ICAL_PERIOD_VALUE:
-        return icalvalue_period_as_ical_string(value);
-    case ICAL_DATETIMEPERIOD_VALUE:
-        return icalvalue_datetimeperiod_as_ical_string(value);
-        
-    case ICAL_FLOAT_VALUE:
-        return icalvalue_float_as_ical_string(value);
-        
-    case ICAL_GEO_VALUE:
-        return icalvalue_geo_as_ical_string(value);
-        
-    case ICAL_RECUR_VALUE:
-        return icalvalue_recur_as_ical_string(value);
-        
-    case ICAL_TRIGGER_VALUE:
-        return icalvalue_trigger_as_ical_string(value);
-
-    case ICAL_REQUESTSTATUS_VALUE:
-        return icalreqstattype_as_string(value->data.v_requeststatus);
-        
-    case ICAL_ACTION_VALUE:
-    case ICAL_CMD_VALUE:
-    case ICAL_QUERYLEVEL_VALUE:
-    case ICAL_CARLEVEL_VALUE:
-    case ICAL_METHOD_VALUE:
-    case ICAL_STATUS_VALUE:
-    case ICAL_TRANSP_VALUE:
-    case ICAL_CLASS_VALUE:
-        if(value->x_value !=0){
-            return icalmemory_tmp_copy(value->x_value);
-        }
-
-        return icalproperty_enum_to_string(value->data.v_enum);
-        
-    case ICAL_X_VALUE: 
-	if (value->x_value != 0)
-            return icalmemory_tmp_copy(value->x_value);
-
-    /* FALLTHRU */
-
-    case ICAL_NO_VALUE:
-    default:
-	{
-	    return 0;
-	}
-    }
-}
-
-
-icalvalue_kind
-icalvalue_isa (const icalvalue* value)
-{
-    if(value == 0){
-	return ICAL_NO_VALUE;
-    }
-
-    return value->kind;
-}
-
-
-int
-icalvalue_isa_value (void* value)
-{
-    struct icalvalue_impl *impl = (struct icalvalue_impl *)value;
-
-    icalerror_check_arg_rz( (value!=0), "value");
-
-    if (strcmp(impl->id,"val") == 0) {
-	return 1;
-    } else {
-	return 0;
-    }
-}
-
-
-static int icalvalue_is_time(const icalvalue* a) {
-    icalvalue_kind kind = icalvalue_isa(a);
-
-    if(kind == ICAL_DATETIME_VALUE ||
-       kind == ICAL_DATE_VALUE ){
-	return 1;
-    }
-
-    return 0;
-
-}
-
-/*
- * In case of error, this function returns 0. This is partly bogus, as 0 is
- * not part of the returned enum.
- * FIXME We should probably add an error value to the enum.
- */
-icalparameter_xliccomparetype
-icalvalue_compare(const icalvalue* a, const icalvalue *b)
-{
-
-    icalerror_check_arg_rz( (a!=0), "a");
-    icalerror_check_arg_rz( (b!=0), "b");
-
-    /* Not the same type; they can only be unequal */
-    if( ! (icalvalue_is_time(a) && icalvalue_is_time(b)) &&
-	icalvalue_isa(a) != icalvalue_isa(b)){
-	return ICAL_XLICCOMPARETYPE_NOTEQUAL;
-    }
-
-    switch (icalvalue_isa(a)){
-
-	case ICAL_ATTACH_VALUE:
-	{
-	    if (icalattach_get_is_url(a->data.v_attach) &&
-	        icalattach_get_is_url(b->data.v_attach)) {
-		if (strcasecmp(icalattach_get_url(a->data.v_attach),
-			       icalattach_get_url(b->data.v_attach)) == 0)
-		    return ICAL_XLICCOMPARETYPE_EQUAL;
-		else
-		    return ICAL_XLICCOMPARETYPE_NOTEQUAL;
-	    }
-	    else {
-	        if (a->data.v_attach == b->data.v_attach)
-		    return ICAL_XLICCOMPARETYPE_EQUAL;
-	        else
-		    return ICAL_XLICCOMPARETYPE_NOTEQUAL;
-	    }
-	}
-        case ICAL_BINARY_VALUE:
-	{
-	    if (a->data.v_attach == b->data.v_attach)
-		return ICAL_XLICCOMPARETYPE_EQUAL;
-	    else
-		return ICAL_XLICCOMPARETYPE_NOTEQUAL;
-	}
-
-	case ICAL_BOOLEAN_VALUE:
-	{
-	    if (icalvalue_get_boolean(a) == icalvalue_get_boolean(b)){
-		return ICAL_XLICCOMPARETYPE_EQUAL;
-	    } else {
-		return ICAL_XLICCOMPARETYPE_NOTEQUAL;
-	    }
-	}
-
-	case ICAL_FLOAT_VALUE:
-	{
-	    if (a->data.v_float > b->data.v_float){
-		return ICAL_XLICCOMPARETYPE_GREATER;
-	    } else if (a->data.v_float < b->data.v_float){
-		return ICAL_XLICCOMPARETYPE_LESS;
-	    } else {
-		return ICAL_XLICCOMPARETYPE_EQUAL;
-	    }
-	}
-
-	case ICAL_INTEGER_VALUE:
-	case ICAL_UTCOFFSET_VALUE:
-	{
-	    if (a->data.v_int > b->data.v_int){
-		return ICAL_XLICCOMPARETYPE_GREATER;
-	    } else if (a->data.v_int < b->data.v_int){
-		return ICAL_XLICCOMPARETYPE_LESS;
-	    } else {
-		return ICAL_XLICCOMPARETYPE_EQUAL;
-	    }
-	}
-
-	case ICAL_DURATION_VALUE: 
-	{
-	    int dur_a = icaldurationtype_as_int(a->data.v_duration);
-	    int dur_b = icaldurationtype_as_int(b->data.v_duration);
-
-	    if (dur_a > dur_b){
-		return ICAL_XLICCOMPARETYPE_GREATER;
-	    } else if (dur_a < dur_b){
-		return ICAL_XLICCOMPARETYPE_LESS;
-	    } else {
-		return ICAL_XLICCOMPARETYPE_EQUAL;
-	    }
-	}	    
-
-
-	case ICAL_TEXT_VALUE:
-	case ICAL_URI_VALUE:
-	case ICAL_CALADDRESS_VALUE:
-	case ICAL_TRIGGER_VALUE:
-	case ICAL_DATE_VALUE:
-	case ICAL_DATETIME_VALUE:
-	case ICAL_DATETIMEPERIOD_VALUE:
-	case ICAL_QUERY_VALUE:
-	case ICAL_RECUR_VALUE:
-	{
-	    int r;
-
-	    r =  strcmp(icalvalue_as_ical_string(a),
-			  icalvalue_as_ical_string(b));
-
-	    if (r > 0) { 	
-		return ICAL_XLICCOMPARETYPE_GREATER;
-	    } else if (r < 0){
-		return ICAL_XLICCOMPARETYPE_LESS;
-	    } else {
-		return ICAL_XLICCOMPARETYPE_EQUAL;
-	    }
-
-		
-	}
-
-	case ICAL_METHOD_VALUE:
-	{
-	    if (icalvalue_get_method(a) == icalvalue_get_method(b)){
-		return ICAL_XLICCOMPARETYPE_EQUAL;
-	    } else {
-		return ICAL_XLICCOMPARETYPE_NOTEQUAL;
-	    }
-
-	}
-
-	case ICAL_STATUS_VALUE:
-	{
-	    if (icalvalue_get_status(a) == icalvalue_get_status(b)){
-		return ICAL_XLICCOMPARETYPE_EQUAL;
-	    } else {
-		return ICAL_XLICCOMPARETYPE_NOTEQUAL;
-	    }
-
-	}
-
-	case ICAL_TRANSP_VALUE:
-	{
-	    if (icalvalue_get_transp(a) == icalvalue_get_transp(b)){
-		return ICAL_XLICCOMPARETYPE_EQUAL;
-	    } else {
-		return ICAL_XLICCOMPARETYPE_NOTEQUAL;
-	    }
-	}
-
-	case ICAL_ACTION_VALUE:
-        {
-	    if (icalvalue_get_action(a) == icalvalue_get_action(b)){
-		return ICAL_XLICCOMPARETYPE_EQUAL;
-	    } else {
-		return ICAL_XLICCOMPARETYPE_NOTEQUAL;
-	    }
-        }
-
-	case ICAL_PERIOD_VALUE:
-	case ICAL_GEO_VALUE:
-	case ICAL_NO_VALUE:
-	default:
-	{
-	    icalerror_warn("Comparison not implemented for value type");
-	    return 0;
-	}
-    }   
-
-}
-
-/** Examine the value and possibly change the kind to agree with the
- *  value 
- */
-
-void icalvalue_reset_kind(icalvalue* value)
-{
-    if( (value->kind==ICAL_DATETIME_VALUE || value->kind==ICAL_DATE_VALUE )&&
-        !icaltime_is_null_time(value->data.v_time) ) {
-        
-        if(icaltime_is_date(value->data.v_time)){
-            value->kind = ICAL_DATE_VALUE;
-        } else {
-            value->kind = ICAL_DATETIME_VALUE;
-        }
-    }
-       
-}
-
-void icalvalue_set_parent(icalvalue* value,
-			     icalproperty* property)
-{
-    value->parent = property;
-}
-
-icalproperty* icalvalue_get_parent(icalvalue* value)
-{
-    return value->parent;
-}
-
-
-int icalvalue_encode_ical_string(const char *szText, char *szEncText, int nMaxBufferLen)
-{
-    char   *ptr;
-    icalvalue *value = 0;
-
-    if ((szText == 0) || (szEncText == 0))
-        return 0;
-   
-    value = icalvalue_new_from_string(ICAL_STRING_VALUE, szText);
-    
-    if (value == 0)
-        return 0;
-    
-    ptr = icalvalue_text_as_ical_string(value);
-    if (ptr == 0)
-        return 0;
-    
-    if ((int)strlen(ptr) >= nMaxBufferLen)
-        {
-            icalvalue_free (value);
-            return 0;
-        }
-
-    strcpy(szEncText, ptr);
-
-    icalvalue_free ((icalvalue*)value);
-
-    return 1;
-}
-
-/* The remaining interfaces are 'new', 'set' and 'get' for each of the value
-   types */
diff --git a/libical/src/libical/icalvalue.h b/libical/src/libical/icalvalue.h
deleted file mode 100644
index 851e7234bc..0000000000
--- a/libical/src/libical/icalvalue.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
-  FILE: icalvalue.h
-  CREATOR: eric 20 March 1999
-
-
-  $Id$
-  $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalvalue.h
-
-  ======================================================================*/
-
-#ifndef ICALVALUE_H
-#define ICALVALUE_H
-
-#include <time.h>
-#include "icalenums.h"
-#include "icaltypes.h"
-#include "icalrecur.h"
-#include "icalduration.h"
-#include "icalperiod.h"
-#include "icalderivedproperty.h" /* For icalproperty_method, etc. */
-#include "icalderivedparameter.h"
-#include "icalderivedvalue.h"
-                          
-/* Defined in icalderivedvalue.h */
-/*typedef struct icalvalue_impl icalvalue;*/
-
-icalvalue* icalvalue_new(icalvalue_kind kind);
-
-icalvalue* icalvalue_new_clone(const icalvalue* value);
-
-icalvalue* icalvalue_new_from_string(icalvalue_kind kind, const char* str);
-
-void icalvalue_free(icalvalue* value);
-
-int icalvalue_is_valid(const icalvalue* value);
-
-const char* icalvalue_as_ical_string(const icalvalue* value);
-
-icalvalue_kind icalvalue_isa(const icalvalue* value);
-
-int icalvalue_isa_value(void*);
-
-icalparameter_xliccomparetype icalvalue_compare(const icalvalue* a, const icalvalue *b);
-
-
-/* Special, non autogenerated value accessors */
-
-icalvalue* icalvalue_new_recur (struct icalrecurrencetype v);
-void icalvalue_set_recur(icalvalue* value, struct icalrecurrencetype v);
-struct icalrecurrencetype icalvalue_get_recur(const icalvalue* value);
-
-icalvalue* icalvalue_new_trigger (struct icaltriggertype v);
-void icalvalue_set_trigger(icalvalue* value, struct icaltriggertype v);
-struct icaltriggertype icalvalue_get_trigger(const icalvalue* value);
-
-icalvalue* icalvalue_new_datetimeperiod (struct icaldatetimeperiodtype v);
-void icalvalue_set_datetimeperiod(icalvalue* value, 
-				  struct icaldatetimeperiodtype v);
-struct icaldatetimeperiodtype icalvalue_get_datetimeperiod(const icalvalue* value);
-
-/* Convert enumerations */
-
-icalvalue_kind icalvalue_string_to_kind(const char* str);
-const char* icalvalue_kind_to_string(const icalvalue_kind kind);
-
-/** Check validity of a specific icalvalue_kind **/
-int icalvalue_kind_is_valid(const icalvalue_kind kind);
-
-/** Encode a character string in ical format, esacpe certain characters, etc. */
-int icalvalue_encode_ical_string(const char *szText, char *szEncText, int MaxBufferLen);
-
-#endif /*ICALVALUE_H*/
diff --git a/libical/src/libical/icalvalue_cxx.cpp b/libical/src/libical/icalvalue_cxx.cpp
deleted file mode 100644
index a1db030c33..0000000000
--- a/libical/src/libical/icalvalue_cxx.cpp
+++ /dev/null
@@ -1,262 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalvalue_cxx.cpp
- CREATOR: fnguyen 12/21/01
- (C) COPYRIGHT 2001, Critical Path
-======================================================================*/
-
-#ifndef ICALVALUE_CXX_H
-#include "icalvalue_cxx.h"
-#endif
-
-typedef	char* string; // Will use the string library from STL
-
-ICalValue::ICalValue() throw(icalerrorenum) : imp(icalvalue_new(ICAL_ANY_VALUE)){}
-
-ICalValue::ICalValue(const ICalValue& v) throw (icalerrorenum) {
-	imp = icalvalue_new_clone(v.imp);
-	if (!imp) throw icalerrno;
-}
-ICalValue& ICalValue::operator=(const ICalValue& v) throw(icalerrorenum) {
-	if (this == &v) return *this;
-
-	if (imp != NULL)
-	{
-		icalvalue_free(imp);
-		imp = icalvalue_new_clone(v.imp);
-		if (!imp) throw icalerrno;
-	}
-
-	return *this;
-}
-
-ICalValue::~ICalValue(){
-	if (imp != NULL) icalvalue_free(imp);
-}
-
-ICalValue::ICalValue(icalvalue* v) throw(icalerrorenum) : imp(v){
-}
-
-ICalValue::ICalValue(icalvalue_kind kind) throw(icalerrorenum) {
-	imp = icalvalue_new(kind);
-	if (!imp) throw icalerrno;
-}
-
-ICalValue::ICalValue(icalvalue_kind kind, string  str) throw(icalerrorenum) {
-	imp = icalvalue_new_from_string(kind, str);
-	if (!imp) throw icalerrno;
-}
-
-string ICalValue::as_ical_string(){
-	return (string)icalvalue_as_ical_string(imp);
-}
-bool ICalValue::is_valid(){
-	if (imp == NULL) return false;
-	return (icalvalue_is_valid(imp) ? true : false);
-}
-icalvalue_kind ICalValue::isa(){
-	return icalvalue_isa(imp);
-}
-int ICalValue::isa_value(void* value){
-	return icalvalue_isa_value(value);
-}
-
-/* Special, non autogenerated value accessors */
-void ICalValue::set_recur(struct icalrecurrencetype v){
-	icalvalue_set_recur(imp, v);
-}
-struct icalrecurrencetype ICalValue::get_recur(){
-	return icalvalue_get_recur(imp);
-}
-
-void ICalValue::set_trigger(struct icaltriggertype v){}
-struct icaltriggertype ICalValue::get_trigger(){
-	return icalvalue_get_trigger(imp);
-}
-
-void ICalValue::set_datetimeperiod(struct icaldatetimeperiodtype v){
-	icalvalue_set_datetimeperiod(imp, v);
-}
-struct icaldatetimeperiodtype ICalValue::get_datetimeperiod(){
-	return icalvalue_get_datetimeperiod(imp);
-}
-
-icalparameter_xliccomparetype ICalValue::compare(ICalValue& a, ICalValue& b){
-	return icalvalue_compare(a, b);
-}
-
-/* Convert enumerations */
-icalvalue_kind ICalValue::string_to_kind(string  str){
-	return icalvalue_string_to_kind(str);
-}
-string ICalValue::kind_to_string(icalvalue_kind kind){
-	return (string)icalvalue_kind_to_string(kind);
-}
-
-/* BOOLEAN */ 
-int ICalValue::get_boolean(){
-	return icalvalue_get_boolean(imp);
-} 
-void ICalValue::set_boolean(int v){
-	icalvalue_set_boolean(imp, v);
-}
-
-/* UTC-OFFSET */ 
-int ICalValue::get_utcoffset(){
-	return icalvalue_get_utcoffset(imp);
-} 
-void ICalValue::set_utcoffset(int v){
-	icalvalue_set_utcoffset(imp, v);
-}
-
-/* METHOD */ 
-enum icalproperty_method ICalValue::get_method(){
-	return icalvalue_get_method(imp);
-} 
-void ICalValue::set_method(enum icalproperty_method v){
-	icalvalue_set_method(imp, v);
-}
-
-/* CAL-ADDRESS */ 
-string ICalValue::get_caladdress(){
-	return (string)icalvalue_get_caladdress(imp);
-} 
-void ICalValue::set_caladdress(string  v){
-	icalvalue_set_caladdress(imp, v);
-}
-
-/* PERIOD */ 
-struct icalperiodtype ICalValue::get_period(){
-	return icalvalue_get_period(imp);
-} 
-void ICalValue::set_period(struct icalperiodtype v){
-	icalvalue_set_period(imp, v);
-}
-
-/* STATUS */ 
-enum icalproperty_status ICalValue::get_status(){
-	return icalvalue_get_status(imp);
-} 
-void ICalValue::set_status(enum icalproperty_status v){
-	icalvalue_set_status(imp, v);
-}
-
-/* BINARY */ 
-string ICalValue::get_binary(){
-	return (string)icalvalue_get_binary(imp);
-} 
-void ICalValue::set_binary(string  v){
-	icalvalue_set_binary(imp, v);
-}
-
-/* TEXT */ 
-string ICalValue::get_text(){
-	return (string)icalvalue_get_text(imp);
-} 
-void ICalValue::set_text(string  v){
-	icalvalue_set_text(imp, v);
-}
-
-/* DURATION */ 
-struct icaldurationtype ICalValue::get_duration(){
-	return icalvalue_get_duration(imp);
-} 
-void ICalValue::set_duration(struct icaldurationtype v){
-	icalvalue_set_duration(imp, v);
-}
-
-/* INTEGER */ 
-int ICalValue::get_integer(){
-	return icalvalue_get_integer(imp);
-} 
-void ICalValue::set_integer(int v){
-	icalvalue_set_integer(imp, v);
-}
-
-/* URI */ 
-string ICalValue::get_uri(){
-	return (string)icalvalue_get_uri(imp);
-} 
-void ICalValue::set_uri(string  v){
-	icalvalue_set_uri(imp, v);
-}
-
-/* ATTACH */ 
-icalattach *ICalValue::get_attach(){
-	return icalvalue_get_attach(imp);
-} 
-void ICalValue::set_attach(icalattach *v){
-	icalvalue_set_attach(imp, v);
-}
-
-/* CLASS */ 
-enum icalproperty_class ICalValue::get_class(){
-	return icalvalue_get_class(imp);
-} 
-void ICalValue::set_class(enum icalproperty_class v){
-	icalvalue_set_class(imp, v);
-}
-
-/* FLOAT */ 
-float ICalValue::get_float(){
-	return icalvalue_get_float(imp);
-} 
-void ICalValue::set_float(float v){
-	icalvalue_set_float(imp, v);
-}
-
-/* QUERY */ 
-string ICalValue::get_query(){
-	return (string)icalvalue_get_query(imp);
-} 
-void ICalValue::set_query(string  v){
-	icalvalue_set_query(imp, v);
-}
-
-/* STRING */ 
-string ICalValue::get_string(){
-	return (string)icalvalue_get_string(imp);
-} 
-void ICalValue::set_string(string v){
-	icalvalue_set_string(imp, v);
-}
-
-/* TRANSP */ 
-enum icalproperty_transp ICalValue::get_transp(){
-	return icalvalue_get_transp(imp);
-} 
-void ICalValue::set_transp(enum icalproperty_transp v){
-	icalvalue_set_transp(imp, v);
-}
-
-/* DATE-TIME */ 
-struct icaltimetype ICalValue::get_datetime(){
-	return icalvalue_get_datetime(imp);
-} 
-void ICalValue::set_datetime(struct icaltimetype v){
-	icalvalue_set_datetime(imp, v);
-}
-
-/* GEO */ 
-struct icalgeotype ICalValue::get_geo(){
-	return icalvalue_get_geo(imp);
-} 
-void ICalValue::set_geo(struct icalgeotype v){
-	icalvalue_set_geo(imp, v);
-}
-
-/* DATE */ 
-struct icaltimetype ICalValue::get_date(){
-	return icalvalue_get_date(imp);
-} 
-void ICalValue::set_date(struct icaltimetype v){
-	icalvalue_set_date(imp, v);
-}
-
-/* ACTION */ 
-enum icalproperty_action ICalValue::get_action(){
-	return icalvalue_get_action(imp);
-} 
-void ICalValue::set_action(enum icalproperty_action v){
-	icalvalue_set_action(imp, v);
-}
diff --git a/libical/src/libical/icalvalue_cxx.h b/libical/src/libical/icalvalue_cxx.h
deleted file mode 100644
index 0023e84764..0000000000
--- a/libical/src/libical/icalvalue_cxx.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalvalue_cxx.h
- CREATOR: fnguyen 12/13/01
- (C) COPYRIGHT 2001, Critical Path
-======================================================================*/
-
-#ifndef CP_ICALVALUE_H
-#define CP_ICALVALUE_H
-
-extern "C" {
-#include "ical.h"
-};
-                          
-#include "icptrholder.h"
-                          
-typedef	char* string; // Will use the string library from STL
-
-class ICalValue {
-public:
-	ICalValue()                                  throw(icalerrorenum);
-	ICalValue(const ICalValue&)                  throw(icalerrorenum);
-	ICalValue& operator=(const ICalValue&)       throw(icalerrorenum);
-	~ICalValue();
-
-	ICalValue(icalvalue*)                        throw(icalerrorenum);
-	ICalValue(icalvalue_kind kind)               throw(icalerrorenum);
-	ICalValue(icalvalue_kind kind, string  str)  throw(icalerrorenum);
-
-	operator icalvalue* () { return imp; }
-
-	void detach() {
-	    imp = NULL;
-	}
-
-public:
-	string as_ical_string();
-	bool is_valid();
-	icalvalue_kind isa();
-	int isa_value(void*);
-
-	/* Special, non autogenerated value accessors */
-	void set_recur(struct icalrecurrencetype v);
-	struct icalrecurrencetype get_recur();
-
-	void set_trigger(struct icaltriggertype v);
-	struct icaltriggertype get_trigger();
-
-	void set_datetimeperiod(struct icaldatetimeperiodtype v);
-	struct icaldatetimeperiodtype get_datetimeperiod();
-
-public:
-	static icalparameter_xliccomparetype compare(ICalValue& a, ICalValue& b);
-
-	/* Convert enumerations */
-	static icalvalue_kind string_to_kind(string  str);
-	string kind_to_string(icalvalue_kind kind);
-
-public:
-	/* BOOLEAN */ 
-	int get_boolean(); 
-	void set_boolean(int v);
-
-	/* UTC-OFFSET */ 
-	int get_utcoffset(); 
-	void set_utcoffset(int v);
-
-	/* METHOD */ 
-	enum icalproperty_method get_method(); 
-	void set_method(enum icalproperty_method v);
-
-	/* CAL-ADDRESS */ 
-	string get_caladdress(); 
-	void set_caladdress(string  v);
-
-	/* PERIOD */ 
-	struct icalperiodtype get_period(); 
-	void set_period(struct icalperiodtype v);
-
-	/* STATUS */ 
-	enum icalproperty_status get_status(); 
-	void set_status(enum icalproperty_status v);
-
-	/* BINARY */ 
-	string get_binary(); 
-	void set_binary(string  v);
-
-	/* TEXT */ 
-	string get_text(); 
-	void set_text(string  v);
-
-	/* DURATION */ 
-	struct icaldurationtype get_duration(); 
-	void set_duration(struct icaldurationtype v);
-
-	/* INTEGER */ 
-	int get_integer(); 
-	void set_integer(int v);
-
-	/* URI */ 
-	string get_uri(); 
-	void set_uri(string  v);
-
-	/* ATTACH */ 
-	icalattach *get_attach(); 
-	void set_attach(icalattach *v);
-
-	/* CLASS */ 
-	enum icalproperty_class get_class(); 
-	void set_class(enum icalproperty_class v);
-
-	/* FLOAT */ 
-	float get_float(); 
-	void set_float(float v);
-
-	/* QUERY */ 
-	string get_query(); 
-	void set_query(string  v);
-
-	/* STRING */ 
-	string get_string(); 
-	void set_string(string  v);
-
-	/* TRANSP */ 
-	enum icalproperty_transp get_transp(); 
-	void set_transp(enum icalproperty_transp v);
-
-	/* DATE-TIME */ 
-	struct icaltimetype get_datetime(); 
-	void set_datetime(struct icaltimetype v);
-
-	/* GEO */ 
-	struct icalgeotype get_geo(); 
-	void set_geo(struct icalgeotype v);
-
-	/* DATE */ 
-	struct icaltimetype get_date(); 
-	void set_date(struct icaltimetype v);
-
-	/* ACTION */ 
-	enum icalproperty_action get_action(); 
-	void set_action(enum icalproperty_action v);
-
-private:
-	icalvalue* imp;
-};
-
-
-typedef ICPointerHolder<ICalValue> ICalValueTmpPtr;    /* see icptrholder.h for comments */
-
-#endif /*ICALVALUE_H*/
diff --git a/libical/src/libical/icalvalueimpl.h b/libical/src/libical/icalvalueimpl.h
deleted file mode 100644
index d1ba7863ef..0000000000
--- a/libical/src/libical/icalvalueimpl.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
-  FILE: icalvalue.c
-  CREATOR: eric 02 May 1999
-  
-  $Id$
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalvalue.c
-
-  Contributions from:
-     Graham Davison (g.m.davison@computer.org)
-
-
-======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifndef ICALVALUEIMPL_H
-#define ICALVALUEIMPL_H
-
-#include "icalenums.h"
-#include "icalproperty.h"
-#include "icalderivedvalue.h"
-
-
-struct icalvalue_impl {
-    icalvalue_kind kind; /*this is the kind that is visible from the outside*/
-
-    char id[5];
-    int size;
-    icalproperty* parent;
-    char* x_value;
-
-    union data {
-	icalattach *v_attach;		
-	/* void *v_binary; */ /* use v_attach */
-	const char *v_string;
-	/*char *v_text;*/
-	/*char *v_caladdress;*/
-	/*char *v_uri;*/
-	float v_float;
-	int v_int;
-	/*int v_boolean;*/
-	/*int v_integer;*/
-	struct icaldurationtype v_duration;
-	/*int v_utcoffset;*/
-	
-	struct icalperiodtype v_period;
-	/*struct icalperiodtype v_datetimeperiod;*/
-	struct icalgeotype v_geo;
-	/*time_t v_time;*/
-	struct icaltimetype v_time;
-	/*struct icaltimetype v_date;*/
-	/*struct icaltimetype v_datetime;*/
-	/*struct icaltimetype v_datetimedate;*/
-	
-        struct icalreqstattype v_requeststatus;
-
-	/* struct icalrecurrencetype was once included
-	   directly ( not referenced ) in this union, but it
-	   contributes 2000 bytes to every value, so now it is
-	   a reference*/
-	
-	struct icalrecurrencetype *v_recur;
-	struct icaltriggertype v_trigger;
-
-        int v_enum;
-        /* v_enum takes care of several enumerated types including: 
-	icalproperty_method v_method;
-	icalproperty_status v_status;
-        icalproperty_action v_action;
-        icalproperty_class v_class;
-	icalproperty_transp v_transp;
-        */
-
-    } data;
-};
-
-#endif
diff --git a/libical/src/libical/icalversion.h.in b/libical/src/libical/icalversion.h.in
deleted file mode 100644
index 5d213693e5..0000000000
--- a/libical/src/libical/icalversion.h.in
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef ICAL_VERSION_H
-#define ICAL_VERSION_H
-
-#define ICAL_PACKAGE "@PACKAGE@"
-#define ICAL_VERSION "@VERSION@"
-
-#endif
diff --git a/libical/src/libical/icalyacc.y b/libical/src/libical/icalyacc.y
deleted file mode 100644
index 65f0041ec4..0000000000
--- a/libical/src/libical/icalyacc.y
+++ /dev/null
@@ -1,417 +0,0 @@
-%{
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalitip.y
-  CREATOR: eric 10 June 1999
-  
-  DESCRIPTION:
-  
-  $Id: icalyacc.y,v 1.16 2003/10/21 18:28:27 ettore Exp $
-  $Locker:  $
-
-  (C) COPYRIGHT 1999 Eric Busboom 
-  http://www.softwarestudio.org
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
- 
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and
-  limitations under the License.
-
-  The original author is Eric Busboom
-  The original code is icalitip.y
-
-
-
-  =======================================================================*/
-
-#include <stdlib.h>
-#include <string.h> /* for strdup() */
-#include "icalparser.h"
-#include "pvl.h"
-
-icalvalue *icalparser_yy_value; /* Current Value */
-
-void ical_yyerror(char* s);
-void icalparser_clear_flex_input();  
-int ical_yy_lex(void);
-
-/* Globals for UTCOFFSET values */
-int utc; 
-int utc_b; 
-int utcsign;
-
-/* Globals for DURATION values */
-struct icaldurationtype duration;
-
-/* Globals for TRIGGER values */
-struct icaltriggertype trigger;
-
-void copy_list(short* array, size_t size);
-void add_prop(icalproperty_kind);
-void icalparser_fill_date(struct tm* t, char* dstr);
-void icalparser_fill_time(struct tm* t, char* tstr);
-void set_value_type(icalvalue_kind kind);
-void set_parser_value_state();
-struct icaltimetype fill_datetime(char* d, char* t);
-void ical_yy_error(char *s); /* Don't know why I need this.... */
-int yylex(void); /* Or this. */
-
-
-
-/* Set the state of the lexer so it will interpret values ( iCAL
-   VALUEs, that is, ) correctly. */
-
-%}
-
-%union {
-	float v_float;
-	int   v_int;
-	char* v_string;
-}
-
-
-  /* Renaming hack */
-
-/*
-#define    yymaxdepth ical_yy_maxdepth
-#define    yyparse ical_yy_parse
-#define    yyerror ical_yy_error
-#define    yylval  ical_yy_lval
-#define    yychar  ical_yy_char
-#define    yydebug ical_yy_debug
-#define    yypact  ical_yy_pact
-#define    yyr1    ical_yy_r1
-#define    yyr2    ical_yy_r2
-#define    yydef   ical_yy_def
-#define    yychk   ical_yy_chk
-#define    yypgo   ical_yy_pgo
-#define    yyact   ical_yy_act
-#define    yyexca  ical_yy_exca
-#define yyerrflag ical_yy_errflag
-#define yynerrs    ical_yy_nerrs
-#define    yyps    ical_yy_ps
-#define    yypv    ical_yy_pv
-#define    yys     ical_yy_s
-#define    yy_yys  ical_yy_yys
-#define    yystate ical_yy_state
-#define    yytmp   ical_yy_tmp
-#define    yyv     ical_yy_v
-#define    yy_yyv  ical_yy_yyv
-#define    yyval   ical_yy_val
-#define    yylloc  ical_yy_lloc
-#define yyreds     ical_yy_reds
-#define yytoks     ical_yy_toks
-#define yylhs      ical_yy_yylhs
-#define yylen      ical_yy_yylen
-#define yydefred ical_yy_yydefred
-#define yydgoto    ical_yy_yydgoto
-#define yydefred ical_yy_yydefred
-#define yydgoto    ical_yy_yydgoto
-#define yysindex ical_yy_yysindex
-#define yyrindex ical_yy_yyrindex
-#define yygindex ical_yy_yygindex
-#define yytable     ical_yy_yytable
-#define yycheck     ical_yy_yycheck
-#define yyname   ical_yy_yyname
-#define yyrule   ical_yy_yyrule
-#define yy_scan_bytes ical_yy_scan_bytes
-#define yy_scan_string ical_yy_scan_string
-#define yy_scan_buffer ical_yy_scan_buffer
-*/
-
-/* These are redefined with the -P option to flex */
-/*
-#define yy_create_buffer  ical_yy_create_buffer 
-#define yy_delete_buffer ical_yy_delete_buffer
-#define yy_flex_debug ical_yy_flex_debug
-#define yy_init_buffer ical_yy_init_buffer
-#define yy_flush_buffer ical_yy_flush_buffer
-#define yy_load_buffer_state ical_yy_load_buffer_state
-#define yy_switch_to_buffer ical_yy_switch_to_buffer
-#define yyin ical_yyin
-#define yyleng ical_yyleng
-#define yylex ical_yylex
-#define yylineno ical_yylineno
-#define yyout ical_yyout
-#define yyrestart ical_yyrestart
-#define yytext ical_yytext
-#define yywrap ical_yywrap             
-*/
-
-
-%token <v_string> DIGITS
-%token <v_int> INTNUMBER
-%token <v_float> FLOATNUMBER
-%token <v_string> STRING   
-%token EOL EQUALS CHARACTER COLON COMMA SEMICOLON MINUS TIMESEPERATOR 
-
-%token TRUE FALSE
-
-%token FREQ BYDAY BYHOUR BYMINUTE BYMONTH BYMONTHDAY BYSECOND BYSETPOS BYWEEKNO
-%token BYYEARDAY DAILY MINUTELY MONTHLY SECONDLY WEEKLY HOURLY YEARLY
-%token INTERVAL COUNT UNTIL WKST MO SA SU TU WE TH FR 
-
-%token BIT8 ACCEPTED ADD AUDIO BASE64 BINARY BOOLEAN BUSY BUSYTENTATIVE
-%token BUSYUNAVAILABLE CALADDRESS CANCEL CANCELLED CHAIR CHILD COMPLETED
-%token CONFIDENTIAL CONFIRMED COUNTER DATE DATETIME DECLINECOUNTER DECLINED
-%token DELEGATED DISPLAY DRAFT DURATION EMAIL END FINAL FLOAT FREE GREGORIAN
-%token GROUP INDIVIDUAL INPROCESS INTEGER NEEDSACTION NONPARTICIPANT
-%token OPAQUE OPTPARTICIPANT PARENT PERIOD PRIVATE PROCEDURE PUBLIC PUBLISH
-%token RECUR REFRESH REPLY REQPARTICIPANT REQUEST RESOURCE ROOM SIBLING
-%token START TENTATIVE TEXT THISANDFUTURE THISANDPRIOR TIME TRANSPAENT
-%token UNKNOWN UTCOFFSET XNAME
-
-%token ALTREP CN CUTYPE DAYLIGHT DIR ENCODING EVENT FBTYPE FMTTYPE LANGUAGE 
-%token MEMBER PARTSTAT RANGE RELATED RELTYPE ROLE RSVP SENTBY STANDARD URI
-
-%token TIME_CHAR UTC_CHAR
-
-
-%%
-
-value:
-	date_value
-	| datetime_value
-	| duration_value
-	| period_value
-        | utcoffset_value
-        | error { 
-                  icalparser_yy_value = 0;
-		  icalparser_clear_flex_input();
-                  yyclearin;
-                  }
-;
-
-
-date_value: DIGITS
-        {
-	    struct icaltimetype stm;
-
-	    stm = fill_datetime($1,0);
-
-	    stm.hour = -1;
-	    stm.minute = -1;
-	    stm.second = -1;
-	    stm.is_utc = 0;
-	    stm.is_date = 1;
-
-	    icalparser_yy_value = icalvalue_new_date(stm);
-	}
-;
-
-utc_char: 
-	/*empty*/  {utc = 0;}
-	| UTC_CHAR {utc = 1;}
-;
-
-/* This is used in the period_value, where there may be two utc characters per rule. */
-utc_char_b: 
-	/*empty*/  {utc_b = 0;}
-	| UTC_CHAR {utc_b = 1;}
-;
-
-datetime_value: 
-	DIGITS TIME_CHAR DIGITS utc_char
-        {
-	    struct  icaltimetype stm;
-	    stm = fill_datetime($1, $3);
-	    stm.is_utc = utc;
-	    stm.is_date = 0;
-
-	    icalparser_yy_value = 
-		icalvalue_new_datetime(stm);
-	}
-;
-
-
-/* Duration */
-
-
-dur_date: dur_day
-	| dur_day dur_time
-;
-
-dur_week: DIGITS 'W'
-	{
-	    duration.weeks = atoi($1);
-	}
-;
-
-dur_time: TIME_CHAR dur_hour 
-	{
-	}
-	| TIME_CHAR dur_minute
-	{
-	}
-	| TIME_CHAR dur_second
-	{
-	}
-;
-
-dur_hour: DIGITS 'H'
-	{
-	    duration.hours = atoi($1);
-	}
-	| DIGITS 'H' dur_minute
-	{
-	    duration.hours = atoi($1);
-	}
-;
-
-dur_minute: DIGITS 'M'
-	{
-	    duration.minutes = atoi($1);
-	}
-	| DIGITS 'M' dur_second
-	{
-	    duration.minutes = atoi($1);
-	}
-;
-
-dur_second: DIGITS 'S'
-	{
-	    duration.seconds = atoi($1);
-	}
-;
-
-dur_day: DIGITS 'D'
-	{
-	    duration.days = atoi($1);
-	}
-;
-
-dur_prefix: /* empty */
-	{
-	    duration.is_neg = 0;
-	} 
-	| '+'
-	{
-	    duration.is_neg = 0;
-	}
-	| '-'
-	{ 
-	    duration.is_neg = 1;
-	}
-;
-
-duration_value: dur_prefix 'P' dur_date
-	{ 
-	    icalparser_yy_value = icalvalue_new_duration(duration); 
-	    memset(&duration,0, sizeof(duration));
-	}
-	| dur_prefix 'P' dur_time
-	{ 
-	    icalparser_yy_value = icalvalue_new_duration(duration); 
-	    memset(&duration,0, sizeof(duration));
-	}
-	| dur_prefix 'P' dur_week
-	{ 
-	    icalparser_yy_value = icalvalue_new_duration(duration); 
-	    memset(&duration,0, sizeof(duration));
-	}
-;
-
-
-/* Period */
-
-period_value:  DIGITS TIME_CHAR DIGITS utc_char '/'  DIGITS TIME_CHAR DIGITS utc_char_b
-	{
-            struct icalperiodtype p;
-        
-	    p.start = fill_datetime($1,$3);
-	    p.start.is_utc = utc;
-	    p.start.is_date = 0;
-
-
-	    p.end = fill_datetime($6,$8);
-	    p.end.is_utc = utc_b;
-	    p.end.is_date = 0;
-		
-	    p.duration.days = -1;
-	    p.duration.weeks = -1;
-	    p.duration.hours = -1;
-	    p.duration.minutes = -1;
-	    p.duration.seconds = -1;
-
-	    icalparser_yy_value = icalvalue_new_period(p);
-	}
-	| DIGITS TIME_CHAR DIGITS utc_char '/'  duration_value
-	{
-            struct icalperiodtype p;
-	    
-	    p.start = fill_datetime($1,$3);
-	    p.start.is_utc = utc;
-	    p.start.is_date = 0;
-
-	    p.end.year = -1;
-	    p.end.month = -1;
-	    p.end.day = -1;
-	    p.end.hour = -1;
-	    p.end.minute = -1;
-	    p.end.second = -1;
-		   
-	    /* The duration_value rule setes the global 'duration'
-               variable, but it also creates a new value in
-               icalparser_yy_value. So, free that, then copy
-               'duration' into the icalperiodtype struct. */
-
-	    p.duration = icalvalue_get_duration(icalparser_yy_value);
-	    icalvalue_free(icalparser_yy_value);
-	    icalparser_yy_value = 0;
-
-	    icalparser_yy_value = icalvalue_new_period(p);
-
-	}
-;
-
-
-/* UTC Offset */
-
-plusminus: '+' { utcsign = 1; }
-	| '-' { utcsign = -1; }
-;
-
-utcoffset_value: 
-	plusminus INTNUMBER INTNUMBER
-	{
-	    icalparser_yy_value = icalvalue_new_utcoffset( utcsign * (($2*3600) + ($3*60)) );
-  	}
-
-	| plusminus INTNUMBER INTNUMBER INTNUMBER
-	{
-	    icalparser_yy_value = icalvalue_new_utcoffset(utcsign * (($2*3600) + ($3*60) +($4)));
-  	}
-;
-
-%%
-
-struct icaltimetype fill_datetime(char* datestr, char* timestr)
-{
-	    struct icaltimetype stm;
-
-	    memset(&stm,0,sizeof(stm));
-
-	    if (datestr != 0){
-		sscanf(datestr,"%4d%2d%2d",&(stm.year), &(stm.month), 
-		       &(stm.day));
-	    }
-
-	    if (timestr != 0){
-		sscanf(timestr,"%2d%2d%2d", &(stm.hour), &(stm.minute), 
-		       &(stm.second));
-	    }
-
-	    return stm;
-
-}
-
-void ical_yyerror(char* s)
-{
-    /*fprintf(stderr,"Parse error \'%s\'\n", s);*/
-}
-
diff --git a/libical/src/libical/icptrholder.h b/libical/src/libical/icptrholder.h
deleted file mode 100644
index 4161604951..0000000000
--- a/libical/src/libical/icptrholder.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- Mode: C++ -*- */
-
-/**
- * @file    icptrholder.h
- * @author  wyau (08/29/02)
- * @brief   C++ template classes for managing C++ pointers returned by VComponent::get_..._component, 
- *          VComponent::get_..._property, ICalPropety::get_..._value.
- * @remarks VComponent::get... functions returns a C++ oject that wraps the libical implementation.
- *          It is important to note that the wrapped implementation still belongs to the orginal
- *          component. To stop memory leak, caller must delete the pointer. However, the destructor
- *          will call the appropriate free function. eg. ~VComponent calls icalcomponent_free(imp).
- *          As stated previously, imp stil belongs to the original component. To avoid freeing the
- *          wrapped "imp", caller must set the "imp" to null before deleting the pointer.
- *
- *          The template class relieves the burden of memory management when used as a stack based
- *          object. The class holds a pointer to the C++ Wrapper. The destructor set the imp to
- *          null before deleting the pointer.
- *
- *          Each C++ Wrapper instantiates a template class in it's corresponding .h file.
- *
- *          Usage example:
- *             VComponentTmpPtr p;   // VComponentTmpPtr is an instantiation of this template
- *             for (p=component.get_first_component; p!= NULL; p=component.get_next_component) {
- *
- * (C) COPYRIGHT 2001, Critical Path
- */
-
-#ifndef __ICPTRHOLDER_H__
-#define __ICPTRHOLDER_H__
-
-template<class T> class ICPointerHolder {
-public:
-    ICPointerHolder() { ptr = NULL; }
-    ICPointerHolder(T* p) { ptr = p; }
-
-    // copy constructor to support assignment
-    ICPointerHolder(const ICPointerHolder& ip) {
-        ptr = ip.ptr;
-
-        // We need to transfer ownership of ptr to this object by setting
-        // ip's ptr to null. Otherwise, ptr will de deleted twice.
-        // const ugliness requires us to do the const_cast.
-        ICPointerHolder *ipp = const_cast<ICPointerHolder*>(&ip);
-        ipp->ptr = NULL;
-    };
-
-   ~ICPointerHolder() {
-        release();
-    }
-
-    ICPointerHolder& operator=(T* p) {
-        this->release();
-        ptr = p;
-        return *this;
-    }
-
-    ICPointerHolder& operator=(ICPointerHolder& p) {
-        this->release();
-        ptr = p.ptr;            // this transfer ownership of the pointer
-        p.ptr = NULL;           // set it to null so the pointer won't get delete twice.
-        return *this;
-    }
-
-    int operator!=(T* p) {return (ptr != p);}
-    int operator==(T* p) {return (ptr == p);}
-
-    operator T*() const {
-        return ptr;
-    }
-
-    T* operator->() const {
-        assert(ptr);
-        return ptr;
-    }
-
-    T& operator*() {
-        assert(ptr);
-        return *ptr;
-    }
-
-private:
-    void  release() {
-        if (ptr != NULL) {
-            ptr->detach();
-            delete ptr;
-            ptr = NULL;
-        }
-    }
-
-    T*    ptr;
-};
-
-#endif
diff --git a/libical/src/libical/pvl.c b/libical/src/libical/pvl.c
deleted file mode 100644
index 9c271ce953..0000000000
--- a/libical/src/libical/pvl.c
+++ /dev/null
@@ -1,584 +0,0 @@
-/*======================================================================
- FILE: pvl.c
- CREATOR: eric November, 1995
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "pvl.h"
-#include <errno.h>
-#include <assert.h>
-#include <stdlib.h>
-
-/**
-  struct pvl_list_t
-
-  The list structure. This is the hanlde for the entire list 
-
-  This type is also private. Use pvl_list instead 
-
-  */
-
-typedef struct pvl_list_t
-{
-	int MAGIC;		        /**< Magic Identifier */
-	struct pvl_elem_t *head;	/**< Head of list */
-	struct pvl_elem_t *tail;	/**< Tail of list */
-	int count;			/**< Number of items in the list */
-	struct pvl_elem_t *p;		/**< Pointer used for iterators */
-} pvl_list_t;
-
-
-
-
-/**
- * This global is incremented for each call to pvl_new_element(); it gives each
- * list a unique identifer 
- */
-
-int pvl_elem_count = 0;
-int pvl_list_count = 0;
-
-
-/**
- * @brief Creates a new list, clears the pointers and assigns a magic number
- * 
- * @return  Pointer to the new list, 0 if there is no available memory. 
- */
-
-pvl_list 
-pvl_newlist()
-{
-    struct pvl_list_t *L;
-
-    if ( ( L = (struct pvl_list_t*)malloc(sizeof(struct pvl_list_t))) == 0)
-    {
-	errno = ENOMEM;
-	return 0;
-    }
-
-    L->MAGIC = pvl_list_count;
-    pvl_list_count++;
-    L->head = 0;
-    L->tail = 0;
-    L->count = 0;
-    L->p = 0;
-
-    return L;
-}
-
-void
-pvl_free(pvl_list l)
-{
-   struct pvl_list_t *L = (struct pvl_list_t *)l;
-
-   pvl_clear(l);
-
-   free(L);
-}
-
-/**
- * @brief Creates a new list element, assigns a magic number, and assigns 
- * the next and previous pointers. 
- * 
- * Passing in the next and previous points may seem odd, but it allos the user
- * to set them while keeping the internal data hidden. In nearly all cases, 
- * the user is the pvl library itself. 
- *
- * @param d	The data item to be stored in the list
- * @param next  Pointer value to assign to the member "next"
- * @param prior Pointer value to assign to the member "prior"
- *
- * @return A pointer to the new element, 0 if there is no memory available. 
- */
-
-pvl_elem 
-pvl_new_element(void *d, pvl_elem next, pvl_elem prior)
-{
-    struct pvl_elem_t *E;
-
-    if ( ( E = (struct pvl_elem_t*)malloc(sizeof(struct pvl_elem_t))) == 0)
-    {
-	errno = ENOMEM;
-	return 0;
-    }
-
-    E->MAGIC = pvl_elem_count++;
-    E->d = d;
-    E->next = next;
-    E->prior = prior;
-
-    return (pvl_elem)E;
-}
-
-/**
- * @brief Add a new element to the from of the list
- *
- * @param L	The list to add the item to 
- * @param d	Pointer to the item to add
- */
-
-void 
-pvl_unshift(pvl_list L,void *d)
-{
-    struct pvl_elem_t *E = pvl_new_element(d,L->head,0);
-
-    if (E->next != 0)
-    {
-	/* Link the head node to it */
-	E->next->prior = E;
-    }
-
-    /* move the head */
-    L->head = E;
-
-    /* maybe move the tail */
-  
-    if (L->tail == 0)
-    {
-	L->tail = E;
-    }
-
-    L->count++;
-}
-
-/**
- * @brief Remove an element from the front of the list 
- *
- * @param L	The list to operate on
- *
- * @return the entry on the front of the list 
- */
-
-void* 
-pvl_shift(pvl_list L)
-{
-    if (L->head == 0)
-    {
-	return 0;
-    }
-
-    return pvl_remove(L,(void*)L->head);
-
-}
-
-/**
- * @brief Add a new item to the tail of the list
- *
- * @param L	The list to operate on
- * @param d	Pointer to the item to add
- *
- */
-
-void 
-pvl_push(pvl_list L,void *d)
-{
-    struct pvl_elem_t *E = pvl_new_element(d,0,L->tail);
-
-    /* These are done in pvl_new_element
-       E->next = 0;
-       E->prior = L->tail;
-    */
-
-    if (L->tail != 0) 
-    {
-	L->tail->next = E;
-    }
-
-    if (L->head == 0) 
-    {
-	L->head = E;
-    }
-  
-    L->tail = E;
-
-    L->count++;
-
-}
-
-/**
- * @brief Remove an element from the tail of the list 
- *
- * @param L	The list to operate on
- */
-
-void* 
-pvl_pop(pvl_list L)
-{
-    if ( L->tail == 0)
-    {
-	return 0;
-    }
-
-    return pvl_remove(L,(void*) L->tail);;
-
-}
-
-
-/**
- * Add a new item to a list that is ordered by a comparison function. 
- * This routine assumes that the list is properly ordered. 
- *
- * @param L	The list to operate on
- * @param f	Pointer to a comparison function
- * @param d     Pointer to data to pass to the comparison function
- */
-
-void 
-pvl_insert_ordered(pvl_list L,pvl_comparef f,void *d)
-{
-    struct pvl_elem_t *P;
-
-    L->count++;
-
-    /* Empty list, add to head */
-
-    if(L->head == 0)
-    {
-	pvl_unshift(L,d);
-	return;
-    }
-
-    /* smaller than head, add to head */
-
-    if ( ((*f)(d,L->head->d)) <= 0)
-    { 
-	pvl_unshift(L,d);
-	return;
-    }
-
-    /* larger than tail, add to tail */
-    if ( (*f)(d,L->tail->d) >= 0)
-    { 
-	pvl_push(L,d);
-	return;
-    }
-
-
-    /* Search for the first element that is smaller, and add before it */
-    
-    for (P=L->head; P != 0; P = P->next)
-    {
-	if ( (*f)(P->d,d) >= 0)
-	{
-	    pvl_insert_before(L,P,d);
-	    return;
-	}
-    }
-
-    /* badness, choke */
-#ifndef lint
-    assert(0);
-#endif
-}
-
-/**
- * @brief Add a new item after the referenced element. 
- * @param L	The list to operate on 
- * @param P	The list element to add the item after
- * @param d	Pointer to the item to add. 
- */
-
-void 
-pvl_insert_after(pvl_list L,pvl_elem P,void *d)
-{
-    struct pvl_elem_t *E = 0;
-
-    L->count++;
-
-    if (P == 0)
-    {
-	pvl_unshift(L,d);
-	return;
-    }
-
-    if ( P == L->tail)
-    {
-	E = pvl_new_element(d,0,P);
-	L->tail = E;
-	E->prior->next = E;
-    }
-    else
-    {
-	E = pvl_new_element(d,P->next,P);
-	E->next->prior  = E;
-	E->prior->next = E;
-    }
-}
-
-/**
- * @brief Add an item after a referenced item
- *
- * @param L	The list to operate on
- * @param P	The list element to add the item before
- * @param d	Pointer to the data to be added. 
- */
-
-void 
-pvl_insert_before(pvl_list L,pvl_elem P,void *d)
-{
-    struct pvl_elem_t *E = 0;
-
-    L->count++;
-
-    if (P == 0)
-    {
-	pvl_unshift(L,d);
-	return;
-    }
-
-    if ( P == L->head)
-    {
-	E = pvl_new_element(d,P,0);
-	E->next->prior = E;
-	L->head = E;
-    }
-    else
-    {
-	E = pvl_new_element(d,P,P->prior);
-	E->prior->next = E;
-	E->next->prior = E;
-    }
-}
-
-/**
- * @brief Remove the referenced item from the list.
- *
- * This routine will free the element, but not the data item that the
- * element contains. 
- *
- * @param L	The list to operate on
- * @param E	The element to remove. 
- */
-
-void* 
-pvl_remove(pvl_list L,pvl_elem E)
-{
-    void* data;
-
-    if (E == L->head)
-    {
-	if (E->next != 0)
-	{
-	    E->next->prior = 0;
-	    L->head = E->next;
-	} else {
-	    /* E Also points to tail -> only one element in list */
-	    L->tail = 0;
-	    L->head = 0;
-	}
-    }
-    else if (E == L->tail)
-    {
-	if (E->prior != 0)
-	{
-	    E->prior->next = 0;
-	    L->tail = E->prior;
-	} else {
-	    /* E points to the head, so it was the last element */
-	    /* This case should be taken care of in the previous clause */
-	    L->head = 0;
-	    L->tail = 0;
-	}
-    }
-    else
-    {
-	E->prior->next = E->next;
-	E->next->prior = E->prior;
-    }
-
-
-    L->count--;
-
-    data = E->d; 
-
-    E->prior = 0;
-    E->next = 0;
-    E->d = 0;
-
-    free(E);
-
-    return data;
-
-}
-
-/**
- * @brief Return a pointer to data that satisfies a function.
- *
- * This routine will interate through the entire list and call the
- * find function for each item. It will break and return a pointer to the
- * data that causes the find function to return 1.
- *
- * @param l	The list to operate on
- * @param f	Pointer to the find function
- * @param v	Pointer to constant data to pass into the function
- * 
- * @return Pointer to the element that the find function found. 
- */
-
-pvl_elem
-pvl_find(pvl_list l,pvl_findf f,void* v)
-{
-    pvl_elem e;
-    
-    for (e=pvl_head(l); e!= 0; e = pvl_next(e))
-    {
-	if ( (*f)(((struct pvl_elem_t *)e)->d,v) == 1)
-	{
-	    /* Save this elem for a call to find_next */
-	    ((struct pvl_list_t *)l)->p = e;
-	    return e;
-	}
-    }
-    
-    return 0;
-
-}
-
-/**
- * @brief Like pvl_find(), but continues the search where the last find() or
- * find_next() left off.
- *
- * @param l	The list to operate on
- * @param f	Pointer to the find function
- * @param v	Pointer to constant data to pass into the function
- * 
- * @return Pointer to the element that the find function found. 
- */
-
-pvl_elem
-pvl_find_next(pvl_list l,pvl_findf f,void* v)
-{
-    
-    pvl_elem e;
-    
-    for (e=pvl_head(l); e!= 0; e = pvl_next(e))
-    {
-	if ( (*f)(((struct pvl_elem_t *)e)->d,v) == 1)
-	{
-	    /* Save this elem for a call to find_next */
-	    ((struct pvl_list_t *)l)->p = e;
-	    return e;
-	}
-    }
-
-    return 0;
-
-}
-
-/**
- * @brief Remove the all the elements in the list. The does not free
- * the data items the elements hold.
- */
-
-void 
-pvl_clear(pvl_list l)
-{
-    pvl_elem e = pvl_head(l);
-    pvl_elem next;
-
-    if (e == 0) {
-	return;
-    }
-
-    while(e != 0)
-    {
-	next = pvl_next(e);
-	pvl_remove(l,e);
-	e = next;
-    }
-}
-
-
-/**
- * @brief Returns the number of items in the list. 
- */
-
-int 
-pvl_count(pvl_list L)
-{
-    return L->count;
-}
-
-
-/**
- * @brief Returns a pointer to the given element 
- */
-
-pvl_elem 
-pvl_next(pvl_elem E)
-{
-    if (E == 0){
-	return 0;
-    }
-
-    return (pvl_elem)E->next;
-}
-
-
-/**
- * @brief Returns a pointer to the element previous to the element given. 
- */
-
-pvl_elem 
-pvl_prior(pvl_elem E)
-{
-    return (pvl_elem)E->prior;
-}
-
-
-/**
- * @brief Returns a pointer to the first item in the list. 
- */
-
-pvl_elem 
-pvl_head(pvl_list L )
-{
-    return (pvl_elem)L->head;
-}
-
-/**
- * @brief Returns a pointer to the last item in the list. 
- */
-pvl_elem 
-pvl_tail(pvl_list L)
-{
-    return (pvl_elem)L->tail;
-}
-
-#ifndef PVL_USE_MACROS
-void* 
-pvl_data(pvl_elem E)
-{
-    if ( E == 0){
-	return 0;
-    }
-
-    return E->d;
-}
-#endif
-
-/**
- * @brief Call a function for every item in the list. 
- *
- * @param l	The list to operate on
- * @param f	Pointer to the function to call
- * @param v	Data to pass to the function on every iteration
- */
-
-void 
-pvl_apply(pvl_list l,pvl_applyf f, void *v)
-{
-    pvl_elem e;
-
-    for (e=pvl_head(l); e!= 0; e = pvl_next(e))
-    {
-	(*f)(((struct pvl_elem_t *)e)->d,v);
-    }
-
-}
diff --git a/libical/src/libical/pvl.h b/libical/src/libical/pvl.h
deleted file mode 100644
index 92ec546479..0000000000
--- a/libical/src/libical/pvl.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*======================================================================
- FILE: pvl.h
- CREATOR: eric November, 1995
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-======================================================================*/
-
-
-#ifndef __PVL_H__
-#define __PVL_H__
-
-typedef struct pvl_list_t* pvl_list;
-typedef struct pvl_elem_t* pvl_elem;
-
-/**
- * This type is private. Always use pvl_elem instead. The struct would
- * not even appear in this header except to make code in the USE_MACROS
- * blocks work
- */
-
-typedef struct pvl_elem_t
-{
-	int MAGIC;			/**< Magic Identifier */
-	void *d;			/**< Pointer to data user is storing */
-	struct pvl_elem_t *next;	/**< Next element */
-	struct pvl_elem_t *prior;	/**< Prior element */
-} pvl_elem_t;
-
-
-
-/**
- * This global is incremented for each call to pvl_new_element(); it gives each
- * list a unique identifer 
- */
-
-extern int  pvl_elem_count;
-extern int  pvl_list_count;
-
-/* Create new lists or elements */
-pvl_elem pvl_new_element(void* d, pvl_elem next,pvl_elem prior);
-pvl_list pvl_newlist(void);
-void pvl_free(pvl_list);
-
-/* Add, remove, or get the head of the list */
-void pvl_unshift(pvl_list l,void *d);
-void* pvl_shift(pvl_list l);
-pvl_elem pvl_head(pvl_list);
-
-/* Add, remove or get the tail of the list */
-void pvl_push(pvl_list l,void *d);
-void* pvl_pop(pvl_list l);
-pvl_elem pvl_tail(pvl_list);
-
-/* Insert elements in random places */
-typedef int (*pvl_comparef)(void* a, void* b); /* a, b are of the data type*/
-void pvl_insert_ordered(pvl_list l,pvl_comparef f,void *d);
-void pvl_insert_after(pvl_list l,pvl_elem e,void *d);
-void pvl_insert_before(pvl_list l,pvl_elem e,void *d);
-
-/* Remove an element, or clear the entire list */
-void* pvl_remove(pvl_list,pvl_elem); /* Remove element, return data */
-void pvl_clear(pvl_list); /* Remove all elements, de-allocate all data */
-
-int pvl_count(pvl_list);
-
-/* Navagate the list */
-pvl_elem pvl_next(pvl_elem e);
-pvl_elem pvl_prior(pvl_elem e);
-
-/* get the data in the list */
-#ifndef PVL_USE_MACROS
-void* pvl_data(pvl_elem);
-#else
-#define pvl_data(x) x==0 ? 0 : ((struct pvl_elem_t *)x)->d;
-#endif
-
-
-/* Find an element for which a function returns true */
-typedef int (*pvl_findf)(void* a, void* b); /*a is list elem, b is other data*/
-pvl_elem pvl_find(pvl_list l,pvl_findf f,void* v);
-pvl_elem pvl_find_next(pvl_list l,pvl_findf f,void* v);
-
-/**
- * Pass each element in the list to a function
- * a is list elem, b is other data
- */
-typedef void (*pvl_applyf)(void* a, void* b); 
-void pvl_apply(pvl_list l,pvl_applyf f, void *v);
-
-
-#endif /* __PVL_H__ */
-
-
-
-
-
diff --git a/libical/src/libical/sspm.c b/libical/src/libical/sspm.c
deleted file mode 100644
index c6647d37af..0000000000
--- a/libical/src/libical/sspm.c
+++ /dev/null
@@ -1,1619 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: sspm.c Parse Mime
-  CREATOR: eric 25 June 2000
-  
-  $Id$
-  $Locker$
-    
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The Initial Developer of the Original Code is Eric Busboom
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
- ======================================================================*/
-
-#include <stdio.h>
-#include <string.h>
-#include "sspm.h"
-#include <assert.h>
-#include <ctype.h> /* for tolower */
-#include <stdlib.h>   /* for malloc, free */
-#include <string.h> /* for strcasecmp */
-
-#ifdef DMALLOC
-#include "dmalloc.h"
-#endif
-
-#ifdef WIN32
-#define snprintf      _snprintf
-#define strcasecmp    stricmp
-#endif
-
-#define TMP_BUF_SIZE 1024
-
-
-enum mime_state {
-    UNKNOWN_STATE,
-    IN_HEADER,
-    END_OF_HEADER,
-    IN_BODY,
-    OPENING_PART,
-    END_OF_PART,
-    TERMINAL_END_OF_PART,
-    END_OF_INPUT
-};
-
-struct mime_impl{
-	struct sspm_part *parts; 
-	size_t max_parts;
-	int part_no;
-	int level;
-	struct sspm_action_map *actions;
-	char* (*get_string)(char *s, size_t size, void* data);
-	void* get_string_data;
-	char temp[TMP_BUF_SIZE];
-	enum mime_state state;
-};
-
-void sspm_free_header(struct sspm_header *header);
-void* sspm_make_multipart_part(struct mime_impl *impl,struct sspm_header *header);
-void sspm_read_header(struct mime_impl *impl,struct sspm_header *header);
-
-char* sspm_strdup(char* str){
-
-    char* s;
-
-    s = strdup(str);
-
-    return s;
-}
-
-
-static struct  major_content_type_map 
-{
-	enum sspm_major_type type;
-	char* str;
-	
-} major_content_type_map[]  = 
-{
-    {SSPM_MULTIPART_MAJOR_TYPE,"multipart" },
-    {SSPM_TEXT_MAJOR_TYPE,"text" },
-    {SSPM_TEXT_MAJOR_TYPE,"text" },
-    {SSPM_IMAGE_MAJOR_TYPE,"image" },
-    {SSPM_AUDIO_MAJOR_TYPE,"audio" },
-    {SSPM_VIDEO_MAJOR_TYPE,"video" },
-    {SSPM_APPLICATION_MAJOR_TYPE,"application" },
-    {SSPM_MULTIPART_MAJOR_TYPE,"multipart" },
-    {SSPM_MESSAGE_MAJOR_TYPE,"message" },
-    {SSPM_UNKNOWN_MAJOR_TYPE,"" },
-};
-
-static struct  minor_content_type_map 
-{
-	enum sspm_minor_type type;
-	char* str;
-
-} minor_content_type_map[]  = 
-{
-    {SSPM_ANY_MINOR_TYPE,"*" },
-    {SSPM_PLAIN_MINOR_TYPE,"plain" },
-    {SSPM_RFC822_MINOR_TYPE,"rfc822" },
-    {SSPM_DIGEST_MINOR_TYPE,"digest" },
-    {SSPM_CALENDAR_MINOR_TYPE,"calendar" },
-    {SSPM_MIXED_MINOR_TYPE,"mixed" },
-    {SSPM_RELATED_MINOR_TYPE,"related" },
-    {SSPM_ALTERNATIVE_MINOR_TYPE,"alternative" },
-    {SSPM_PARALLEL_MINOR_TYPE,  "parallel" },  
-    {SSPM_UNKNOWN_MINOR_TYPE,"" } 
-};
-
-
-
-struct encoding_map {
-	enum sspm_encoding encoding;
-	char* str;
-} sspm_encoding_map[] = 
-{
-    {SSPM_NO_ENCODING,""},
-    {SSPM_QUOTED_PRINTABLE_ENCODING,"quoted-printable"},
-    {SSPM_8BIT_ENCODING,"8bit"},
-    {SSPM_7BIT_ENCODING,"7bit"},
-    {SSPM_BINARY_ENCODING,"binary"},
-    {SSPM_BASE64_ENCODING,"base64"},
-    {SSPM_UNKNOWN_ENCODING,""}
-
-};
-
-
-char* sspm_get_parameter(char* line, char* parameter)
-{
-    char *p,*s,*q;
-    static char name[1024];
-    
-    /* Find where the parameter name is in the line */
-    p = strstr(line,parameter);
-
-    if( p == 0){
-	return 0;
-    }
-
-    /* skip over the parameter name, the '=' and any blank spaces */
-
-    p+=strlen(parameter);
-
-    while(*p==' ' || *p == '='){
-	p++;
-    }
-
-    /*now find the next semicolon*/
-
-    s = strchr(p,';');
-
-    /* Strip of leading quote */
-    q = strchr(p,'\"');
-
-    if(q !=0){
-	p = q+1;
-    }
-
-    if(s != 0){
-	strncpy(name,p,(size_t)s-(size_t)p);
-    } else {
-	strcpy(name,p);
-    }
-
-    /* Strip off trailing quote, if it exists */
-
-    q = strrchr(name,'\"');
-
-    if (q != 0){
-	*q='\0';
-    }
-    
-    return name;
-}
-
-char* sspm_property_name(char* line)
-{
-    static char name[1024];
-    char *c = strchr(line,':');
-
-    if(c != 0){
-	strncpy(name,line,(size_t)c-(size_t)line);
-	name[(size_t)c-(size_t)line] = '\0';
-	return name;
-    } else {
-	return 0;
-    }
-}
-
-char* sspm_value(char* line)
-{
-    static char value[1024];
-
-    char *c,*s, *p;
-
-    /* Find the first colon and the next semicolon */
-
-    c = strchr(line,':');
-    s = strchr(c,';');
-
-    /* Skip the colon */
-    c++;
-
-    if (s == 0){
-	s = c+strlen(line);
-    }
-
-    for(p=value; c != s; c++){
-	if(*c!=' ' && *c!='\n'){
-	    *(p++) = *c;
-	}
-    }
-
-    *p='\0';
-
-    return value;
-
-}
-
-static char *mime_headers[] = {
-    "Content-Type",
-    "Content-Transfer-Encoding",
-    "Content-Disposition",
-    "Content-Id",
-    "Mime-Version",
-    0 
-};
-
-
-void* sspm_default_new_part()
-{
-    return 0;
-}
-void sspm_default_add_line(void *part, struct sspm_header *header, 
-			   char* line, size_t size)
-{
-}
-
-void* sspm_default_end_part(void* part)
-{
-    return 0;
-}
-
-void sspm_default_free_part(void *part)
-{
-}
-
-
-
-struct sspm_action_map sspm_action_map[] = 
-{
-    {SSPM_UNKNOWN_MAJOR_TYPE,SSPM_UNKNOWN_MINOR_TYPE,sspm_default_new_part,sspm_default_add_line,sspm_default_end_part,sspm_default_free_part},
-};
-
-int sspm_is_mime_header(char *line)
-{
-    char *name = sspm_property_name(line);
-    int i;
-
-    if(name == 0){ 
-	return 0;
-    }
-
-    for(i = 0; mime_headers[i] != 0; i++){
-	if(strcasecmp(name, mime_headers[i]) == 0)
-	    return 1;
-    }
-    
-    return 0;
-}
-
-int sspm_is_mail_header(char* line)
-{
-    char *name = sspm_property_name(line);
-
-    if (name != 0){
-	return 1;
-    }
-
-    return 0;
-
-}
-
-int sspm_is_blank(char* line)
-{
-    char *p;
-    char c =0;
-
-    for(p=line; *p!=0; p++){
-	if( ! (*p == ' '|| *p == '\t' || *p=='\n') ){
-	    c++;
-	}
-    }
-
-    if (c==0){
-	return 1;
-    }
-
-    return 0;
-    
-}
-
-int sspm_is_continuation_line(char* line)
-{
-    if (line[0] == ' '|| line[0] == '\t' ) {
-	return 1;
-    }
-
-    return 0;
-}
-
-int sspm_is_mime_boundary(char *line)
-{
-    if( line[0] == '-' && line[1] == '-') {
-	return 1;
-    } 
-
-    return 0;
-}
-
-int sspm_is_mime_terminating_boundary(char *line)
-{
-
-
-    if (sspm_is_mime_boundary(line) &&
-	strstr(line,"--\n")){
-	return 1;
-    } 
-
-    return 0;
-}
-
-enum line_type {
-    EMPTY,
-    BLANK,
-    MIME_HEADER,
-    MAIL_HEADER,
-    HEADER_CONTINUATION,
-    BOUNDARY,
-    TERMINATING_BOUNDARY,
-    UNKNOWN_TYPE
-};
-
-
-static enum line_type get_line_type(char* line){
-
-    if (line == 0){
-	return EMPTY;
-    } else if(sspm_is_blank(line)){
-	return BLANK;
-    } else if (sspm_is_mime_header(line)){
-	return MIME_HEADER;
-    } else if (sspm_is_mail_header(line)){
-	return MAIL_HEADER;
-    } else if (sspm_is_continuation_line(line)){
-	return HEADER_CONTINUATION;
-    } else if (sspm_is_mime_terminating_boundary(line)){
-	return TERMINATING_BOUNDARY;
-    } else if (sspm_is_mime_boundary(line)) {
-	return BOUNDARY;
-    } else {
-	return UNKNOWN_TYPE;
-    }
-
-
-}
-
-
-static struct sspm_action_map get_action(struct mime_impl *impl,
-				  enum sspm_major_type major,
-				  enum sspm_minor_type minor)
-{
-    int i;
-
-    /* Read caller suppled action map */
-
-    if (impl->actions != 0){
-	for(i=0; impl->actions[i].major != SSPM_UNKNOWN_MAJOR_TYPE; i++){
-	    if((major == impl->actions[i].major &&
-	       minor == impl->actions[i].minor) ||
-	       (major == impl->actions[i].major &&
-		minor == SSPM_ANY_MINOR_TYPE)){
-		return impl->actions[i];
-	    }
-	}
-    }
-
-    /* Else, read default action map */
-
-    for(i=0; sspm_action_map[i].major != SSPM_UNKNOWN_MAJOR_TYPE; i++){
-	    if((major == sspm_action_map[i].major &&
-	       minor == sspm_action_map[i].minor) ||
-	       (major == sspm_action_map[i].major &&
-		minor == SSPM_ANY_MINOR_TYPE)){
-	    break;
-	}
-    }
-    
-    return sspm_action_map[i];
-}
-
-
-char* sspm_lowercase(char* str)
-{
-    char* p = 0;
-    char* new = sspm_strdup(str);
-
-    if(str ==0){
-	return 0;
-    }
-
-    for(p = new; *p!=0; p++){
-	*p = tolower(*p);
-    }
-
-    return new;
-}
-
-enum sspm_major_type sspm_find_major_content_type(char* type)
-{
-    int i;
-
-    char* ltype = sspm_lowercase(type);
-
-    for (i=0; major_content_type_map[i].type !=  SSPM_UNKNOWN_MINOR_TYPE; i++){
-	if(strncmp(ltype, major_content_type_map[i].str,
-		   strlen(major_content_type_map[i].str))==0){
-	    free(ltype);
-	    return major_content_type_map[i].type;
-	}
-    }
-    free(ltype);
-    return major_content_type_map[i].type; /* Should return SSPM_UNKNOWN_MINOR_TYPE */
-}
-
-enum sspm_minor_type sspm_find_minor_content_type(char* type)
-{
-    int i;
-    char* ltype = sspm_lowercase(type);
-
-    char *p = strchr(ltype,'/');
-
-    if (p==0){
-	return SSPM_UNKNOWN_MINOR_TYPE; 
-    }
-
-    p++; /* Skip the '/' */
-
-    for (i=0; minor_content_type_map[i].type !=  SSPM_UNKNOWN_MINOR_TYPE; i++){
-	if(strncmp(p, minor_content_type_map[i].str,
-		   strlen(minor_content_type_map[i].str))==0){
-	    free(ltype);
-	    return minor_content_type_map[i].type;
-	}
-    }
-    
-    free(ltype);
-    return minor_content_type_map[i].type; /* Should return SSPM_UNKNOWN_MINOR_TYPE */
-}
-
-char* sspm_major_type_string(enum sspm_major_type type)
-{
-    int i;
-
-    for (i=0; major_content_type_map[i].type !=  SSPM_UNKNOWN_MINOR_TYPE; 
-	 i++){
-
-	if(type == major_content_type_map[i].type){
-	    return major_content_type_map[i].str;
-	}
-    }
-    
-    return major_content_type_map[i].str; /* Should return SSPM_UNKNOWN_MINOR_TYPE */
-}
-
-char* sspm_minor_type_string(enum sspm_minor_type type)
-{
-    int i;
-    for (i=0; minor_content_type_map[i].type !=  SSPM_UNKNOWN_MINOR_TYPE; 
-	 i++){
-	if(type == minor_content_type_map[i].type){
-	    return minor_content_type_map[i].str;
-	}
-    }
-    
-    return minor_content_type_map[i].str; /* Should return SSPM_UNKNOWN_MINOR_TYPE */
-}
-
-
-char* sspm_encoding_string(enum sspm_encoding type)
-{
-    int i;
-    for (i=0; sspm_encoding_map[i].encoding !=  SSPM_UNKNOWN_ENCODING; 
-	 i++){
-	if(type == sspm_encoding_map[i].encoding){
-	    return sspm_encoding_map[i].str;
-	}
-    }
-    
-    return sspm_encoding_map[i].str; /* Should return SSPM_UNKNOWN_MINOR_TYPE */
-}
-
-/* Interpret a header line and add its data to the header
-   structure. */
-void sspm_build_header(struct sspm_header *header, char* line)
-{
-    char *prop;
-    char *val;
-    
-    val = sspm_strdup(sspm_value(line));
-    prop = sspm_strdup(sspm_property_name(line));
-
-    if(strcmp(prop,"Content-Type") == 0){
-	
-	/* Create a new mime_header, fill in content-type
-	   and possibly boundary */
-	
-	char* boundary= sspm_get_parameter(line,"boundary");
-	
-	header->def = 0;
-	header->major = sspm_find_major_content_type(val);
-	header->minor = sspm_find_minor_content_type(val);
-	
-	if(header->minor == SSPM_UNKNOWN_MINOR_TYPE){
-	    char *p = strchr(val,'/');
-	    
-	    if (p != 0){
-		p++; /* Skip the '/' */
-		
-		header->minor_text = sspm_strdup(p);
-	    } else {
-		/* Error, malformed content type */
-		header->minor_text = sspm_strdup("unknown");
-	    }
-	}
-	if (boundary != 0){
-	    header->boundary = sspm_strdup(boundary);
-	}
-	
-    } else if(strcmp(prop,"Content-Transfer-Encoding")==0){
-	char* encoding = sspm_value(line);
-	char* lencoding = sspm_lowercase(encoding);
-
-	if(strcmp(lencoding,"base64")==0){
-	    header->encoding = SSPM_BASE64_ENCODING;
-	} else 	if(strcmp(lencoding,"quoted-printable")==0){
-	    header->encoding = SSPM_QUOTED_PRINTABLE_ENCODING;
-	} else 	if(strcmp(lencoding,"binary")==0){
-	    header->encoding = SSPM_BINARY_ENCODING;
-	} else 	if(strcmp(lencoding,"7bit")==0){
-	    header->encoding = SSPM_7BIT_ENCODING;
-	} else 	if(strcmp(lencoding,"8bit")==0){
-	    header->encoding = SSPM_8BIT_ENCODING;
-	} else {
-	    header->encoding = SSPM_UNKNOWN_ENCODING;
-	}
-
-
-	free(lencoding);
-
-	header->def = 0;
-	
-    } else if(strcmp(prop,"Content-Id")==0){
-	char* cid = sspm_value(line);
-	header->content_id = sspm_strdup(cid);
-	header->def = 0;
-	
-    }
-    free(val);
-    free(prop);
-}
-
-char* sspm_get_next_line(struct mime_impl *impl)
-{
-    char* s;
-    s = impl->get_string(impl->temp,TMP_BUF_SIZE,impl->get_string_data);
-    
-    if(s == 0){
-	impl->state = END_OF_INPUT;
-    }
-    return s;
-}
-
-
-void sspm_store_part(struct mime_impl *impl, struct sspm_header header,
-		      int level, void *part, size_t size)
-{
-    
-    impl->parts[impl->part_no].header = header;
-    impl->parts[impl->part_no].level = level;
-    impl->parts[impl->part_no].data = part;  
-    impl->parts[impl->part_no].data_size = size;  
-    impl->part_no++;
-}
-
-void sspm_set_error(struct sspm_header* header, enum sspm_error error,
-		    char* message)
-{
-    header->error = error;
-
-    if(header->error_text!=0){
-	free(header->error_text);
-    }
-
-    header->def = 0;
-
-    if(message != 0){
-	header->error_text = sspm_strdup(message);  
-    } else {
-	header->error_text = 0;
-    }
-
-}
-
-void* sspm_make_part(struct mime_impl *impl,
-		     struct sspm_header *header, 
-		     struct sspm_header *parent_header,
-		     void **end_part,
-		     size_t *size)
-{
-
-    /* For a single part type, read to the boundary, if there is a
-   boundary. Otherwise, read until the end of input.  This routine
-   assumes that the caller has read the header and has left the input
-   at the first blank line */
-
-    char *line;
-    void *part;
-    int end = 0;
-
-    struct sspm_action_map action = get_action(
-	impl,
-	header->major,
-	header->minor);
-
-    *size = 0;
-    part =action.new_part();
-
-    impl->state = IN_BODY;
-
-    while(end == 0 && (line = sspm_get_next_line(impl)) != 0){
-	
-	if(sspm_is_mime_boundary(line)){
-	    
-	    /* If there is a boundary, then this must be a multipart
-               part, so there must be a parent_header. */
-	    if(parent_header == 0){
-		char* boundary;
-		end = 1;
-		*end_part = 0;
-
-		sspm_set_error(header,SSPM_UNEXPECTED_BOUNDARY_ERROR,line);
-
-		/* Read until the paired terminating boundary */
-		if((boundary = (char*)malloc(strlen(line)+5)) == 0){
-		    fprintf(stderr,"Out of memory");
-		    abort();
-		}
-		strcpy(boundary,line);
-		strcat(boundary,"--");
-		while((line = sspm_get_next_line(impl)) != 0){
-		    /*printf("Error: %s\n",line);*/
-		    if(strcmp(boundary,line)==0){
-			break;
-		    }
-		}
-		free(boundary);
-
-		break;
-	    }
-	    
-	    if(strncmp((line+2),parent_header->boundary,
-		       sizeof(parent_header->boundary)) == 0){
-		*end_part = action.end_part(part);
-
-		if(sspm_is_mime_boundary(line)){
-		    impl->state = END_OF_PART;
-		} else if ( sspm_is_mime_terminating_boundary(line)){
-		    impl->state = TERMINAL_END_OF_PART;
-		}
-		end = 1;
-	    } else {
-		/* Error, this is not the correct terminating boundary*/
-
-		/* read and discard until we get the right boundary.  */
-		    char* boundary;
-		    char msg[256];
-
-		    snprintf(msg,256,
-			     "Expected: %s--. Got: %s",
-			     parent_header->boundary,line);
-
-		    sspm_set_error(parent_header,
-		      SSPM_WRONG_BOUNDARY_ERROR,msg);
-
-		    /* Read until the paired terminating boundary */
-		    if((boundary = (char*)malloc(strlen(line)+5)) == 0){
-			fprintf(stderr,"Out of memory");
-			abort();
-		    }		 
-		    strcpy(boundary,line);
-		    strcat(boundary,"--");
-		    while((line = sspm_get_next_line(impl)) != 0){
-			if(strcmp(boundary,line)==0){
-			    break;
-			}
-		    }
-		    free(boundary);
-
-	    }	
-	} else {
-	    char* data=0;
-	    char* rtrn=0;
-	    *size = strlen(line);
-
-	    data = (char*)malloc(*size+2);
-	    assert(data != 0);
-	    if (header->encoding == SSPM_BASE64_ENCODING){
-		rtrn = decode_base64(data,line,size); 
-	    } else if(header->encoding == SSPM_QUOTED_PRINTABLE_ENCODING){
-		rtrn = decode_quoted_printable(data,line,size); 
-	    } 
-
-	    if(rtrn == 0){
-		strcpy(data,line);
-	    }
-
-	    /* add a end-of-string after the data, just in case binary
-               data from decode64 gets passed to a tring handling
-               routine in add_line  */
-	    data[*size+1]='\0';
-
-	    action.add_line(part,header,data,*size);
-
-	    free(data);
-	}
-    }
-
-    if (end == 0){
-	/* End the part if the input is exhausted */
-	*end_part = action.end_part(part);
-    }
-
-    return end_part;
-}
-
-
-void* sspm_make_multipart_subpart(struct mime_impl *impl,
-			    struct sspm_header *parent_header)
-{
-    struct sspm_header header;
-    char *line;
-    void* part;
-    size_t size;
-
-    if(parent_header->boundary == 0){
-	/* Error. Multipart headers must have a boundary*/
-	
-	sspm_set_error(parent_header,SSPM_NO_BOUNDARY_ERROR,0);
-	/* read all of the reamining lines */
-	while((line = sspm_get_next_line(impl)) != 0){
-	}  
-
-	return 0;
-    }
-
-
-    /* Step 1: Read the opening boundary */
-
-    if(get_line_type(impl->temp) != BOUNDARY){
-	while((line=sspm_get_next_line(impl)) != 0 ){
-	    if(sspm_is_mime_boundary(line)){
-
-		assert(parent_header != 0);
-
-		/* Check if it is the right boundary */
-		if(!sspm_is_mime_terminating_boundary(line) &&
-		   strncmp((line+2),parent_header->boundary, 
-			   sizeof(parent_header->boundary)) 
-		   == 0){
-		    /* The +2 in strncmp skips over the leading "--" */
-		    
-		    break;
-		} else {
-		    /* Got the wrong boundary, so read and discard
-                       until we get the right boundary.  */
-		    char* boundary;
-		    char msg[256];
-		    
-		    snprintf(msg,256,
-			     "Expected: %s. Got: %s",
-			     parent_header->boundary,line);
-
-		    sspm_set_error(parent_header,
-				   SSPM_WRONG_BOUNDARY_ERROR,msg);
-
-		    /* Read until the paired terminating boundary */
-		    if((boundary = (char*)malloc(strlen(line)+5)) == 0){
-			fprintf(stderr,"Out of memory");
-			abort();
-		    }
-		    strcpy(boundary,line);
-		    strcat(boundary,"--");
-		    while((line = sspm_get_next_line(impl)) != 0){
-			if(strcmp(boundary,line)==0){
-			    break;
-			}
-		    }
-		    free(boundary);
-		    
-		    return 0;
-		}
-	    }
-	}
-    }
-
-    /* Step 2: Get the part header */
-    sspm_read_header(impl,&header);
-
-    /* If the header is still listed as default, there was probably an
-       error */
-    if(header.def == 1 && header.error != SSPM_NO_ERROR){
-	sspm_set_error(&header,SSPM_NO_HEADER_ERROR,0);
-	return 0;
-    }
-
-    if(header.error!= SSPM_NO_ERROR){
-	sspm_store_part(impl,header,impl->level,0,0);
-	return 0;
-    }	
-
-    /* Step 3: read the body */
-    
-    if(header.major == SSPM_MULTIPART_MAJOR_TYPE){
-	struct sspm_header *child_header;
-	child_header = &(impl->parts[impl->part_no].header);
-
-	/* Store the multipart part */
-	sspm_store_part(impl,header,impl->level,0,0);
-
-	/* now get all of the sub-parts */
-	part = sspm_make_multipart_part(impl,child_header);
-
-	if(get_line_type(impl->temp) != TERMINATING_BOUNDARY){
-
-	    sspm_set_error(child_header,SSPM_NO_BOUNDARY_ERROR,impl->temp);
-	    return 0;
-	}
-	
-	sspm_get_next_line(impl); /* Step past the terminating boundary */
-
-    } else {
-	sspm_make_part(impl, &header,parent_header,&part,&size);
-
-	memset(&(impl->parts[impl->part_no]), 0, sizeof(struct sspm_part));
-
-	sspm_store_part(impl,header,impl->level,part,size);
-
-    }
-
-    return part;
-}
-
-void* sspm_make_multipart_part(struct mime_impl *impl,struct sspm_header *header)
-{
-    void *part=0;
-
-    /* Now descend a level into each of the children of this part */
-    impl->level++;
-
-    /* Now we are working on the CHILD */
-    memset(&(impl->parts[impl->part_no]), 0, sizeof(struct sspm_part));
-
-    do{
-	part = sspm_make_multipart_subpart(impl,header);
-
-	if (part==0){
-	    /* Clean up the part in progress */
-	    impl->parts[impl->part_no].header.major 
-		= SSPM_NO_MAJOR_TYPE;
-	    impl->parts[impl->part_no].header.minor 
-		= SSPM_NO_MINOR_TYPE;
-
-	}
-	
-
-    } while (get_line_type(impl->temp) != TERMINATING_BOUNDARY &&
-	impl->state != END_OF_INPUT);
-
-    impl->level--;
-
-    return 0;
-}
-
-
-void sspm_read_header(struct mime_impl *impl,struct sspm_header *header)
-{
-#define BUF_SIZE 1024
-#define MAX_HEADER_LINES 25
-
-    char *buf;
-    char header_lines[MAX_HEADER_LINES][BUF_SIZE]; /* HACK, hard limits */
-    int current_line = -1;
-    int end = 0;
-
-    memset(header_lines,0,sizeof(header_lines));
-    memset(header,0,sizeof(struct sspm_header));
-
-    /* Set up default header */
-    header->def = 1;
-    header->major = SSPM_TEXT_MAJOR_TYPE;
-    header->minor = SSPM_PLAIN_MINOR_TYPE;
-    header->error = SSPM_NO_ERROR;
-    header->error_text = 0;
-
-    /* Read all of the lines into memory */
-    while(end==0&& (buf=sspm_get_next_line(impl)) != 0){
-
-	enum line_type line_type = get_line_type(buf);
-	
-	switch(line_type){
-	    case BLANK: {
-		end = 1;
-		impl->state = END_OF_HEADER;
-		break;
-	    }
-
-	    case MAIL_HEADER:
-	    case MIME_HEADER: {	    
-		impl->state = IN_HEADER;
-		current_line++;
-		
-		assert(strlen(buf) < BUF_SIZE);
-		
-		strncpy(header_lines[current_line],buf,BUF_SIZE-1);
-		header_lines[current_line][BUF_SIZE-1] = '\0';
-		
-		break;
-	    }
-	    
-	    case HEADER_CONTINUATION: {
-		char* last_line, *end;
-		char *buf_start;
-
-		if(current_line < 0){
-		    /* This is not really a continuation line, since
-                       we have not see any header line yet */
-		    sspm_set_error(header,SSPM_MALFORMED_HEADER_ERROR,buf);
-		    return;
-		}
-
-		last_line = header_lines[current_line];
-		end = (char*) ( (size_t)strlen(last_line)+
-				      (size_t)last_line);
-		
-		impl->state = IN_HEADER;
-
-		
-		/* skip over the spaces in buf start, and remove the new
-		   line at the end of the lat line */
-		if (last_line[strlen(last_line)-1] == '\n'){
-		    last_line[strlen(last_line)-1] = '\0';
-		}
-		buf_start = buf;
-		while(*buf_start == ' ' ||*buf_start == '\t' ){
-		    buf_start++;
-		}
-		
-		assert( strlen(buf_start) + strlen(last_line) < BUF_SIZE);
-		
-		strncat(last_line,buf_start,BUF_SIZE-strlen(last_line)-1);
-		
-		break;
-	    }
-	    
-	    default: {
-		sspm_set_error(header,SSPM_MALFORMED_HEADER_ERROR,buf);
-		return;
-	    }
-	}
-    }
-	
-
-    for(current_line = 0;
-	current_line < MAX_HEADER_LINES && header_lines[current_line][0] != 0;
-	current_line++){
-	
-	sspm_build_header(header,header_lines[current_line]);
-    }
-
-
-}
-
-/* Root routine for parsing mime entries*/
-int sspm_parse_mime(struct sspm_part *parts, 
-		    size_t max_parts,
-		    struct sspm_action_map *actions,
-		    char* (*get_string)(char *s, size_t size, void* data),
-		    void *get_string_data,
-		    struct sspm_header *first_header
-    )
-{
-    struct mime_impl impl;
-    struct sspm_header header;
-    void *part;
-    int i;
-
-    /* Initialize all of the data */
-    memset(&impl,0,sizeof(struct mime_impl));
-    memset(&header,0,sizeof(struct sspm_header));
-
-    for(i = 0; i<(int)max_parts; i++){
-	parts[i].header.major = SSPM_NO_MAJOR_TYPE;
-	parts[i].header.minor = SSPM_NO_MINOR_TYPE;
-    }
-	
-    impl.parts = parts;
-    impl.max_parts = max_parts;
-    impl.part_no = 0;
-    impl.actions = actions;
-    impl.get_string = get_string;
-    impl.get_string_data = get_string_data;
-
-    /* Read the header of the message. This will be the email header,
-       unless first_header is specified. But ( HACK) that var is not
-       currently being used */
-    sspm_read_header(&impl,&header);
-
-    if(header.major == SSPM_MULTIPART_MAJOR_TYPE){
-	struct sspm_header *child_header;
-	child_header = &(impl.parts[impl.part_no].header);
-	
-	sspm_store_part(&impl,header,impl.level,0,0);
-
-	part = sspm_make_multipart_part(&impl,child_header);
-
-    } else {
-	void *part;
-	size_t size;
-	sspm_make_part(&impl, &header, 0,&part,&size);
-
-	memset(&(impl.parts[impl.part_no]), 0, sizeof(struct sspm_part));
-	
-	sspm_store_part(&impl,header,impl.level,part,size);
-    }
-
-    return 0;
-}
-
-void sspm_free_parts(struct sspm_part *parts, size_t max_parts)
-{
-     int i;
-    
-    for(i = 0; i<(int)max_parts && parts[i].header.major != SSPM_NO_MAJOR_TYPE;
-	i++){
-	sspm_free_header(&(parts[i].header));
-    }
-}
-
-void sspm_free_header(struct sspm_header *header)
-{
-    if(header->boundary!=0){
-	free(header->boundary);
-    }
-    if(header->minor_text!=0){
-	free(header->minor_text);
-    }
-    if(header->charset!=0){
-	free(header->charset);
-    }
-    if(header->filename!=0){
-	free(header->filename);
-    }
-    if(header->content_id!=0){
-	free(header->content_id);
-    }
-    if(header->error_text!=0){
-	free(header->error_text);
-    }
-}
-
-/***********************************************************************
-The remaining code is beased on code from the mimelite distribution,
-which has the following notice:
-
-| Authorship:
-|    Copyright (c) 1994 Gisle Hannemyr.
-|    Permission is granted to hack, make and distribute copies of this
-|    program as long as this copyright notice is not removed.
-|    Flames, bug reports, comments and improvements to:
-|       snail: Gisle Hannemyr, Brageveien 3A, 0452 Oslo, Norway
-|       email: Inet: gisle@oslonett.no
-
-The code is heavily modified by Eric Busboom. 
-
-***********************************************************************/
-
-char *decode_quoted_printable(char *dest, 
-				       char *src,
-				       size_t *size)
-{
-    int cc;
-    size_t i=0;
-
-    while (*src != 0 && i < *size) {
-	if (*src == '=') {
-
-	    src++; 
-	    if (!*src) {
-		break;
-	    }
-
-	    /* remove soft line breaks*/
-	    if ((*src == '\n') || (*src == '\r')){
-		src++;
-		if ((*src == '\n') || (*src == '\r')){
-		    src++;
-		}
-		continue;
-	    }
-
-	    cc  = isdigit(*src) ? (*src - '0') : (*src - 55);
-	    cc *= 0x10;
-	    src++; 
-	    if (!*src) {
-		break;
-	    }
-	    cc += isdigit(*src) ? (*src - '0') : (*src - 55);
-
-	    *dest = cc;
-
-	} else {
-	    *dest = *src;
-	}
-	
-	dest++;
-	src++;
-	i++;
-    }
-    
-    *dest = '\0';
-    
-    *size = i;
-    return(dest);
-}
-
-char *decode_base64(char *dest, 
-			     char *src,
-			     size_t *size)
-{
-    int cc = 0;
-    char buf[4] = {0,0,0,0};  
-    int p = 0;
-    int valid_data = 0;
-    size_t size_out=0;
-    
-    while (*src && p<(int)*size && (cc!=  -1)) {
-	
-	/* convert a character into the Base64 alphabet */
-	cc = *src++;
-	
-	if	((cc >= 'A') && (cc <= 'Z')) cc = cc - 'A';
-	else if ((cc >= 'a') && (cc <= 'z')) cc = cc - 'a' + 26;
-	else if ((cc >= '0') && (cc <= '9')) cc = cc - '0' + 52;
-	else if  (cc == '/')		     cc = 63;
-	else if  (cc == '+')		     cc = 62;
-	else                                 cc = -1;
-	
-	assert(cc<64);
-
-	/* If we've reached the end, fill the remaining slots in
-	   the bucket and do a final conversion */
-	if(cc== -1){
-	    if(valid_data == 0){
-		return 0;
-	    }
-
-	    while(p%4!=3){
-		p++;
-		buf[p%4] = 0;
-	    }
-	} else {
-	    buf[p%4] = cc;
-	    size_out++;
-	    valid_data = 1;
-	}
-
-	
-	/* When we have 4 base64 letters, convert them into three
-	   bytes */
-	if (p%4 == 3) {
-	    *dest++ =(buf[0]<< 2)|((buf[1] & 0x30) >> 4);
-	    *dest++ =((buf[1] & 0x0F) << 4)|((buf[2] & 0x3C) >> 2);
-	    *dest++ =((buf[2] & 0x03) << 6)|(buf[3] & 0x3F);
-
-	    memset(buf,0,4);
-	}
-
-	p++;
-
-    }
-    /* Calculate the size of the converted data*/
-   *size = ((int)(size_out/4))*3;
-    if(size_out%4 == 2) *size+=1;
-    if(size_out%4 == 3) *size+=2;
-
-    return(dest);
-}
-
-
-/***********************************************************************
-								       
- Routines to output MIME
-
-**********************************************************************/
-
-
-struct sspm_buffer {
-	char* buffer;
-	char* pos;
-	size_t buf_size;
-	int line_pos;
-};
-
-void sspm_append_string(struct sspm_buffer* buf, char* string);
-void sspm_write_part(struct sspm_buffer *buf,struct sspm_part *part, int *part_num);
-
-void sspm_append_hex(struct sspm_buffer* buf, char ch)
-{
-    char tmp[3];
-
-    sprintf(tmp,"=%02X",ch);
-
-    sspm_append_string(buf,tmp);
-}
-
-/* a copy of icalmemory_append_char */
-void sspm_append_char(struct sspm_buffer* buf, char ch)
-{
-    char *new_buf;
-    char *new_pos;
-
-    size_t data_length, final_length;
-
-    data_length = (size_t)buf->pos - (size_t)buf->buffer;
-
-    final_length = data_length + 2; 
-
-    if ( final_length > (size_t) buf->buf_size ) {
-	
-	buf->buf_size  = (buf->buf_size) * 2  + final_length +1;
-
-	new_buf = realloc(buf->buffer,buf->buf_size);
-
-	new_pos = (void*)((size_t)new_buf + data_length);
-	
-	buf->pos = new_pos;
-	buf->buffer = new_buf;
-    }
-
-    *(buf->pos) = ch;
-    buf->pos += 1;
-    *(buf->pos) = 0;
-}
-/* A copy of icalmemory_append_string */
-void sspm_append_string(struct sspm_buffer* buf, char* string)
-{
-    char *new_buf;
-    char *new_pos;
-
-    size_t data_length, final_length, string_length;
-
-    string_length = strlen(string);
-    data_length = (size_t)buf->pos - (size_t)buf->buffer;    
-    final_length = data_length + string_length; 
-
-    if ( final_length >= (size_t) buf->buf_size) {
-
-	
-	buf->buf_size  = (buf->buf_size) * 2  + final_length;
-
-	new_buf = realloc(buf->buffer,buf->buf_size);
-
-	new_pos = (void*)((size_t)new_buf + data_length);
-	
-	buf->pos = new_pos;
-	buf->buffer = new_buf;
-    }
-    
-    strcpy(buf->pos, string);
-
-    buf->pos += string_length;
-}
-
-
-
-static int sspm_is_printable(char c)
-{
-    return (c >= 33) && (c <= 126) && (c != '=');
-
-} 
-                     
-
-void sspm_encode_quoted_printable(struct sspm_buffer *buf, char* data)
-{
-    char *p;
-    int lpos = 0;
-
-    for(p = data; *p != 0; p++){
-
-	if(sspm_is_printable(*p)){
-	    /* plain characters can represent themselves */
-	    /* RFC2045 Rule #2 */
-	       sspm_append_char(buf,*p);
-	       lpos++;
-	} else if ( *p == '\t' || *p == ' ' ) {
-
-	    /* For tabs and spaces, only encode if they appear at the
-               end of the line */
-	    /* RFC2045 Rule #3 */
-
-	   char n = *(p+1);
-
-	   if( n == '\n' || n == '\r'){
-	       sspm_append_hex(buf,*p);
-	       lpos += 3;
-	   } else {
-	       sspm_append_char(buf,*p);
-	       lpos++;
-	   }
-
-	} else if( *p == '\n' || *p == '\r'){
-	    sspm_append_char(buf,*p);
-
-	    lpos=0;
-
-	} else {
-	    /* All others need to be encoded */
-	    sspm_append_hex(buf,*p);
-	    lpos+=3;
-	}
-
-
-	/* Add line breaks */
-	if (lpos > 72){
-	    lpos = 0;
-	    sspm_append_string(buf,"=\n");
-	}
-    }
-}
-
-static char BaseTable[64] = {
-    'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P',
-    'Q','R','S','T','U','V','W','X','Y','Z','a','b','c','d','e','f',
-    'g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v',
-    'w','x','y','z','0','1','2','3','4','5','6','7','8','9','+','/'
-};
-    
-void sspm_write_base64(struct sspm_buffer *buf, char* inbuf,int size )
-{
-    
-    char outbuf[4];
-    int i;
-
-    outbuf[0] = outbuf[1] = outbuf[2] = outbuf[3] = 65;
-
-    switch(size){
-	
-	case 4:
-	    outbuf[3] =   inbuf[2] & 0x3F;
-
-	case 3:
-	    outbuf[2] = ((inbuf[1] & 0x0F) << 2) | ((inbuf[2] & 0xC0) >> 6);
-
-	case 2:	
-	    outbuf[0] =  (inbuf[0] & 0xFC) >> 2;
-	    outbuf[1] = ((inbuf[0] & 0x03) << 4) | ((inbuf[1] & 0xF0) >> 4);
-	    break;
-
-	default:
-	    assert(0);
-    }
-
-    for(i = 0; i < 4; i++){
-
-	if(outbuf[i] == 65){
-	    sspm_append_char(buf,'=');
-	} else {
-	    sspm_append_char(buf,BaseTable[(int)outbuf[i]]);
-	}
-    }
-}
-             
-void sspm_encode_base64(struct sspm_buffer *buf, char* data, size_t size)
-{
-
-    char *p;
-    char inbuf[3];
-    int i = 0;
-    int first = 1;
-    int lpos = 0;
-
-    inbuf[0] = inbuf[1] = inbuf[2]  = 0;
-
-    for (p = data; *p !=0; p++){
-                         
-	if (i%3 == 0 && first == 0){
-
-	    sspm_write_base64(buf, inbuf, 4);
-	    lpos+=4;
-
-	    inbuf[0] = inbuf[1] = inbuf[2] = 0;
-	}
-
-	assert(lpos%4 == 0);
-
-	if (lpos == 72){
-	    sspm_append_string(buf,"\n");
-	    lpos = 0;
-	}
-
-	inbuf[i%3] = *p;
-
-	i++;
-	first = 0;
-
-    }
-
-    
-    /* If the inbuf was not exactly filled on the last byte, we need
-       to spit out the odd bytes that did get in -- either one or
-       two. This will result in an output of two bytes and '==' or
-       three bytes and '=', respectively */
-    
-    if (i%3 == 1 && first == 0){
-	    sspm_write_base64(buf, inbuf, 2);
-    } else if (i%3 == 2 && first == 0){
-	    sspm_write_base64(buf, inbuf, 3);
-    }
-
-}
-
-void sspm_write_header(struct sspm_buffer *buf,struct sspm_header *header)
-{
-    
-    int i;
-    char temp[TMP_BUF_SIZE];			       
-    char* major; 
-    char* minor; 
-    
-    /* Content-type */
-
-    major = sspm_major_type_string(header->major);
-    minor = sspm_minor_type_string(header->minor);
-
-    if(header->minor == SSPM_UNKNOWN_MINOR_TYPE ){
-	assert(header->minor_text !=0);
-	minor = header->minor_text;
-    }
-    
-    sprintf(temp,"Content-Type: %s/%s",major,minor);
-
-    sspm_append_string(buf,temp);
-
-    if(header->boundary != 0){
-	sprintf(temp,";boundary=\"%s\"",header->boundary);
-	sspm_append_string(buf,temp);
-    }
-    
-    /* Append any content type parameters */    
-    if(header->content_type_params != 0){
-	for(i=0; *(header->content_type_params[i])!= 0;i++){
-	    sprintf(temp,header->content_type_params[i]);
-	    sspm_append_char(buf,';');
-	    sspm_append_string(buf,temp);
-	}
-    }
-    
-    sspm_append_char(buf,'\n');
-
-    /*Content-Transfer-Encoding */
-
-    if(header->encoding != SSPM_UNKNOWN_ENCODING &&
-	header->encoding != SSPM_NO_ENCODING){
-	sprintf(temp,"Content-Transfer-Encoding: %s\n",
-		sspm_encoding_string(header->encoding));
-    }
-
-    sspm_append_char(buf,'\n');
-
-}
-
-void sspm_write_multipart_part(struct sspm_buffer *buf,
-			       struct sspm_part *parts,
-			       int* part_num)
-{
-
-    int parent_level, level;
-    struct sspm_header *header = &(parts[*part_num].header);
-    /* Write the header for the multipart part */
-    sspm_write_header(buf,header);
-
-    parent_level = parts[*part_num].level;
-
-    (*part_num)++;
-
-    level = parts[*part_num].level;
-
-    while(parts[*part_num].header.major != SSPM_NO_MAJOR_TYPE &&
-	  level == parent_level+1){
-
-	assert(header->boundary);
-	sspm_append_string(buf,header->boundary);
-	sspm_append_char(buf,'\n');
-	
-	if (parts[*part_num].header.major == SSPM_MULTIPART_MAJOR_TYPE){
-	    sspm_write_multipart_part(buf,parts,part_num);
-	} else {
-	    sspm_write_part(buf, &(parts[*part_num]), part_num);
-	}	
-
-	(*part_num)++;
-	level =  parts[*part_num].level;
-    }
-   
-    sspm_append_string(buf,"\n\n--");
-    sspm_append_string(buf,header->boundary);
-    sspm_append_string(buf,"\n");
-
-    (*part_num)--; /* undo last, spurious, increment */
-}
-
-void sspm_write_part(struct sspm_buffer *buf,struct sspm_part *part,int *part_num)
-{
-
-    /* Write header */
-    sspm_write_header(buf,&(part->header));
-
-    /* Write part data */
-
-    if(part->data == 0){
-	return;
-    }
-
-    if(part->header.encoding == SSPM_BASE64_ENCODING) {
-	assert(part->data_size != 0);
-	sspm_encode_base64(buf,part->data,part->data_size);
-    } else if(part->header.encoding == SSPM_QUOTED_PRINTABLE_ENCODING) {
-	sspm_encode_quoted_printable(buf,part->data);
-    } else {
-	sspm_append_string(buf,part->data);
-    }
-
-    sspm_append_string(buf,"\n\n");
-}
-
-int sspm_write_mime(struct sspm_part *parts,size_t num_parts,
-		    char **output_string, char* header)
-{
-    struct sspm_buffer buf;
-    int part_num =0;
-
-    buf.buffer = malloc(4096);
-    buf.pos = buf.buffer;
-    buf.buf_size = 10;
-    buf.line_pos = 0;
-
-    /* write caller's header */
-    if(header != 0){
-	sspm_append_string(&buf,header);
-    }
-
-    if(buf.buffer[strlen(buf.buffer)-1] != '\n'){
-	sspm_append_char(&buf,'\n');
-    }
-
-    /* write mime-version header */
-    sspm_append_string(&buf,"Mime-Version: 1.0\n");
-
-    /* End of header */
-
-    /* Write body parts */
-    while(parts[part_num].header.major != SSPM_NO_MAJOR_TYPE){
-	if (parts[part_num].header.major == SSPM_MULTIPART_MAJOR_TYPE){
-	    sspm_write_multipart_part(&buf,parts,&part_num);
-	} else {
-	    sspm_write_part(&buf, &(parts[part_num]), &part_num);
-	}	
-
-	part_num++;
-    }
-
-
-    *output_string = buf.buffer;
-
-    return 0;
-}
-
diff --git a/libical/src/libical/sspm.h b/libical/src/libical/sspm.h
deleted file mode 100644
index 864a23a36f..0000000000
--- a/libical/src/libical/sspm.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: sspm.h Mime Parser
-  CREATOR: eric 25 June 2000
-  
-  $Id$
-  $Locker$
-    
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The Initial Developer of the Original Code is Eric Busboom
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
- ======================================================================*/
-
-#ifndef SSPM_H
-#define SSPM_H
-
-enum sspm_major_type {
-    SSPM_NO_MAJOR_TYPE,
-    SSPM_TEXT_MAJOR_TYPE,
-    SSPM_IMAGE_MAJOR_TYPE,
-    SSPM_AUDIO_MAJOR_TYPE,
-    SSPM_VIDEO_MAJOR_TYPE,
-    SSPM_APPLICATION_MAJOR_TYPE,
-    SSPM_MULTIPART_MAJOR_TYPE,
-    SSPM_MESSAGE_MAJOR_TYPE,
-    SSPM_UNKNOWN_MAJOR_TYPE
-};
-
-enum sspm_minor_type {
-    SSPM_NO_MINOR_TYPE,
-    SSPM_ANY_MINOR_TYPE,
-    SSPM_PLAIN_MINOR_TYPE,
-    SSPM_RFC822_MINOR_TYPE,
-    SSPM_DIGEST_MINOR_TYPE,
-    SSPM_CALENDAR_MINOR_TYPE,
-    SSPM_MIXED_MINOR_TYPE,
-    SSPM_RELATED_MINOR_TYPE,
-    SSPM_ALTERNATIVE_MINOR_TYPE,
-    SSPM_PARALLEL_MINOR_TYPE,
-    SSPM_UNKNOWN_MINOR_TYPE
-};
-
-enum sspm_encoding {
-    SSPM_NO_ENCODING,
-    SSPM_QUOTED_PRINTABLE_ENCODING,
-    SSPM_8BIT_ENCODING,
-    SSPM_7BIT_ENCODING,
-    SSPM_BINARY_ENCODING,
-    SSPM_BASE64_ENCODING,
-    SSPM_UNKNOWN_ENCODING
-};
-
-enum sspm_error{
-    SSPM_NO_ERROR,
-    SSPM_UNEXPECTED_BOUNDARY_ERROR,
-    SSPM_WRONG_BOUNDARY_ERROR,
-    SSPM_NO_BOUNDARY_ERROR,
-    SSPM_NO_HEADER_ERROR,
-    SSPM_MALFORMED_HEADER_ERROR
-};
-
-
-struct sspm_header
-{
-	int def;
-	char* boundary;
-	enum sspm_major_type major;
-	enum sspm_minor_type minor;
-	char *minor_text;
-	char ** content_type_params;
-	char* charset;
-	enum sspm_encoding encoding;
-	char* filename;
-	char* content_id;
-	enum sspm_error error;
-	char* error_text;
-};
-
-struct sspm_part {
-	struct sspm_header header;
-	int level;
-	size_t data_size;
-	void *data;
-};
-
-struct sspm_action_map {
-	enum sspm_major_type major;
-	enum sspm_minor_type minor;
-	void* (*new_part)();
-	void (*add_line)(void *part, struct sspm_header *header, 
-			 char* line, size_t size);
-	void* (*end_part)(void* part);
-	void (*free_part)(void *part);
-};
-
-char* sspm_major_type_string(enum sspm_major_type type);
-char* sspm_minor_type_string(enum sspm_minor_type type);
-char* sspm_encoding_string(enum sspm_encoding type);
-
-int sspm_parse_mime(struct sspm_part *parts, 
-		    size_t max_parts,
-		    struct sspm_action_map *actions,
-		    char* (*get_string)(char *s, size_t size, void* data),
-		    void *get_string_data,
-		    struct sspm_header *first_header
-    );
-
-void sspm_free_parts(struct sspm_part *parts, size_t max_parts);
-
-char *decode_quoted_printable(char *dest, 
-				       char *src,
-				       size_t *size);
-char *decode_base64(char *dest, 
-			     char *src,
-			     size_t *size);
-
-
-int sspm_write_mime(struct sspm_part *parts,size_t num_parts,
-		    char **output_string, char* header);
-
-#endif /*SSPM_H*/
diff --git a/libical/src/libical/vcomponent.cpp b/libical/src/libical/vcomponent.cpp
deleted file mode 100644
index 27ea61a7f8..0000000000
--- a/libical/src/libical/vcomponent.cpp
+++ /dev/null
@@ -1,817 +0,0 @@
-/**
- * @file    vcomponent.cpp
- * @author  fnguyen (12/10/01)
- * @brief   Implemenation of C++ Wrapper for icalcomponent.c
- *
- * (C) COPYRIGHT 2001, Critical Path
- */
-
-#ifndef VCOMPONENT_H
-#include "vcomponent.h"
-#endif
-
-#ifndef ICALVALUE_CXX_H
-#include "icalvalue_cxx.h"
-#endif
-
-#ifndef ICALPROPERTY_CXX_H
-#include "icalproperty_cxx.h"
-#endif
-
-#ifndef ICALPARAMETER_CXX_H
-#include "icalparameter_cxx.h"
-#endif
-#include <stdlib.h>
-#include <string.h>
-
-#include <exception>
-
-VComponent::VComponent() throw(icalerrorenum) : imp(icalcomponent_new(ICAL_ANY_COMPONENT)) {
-}
-VComponent::VComponent(const VComponent& v) throw(icalerrorenum) {
-  imp = icalcomponent_new_clone(v.imp);
-  if (!imp) throw icalerrno;
-}
-
-VComponent& VComponent::operator=(const VComponent& v) throw(icalerrorenum) {
-	if (this == &v) return *this;
-
-	if (imp != NULL)
-	{
-		icalcomponent_free(imp);
-		imp = icalcomponent_new_clone(v.imp);
-	if (!imp) throw icalerrno;
-	}
-
-	return *this;
-}
-
-VComponent::~VComponent(){
-	if (imp)
-	   icalcomponent_free(imp);
-}
-
-VComponent::VComponent(icalcomponent* v) throw (icalerrorenum) : imp(v){
-}
-
-/* char* returned is in the ring buffer. caller doesn't have to free it */
-char* VComponent::quote_ical_string(char *str){
-    const char* p;
-    size_t  buf_sz;
-    buf_sz = strlen(str) * 2;	/* assume worse case scenarios. otherwise, we have to parse the string and count \ */
-    char* out = (char*)icalmemory_new_buffer(buf_sz);    /* memory is from the ring buffer */
-    char* pout;
-
-    if (out == 0){
-        return 0;
-    }
-
-    pout = out;
-
-    for (p = str; *p!=0; p++){
-
-        if( *p == '\\'){
-            *pout++ = '\\';
-	}
-	*pout++ = *p;
-
-    }
-    *pout++ = '\0';
-
-    return out;
-}
-
-/**
- * @brief Constructor
- * 
- * Create a new VComponent from a string.
- *
- * @exception ICAL_MALFORMEDDATA_ERROR
- *            Catch this error if you 
- * 
- */
-VComponent::VComponent(string str)  throw (icalerrorenum) {
-	// Fix for BUG #15647, but breaks fix for BUG #15596.  Attempting a UI fix for cal-4.0.
-	//char* quoted_str = quote_ical_string((char *)str);
-	//imp = icalcomponent_new_from_string(quoted_str);
-	imp = icalcomponent_new_from_string(str);
-
-	if (!imp) throw icalerrno;
-}
-
-VComponent::VComponent(icalcomponent_kind kind)  throw(icalerrorenum) {
-  imp = icalcomponent_new(kind);
-
-  if (!imp) throw icalerrno;
-}
-
-
-string VComponent::as_ical_string()  throw(icalerrorenum) {
-  char *str = icalcomponent_as_ical_string(imp);
-
-  if (!str) throw icalerrno;
-
-  return(str);
-}
-
-
-bool VComponent::is_valid(){
-	if (imp == NULL) return false;
-	return (icalcomponent_is_valid(imp) ? true : false);
-}
-
-icalcomponent_kind VComponent::isa(){
-	return icalcomponent_isa(imp);
-}
-
-int VComponent::isa_component(void* component){
-	return icalcomponent_isa_component(component);
-}
-
-void VComponent::new_from_string(string str){
-	if (imp != NULL) icalcomponent_free(imp);
-	imp = icalcomponent_new_from_string(str);
-}
-
-/* Working with properties */
-void VComponent::add_property(ICalProperty* property){
-	icalcomponent_add_property(imp, *property);
-}
-void VComponent::remove_property(ICalProperty* property){
-	icalcomponent_remove_property(imp, *property);
-	icalproperty_free(*property);
-        property->detach();		// set imp to null, it's free already.
-}
-int VComponent::count_properties(icalproperty_kind kind){
-	return icalcomponent_count_properties(imp, kind);
-}
-
-/* Iterate through the properties */
-ICalProperty* VComponent::get_current_property(){
-	icalproperty* t = icalcomponent_get_current_property(imp);
-	return ((t != NULL) ? new ICalProperty(t) : NULL);
-}
-
-ICalProperty* VComponent::get_first_property(icalproperty_kind kind){
-	icalproperty* t = icalcomponent_get_first_property(imp, kind);
-	return ((t != NULL) ? new ICalProperty(t) : NULL);
-}
-
-ICalProperty* VComponent::get_next_property(icalproperty_kind kind){
-	icalproperty* t = icalcomponent_get_next_property(imp, kind);
-	return ((t != NULL) ? new ICalProperty(t) : NULL);
-}
-
-/* Working with components */ 
-/* Return the first VEVENT, VTODO or VJOURNAL sub-component if it is one of those types */
-VComponent* VComponent::get_inner(){
-	return new VComponent(icalcomponent_get_inner(imp));
-}
-
-void VComponent::add_component(VComponent* child){
-	icalcomponent_add_component(imp, *child);
-}
-void VComponent::remove_component(VComponent* child){
-	icalcomponent_remove_component(imp, *child);
-}
-int VComponent::count_components(icalcomponent_kind kind){
-	return 	icalcomponent_count_components(imp, kind);
-}
-
-/* Iteration Routines. There are two forms of iterators, internal and
-   external. The internal ones came first, and are almost completely
-   sufficient, but they fail badly when you want to construct a loop that
-   removes components from the container.
-*/
-
-/* Iterate through components */
-VComponent* VComponent::get_current_component(){
-	icalcomponent* t = icalcomponent_get_current_component(imp);
-	return ((t != NULL) ? new VComponent(t) : NULL);
-}
-VComponent* VComponent::get_first_component(icalcomponent_kind kind){
-	VComponent* result = NULL;
-	icalcomponent* t = icalcomponent_get_first_component(imp, kind);
-	if (t != NULL) {
-		switch (kind) {
-			case ICAL_VALARM_COMPONENT:
-				result = new VAlarm(t);
-				break;
-			case ICAL_VCALENDAR_COMPONENT:
-				result = new VCalendar(t);
-				break;
-			case ICAL_VEVENT_COMPONENT:
-				result = new VEvent(t);
-				break;
-			case ICAL_VQUERY_COMPONENT:
-				result = new VQuery(t);
-				break;
-			case ICAL_VTODO_COMPONENT:
-				result = new VToDo(t);
-				break;
-                        case ICAL_VAGENDA_COMPONENT:
-                                result = new VAgenda(t);
-                                break;
-			default:
-				result = new VComponent(t);
-		}
-	}
-
-	return (result);
-}
-VComponent* VComponent::get_next_component(icalcomponent_kind kind){
-	VComponent* result = NULL;
-	icalcomponent* t = icalcomponent_get_next_component(imp, kind);
-	if (t != NULL) {
-		switch (kind) {
-			case ICAL_VALARM_COMPONENT:
-				result = new VAlarm(t);
-				break;
-			case ICAL_VCALENDAR_COMPONENT:
-				result = new VCalendar(t);
-				break;
-			case ICAL_VEVENT_COMPONENT:
-				result = new VEvent(t);
-				break;
-			case ICAL_VQUERY_COMPONENT:
-				result = new VQuery(t);
-				break;
-			case ICAL_VTODO_COMPONENT:
-				result = new VToDo(t);
-				break;
-                        case ICAL_VAGENDA_COMPONENT:
-                                result = new VAgenda(t);
-                                break;
-			default:
-				result = new VComponent(t);
-		}
-	}
-
-	return (result);
-}
-
-/* Using external iterators */
-icalcompiter VComponent::begin_component(icalcomponent_kind kind){
-	return icalcomponent_begin_component(imp, kind);
-}
-icalcompiter VComponent::end_component(icalcomponent_kind kind){
-	return icalcomponent_end_component(imp, kind);
-}
-VComponent* VComponent::next(icalcompiter* i){
-	return (VComponent*)icalcompiter_next(i);
-}
-VComponent* VComponent::prev(icalcompiter* i){
-	return (VComponent*)icalcompiter_prior(i);
-}
-VComponent* VComponent::current(icalcompiter* i){
-	return (VComponent*)icalcompiter_deref(i);
-}
-
-/* Working with embedded error properties */
-int VComponent::count_errors(){
-	return icalcomponent_count_errors(imp);
-}
-
-/* Remove all X-LIC-ERROR properties*/
-void VComponent::strip_errors(){
-	icalcomponent_strip_errors(imp);
-}
-
-/* Convert some X-LIC-ERROR properties into RETURN-STATUS properties*/
-void VComponent::convert_errors(){
-	icalcomponent_convert_errors(imp);
-}
-
-/* Kind conversion routines */
-icalcomponent_kind VComponent::string_to_kind(string str){
-	return icalcomponent_string_to_kind(str);
-}
-string VComponent::kind_to_string(icalcomponent_kind kind){
-	return (string)icalcomponent_kind_to_string(kind);
-}
-
-struct icaltimetype VComponent::get_dtstart(){
-	return icalcomponent_get_dtstart(imp);
-}
-void VComponent::set_dtstart(struct icaltimetype v){
-	icalcomponent_set_dtstart(imp, v);
-}
-
-/* For the icalcomponent routines only, dtend and duration are tied
-   together. If you call the set routine for one and the other exists,
-   the routine will calculate the change to the other. That is, if
-   there is a DTEND and you call set_duration, the routine will modify
-   DTEND to be the sum of DTSTART and the duration. If you call a get
-   routine for one and the other exists, the routine will calculate
-   the return value. If you call a set routine and neither exists, the
-   routine will create the apcompriate comperty.
-*/
-
-struct icaltimetype VComponent::get_dtend(){
-	return icalcomponent_get_dtend(imp);
-}
-
-void VComponent::set_dtend(struct icaltimetype v){
-	icalcomponent_set_dtend(imp, v);
-}
-
-struct icaltimetype VComponent::get_due(){
-        return icalcomponent_get_due(imp);
-}
-void VComponent::set_due(struct icaltimetype v){
-        icalcomponent_set_due(imp, v);
-}
-
-struct icaldurationtype VComponent::get_duration(){
-	return icalcomponent_get_duration(imp);
-}
-void VComponent::set_duration(struct icaldurationtype v){
-	icalcomponent_set_duration(imp, v);
-}
-
-icalproperty_method VComponent::get_method(){
-	return icalcomponent_get_method(imp);
-}
-void VComponent::set_method(icalproperty_method method){
-	icalcomponent_set_method(imp, method);
-}
-
-struct icaltimetype VComponent::get_dtstamp(){
-	return icalcomponent_get_dtstamp(imp);
-}
-void VComponent::set_dtstamp(struct icaltimetype v){
-	icalcomponent_set_dtstamp(imp, v);
-}
-
-string VComponent::get_summary(){
-	return (string)icalcomponent_get_summary(imp);
-}
-void VComponent::set_summary(string v){
-	icalcomponent_set_summary(imp, v);
-}
-
-string VComponent::get_location(){
-        return (string)icalcomponent_get_location(imp);
-}
-void VComponent::set_location(string v){
-        icalcomponent_set_location(imp, v);
-}
-
-
-string VComponent::get_description(){
-        return (string)icalcomponent_get_description(imp);
-}
-void VComponent::set_description(string v){
-        icalcomponent_set_description(imp, v);
-}
-string VComponent::get_comment(){
-	return (string)icalcomponent_get_comment(imp);
-}
-void VComponent::set_comment(string v){
-	icalcomponent_set_comment(imp, v);
-}
-
-string VComponent::get_uid(){
-	return (string)icalcomponent_get_uid(imp);
-}
-void VComponent::set_uid(string v){
-	icalcomponent_set_uid(imp, v);
-}
-
-string VComponent::get_relcalid(){
-	return (string)icalcomponent_get_relcalid(imp);
-}
-void VComponent::set_relcalid(string v){
-	icalcomponent_set_relcalid(imp, v);
-}
-
-struct icaltimetype VComponent::get_recurrenceid(){
-	return icalcomponent_get_recurrenceid(imp);
-}
-void VComponent::set_recurrenceid(struct icaltimetype v){
-	icalcomponent_set_recurrenceid(imp, v);
-}
-
-int VComponent::get_sequence(){
-        return (int)icalcomponent_get_sequence(imp);
-}
-void VComponent::set_sequence(int v){
-        icalcomponent_set_sequence(imp, v);
-}
-
-int VComponent::get_status(){
-        return (int)icalcomponent_get_status(imp);
-}
-void VComponent::set_status(int v){
-        icalcomponent_set_status(imp, v);
-}
-
-/* For VCOMPONENT: Return a reference to the first VEVENT, VTODO, or VJOURNAL */
-VComponent* VComponent::get_first_real_component(){
-	return (VComponent*)icalcomponent_get_first_real_component(imp);
-}
-
-/* For VEVENT, VTODO, VJOURNAL and VTIMEZONE: report the start and end
-   times of an event in UTC */
-struct icaltime_span VComponent::get_span(){
-	return icalcomponent_get_span(imp);
-}
-
-int VComponent::recurrence_is_excluded( struct icaltimetype *dtstart,
-                                       struct icaltimetype *recurtime){
-       return  icalproperty_recurrence_is_excluded(imp, dtstart, recurtime);
-}
-
-
-/* Internal operations. They are private, and you should not be using them. */
-VComponent* VComponent::get_parent() {
-	return new VComponent(icalcomponent_get_parent(imp));
-}
-void VComponent::set_parent(VComponent *parent){
-	icalcomponent_set_parent(imp, *parent);
-}
-
-/* ignoreValue means remove properties even if the data doesn't match */
-bool VComponent::remove(VComponent& fromVC, bool ignoreValue){
-
-    /* the two components must be the same kind */
-    if (this->isa() != fromVC.isa()) return false;
-
-    /* properties first */
-    ICalPropertyTmpPtr propToBeRemoved;
-    for (propToBeRemoved=fromVC.get_first_property(ICAL_ANY_PROPERTY); propToBeRemoved != NULL;
-         propToBeRemoved=fromVC.get_next_property(ICAL_ANY_PROPERTY)) {
-
-        /* loop through properties from this component */
-        ICalPropertyTmpPtr next;
-        ICalPropertyTmpPtr p;
-        for (p=this->get_first_property(propToBeRemoved->isa()); p != NULL; p=next) {
-            next = this->get_next_property(propToBeRemoved->isa());
-            if (ignoreValue)
-                 this->remove_property(p);
-            else {
-                 if (*p == *propToBeRemoved) {
-                     this->remove_property(p);
-                     break;
-                 }
-            }
-        }
-    }
-
-    /* components next - should remove by UID */
-    VComponentTmpPtr comp;
-    for (comp=fromVC.get_first_component(ICAL_ANY_COMPONENT); comp != NULL;
-         comp=fromVC.get_next_component(ICAL_ANY_COMPONENT)) {
-        const char* fromCompUid = comp->get_uid();
-        VComponentTmpPtr c;
-        for (c=this->get_first_component(comp->isa()); c != NULL;
-             c=this->get_next_component(comp->isa())) {
-            const char* thisCompUid = c->get_uid();
-            if (strcmp(fromCompUid, thisCompUid) == 0) {
-                // recursively go down the components
-                c->remove(*comp, ignoreValue);
-                    // if all properties are removed and there is no sub-components, then
-                    // remove this compoent
-                    if ((c->count_properties(ICAL_ANY_PROPERTY) == 0) &&
-                        (c->count_components(ICAL_ANY_COMPONENT) == 0)) {
-                        this->remove_component(c);
-                    }
-                break;
-                }
-            }
-    }
-    
-    return true;
-}
-/* removeMissing == true: remove properties that are missing from fromC */
-/* todo: only change the first occurence of the property */
-/* todo: removeMissing is not implemented */
-bool VComponent::update(VComponent& fromC, bool removeMissing){
-
-    /* make sure they are the same kind */
-    if (this->isa() != fromC.isa()) return false;
-
-    /* property first */
-    ICalPropertyTmpPtr prop;
-    for (prop=fromC.get_first_property(ICAL_ANY_PROPERTY); prop != NULL;
-    	 prop=fromC.get_next_property(ICAL_ANY_PROPERTY)) {
-        ICalPropertyTmpPtr thisProp;
-	thisProp = this->get_first_property(prop->isa());
-    	if (thisProp == NULL) {
-            thisProp = new ICalProperty(prop->isa());
-            this->add_property(thisProp);
-        }
-        ICalValue *value = new ICalValue(*(prop->get_value())); // clone the value
-        thisProp->set_value(*value);
-    }
-
-    /* recursively updating sub-components */
-    VComponentTmpPtr comp;
-    for (comp=fromC.get_first_component(ICAL_ANY_COMPONENT); comp != NULL;
-         comp=fromC.get_next_component(ICAL_ANY_COMPONENT)) {
-        VComponentTmpPtr thisComp;
-        thisComp = this->get_first_component(comp->isa());
-        if (thisComp == NULL) {
-            thisComp = new VComponent(comp->isa());
-            this->add_component(thisComp);
-        }
-        bool err = thisComp->update(*comp, removeMissing);
-        if (!err) return false;
-    }
-    return true;
-}
-/* add components and property. recursively goes down child components */
-bool VComponent::add(VComponent& fromC){
-	/* make sure the kind are the same */
-	if (this->isa() != fromC.isa()) return false;
-
-	/* properties first */
-    ICalPropertyTmpPtr prop;
-	for (prop=fromC.get_first_property(ICAL_ANY_PROPERTY); prop != NULL;
-		 prop=fromC.get_next_property(ICAL_ANY_PROPERTY)) {
-		/* clone another property */
-		ICalProperty *p = new ICalProperty(*prop);
-		add_property(p);
-	}
-
-	/* sub-components next */
-	bool err = false;
-    VComponentTmpPtr comp;
-	for (comp=fromC.get_first_component(ICAL_ANY_COMPONENT); comp != NULL;
-		 comp=fromC.get_next_component(ICAL_ANY_COMPONENT)) {
-		VComponent *c = new VComponent(comp->isa());
-		err = c->add(*comp);
-		add_component(c);
-	}
-
-	return true;
-}
-
-VCalendar::VCalendar() : VComponent(icalcomponent_new_vcalendar()){
-}
-VCalendar::VCalendar(const VCalendar& v) : VComponent(v) {}
-VCalendar& VCalendar::operator=(const VCalendar& v){
-	if (this == &v) return *this;
-	VComponent::operator=(v);
-
-	return *this;
-}
-VCalendar::~VCalendar(){}
-
-VCalendar::VCalendar(icalcomponent* v) : VComponent(v){}
-VCalendar::VCalendar(string str) : VComponent(str){}
-
-
-/* VEvent */
-
-VEvent::VEvent() : VComponent(icalcomponent_new_vevent()){}
-VEvent::VEvent(const VEvent& v) : VComponent(v) {}
-VEvent& VEvent::operator=(const VEvent& v){
-	if (this == &v) return *this;
-	VComponent::operator=(v);
-
-	return *this;
-}
-VEvent::~VEvent(){}
-
-VEvent::VEvent(icalcomponent* v) : VComponent(v){}
-VEvent::VEvent(string str) : VComponent(str){}
-
-
-/* VTodo */
-
-VToDo::VToDo() : VComponent(icalcomponent_new_vtodo()){}
-VToDo::VToDo(const VToDo& v) : VComponent(v) {}
-VToDo& VToDo::operator=(const VToDo& v){
-	if (this == &v) return *this;
-	VComponent::operator=(v);
-
-	return *this;
-}
-VToDo::~VToDo(){}
-
-VToDo::VToDo(icalcomponent* v) : VComponent(v){}
-VToDo::VToDo(string str) : VComponent(str){}
-
-
-/* VAgenda */
-
-VAgenda::VAgenda() : VComponent(icalcomponent_new_vagenda()){}
-VAgenda::VAgenda(const VAgenda& v) : VComponent(v) {}
-VAgenda& VAgenda::operator=(const VAgenda& v){
-        if (this == &v) return *this;
-        VComponent::operator=(v);
-
-        return *this;
-}
-VAgenda::~VAgenda(){}
-
-VAgenda::VAgenda(icalcomponent* v) : VComponent(v){}
-VAgenda::VAgenda(string str) : VComponent(str){}
-
-
-/* VQuery */
-
-VQuery::VQuery() : VComponent(icalcomponent_new_vquery()){}
-VQuery::VQuery(const VQuery& v) : VComponent(v) {}
-VQuery& VQuery::operator=(const VQuery& v){
-	if (this == &v) return *this;
-	VComponent::operator=(v);
-
-	return *this;
-}
-VQuery::~VQuery(){}
-
-VQuery::VQuery(icalcomponent* v) : VComponent(v){}
-VQuery::VQuery(string str) : VComponent(str){}
-
-
-/* VJournal */
-
-VJournal::VJournal() : VComponent(icalcomponent_new_vjournal()){}
-VJournal::VJournal(const VJournal& v) : VComponent(v) {}
-VJournal& VJournal::operator=(const VJournal& v){
-	if (this == &v) return *this;
-	VComponent::operator=(v);
-
-	return *this;
-}
-VJournal::~VJournal(){}
-
-VJournal::VJournal(icalcomponent* v) : VComponent(v){}
-VJournal::VJournal(string str) : VComponent(str){}
-
-
-/* VAlarm */
-
-VAlarm::VAlarm() : VComponent(icalcomponent_new_valarm()){}
-VAlarm::VAlarm(const VAlarm& v) : VComponent(v) {}
-VAlarm& VAlarm::operator=(const VAlarm& v){
-	if (this == &v) return *this;
-	VComponent::operator=(v);
-
-	return *this;
-}
-VAlarm::~VAlarm(){}
-
-VAlarm::VAlarm(icalcomponent* v) : VComponent(v){}
-VAlarm::VAlarm(string str) : VComponent(str){}
-
-icalrequeststatus
-VAlarm::getTriggerTime(VComponent &c, struct icaltriggertype *tr)
-{
-  struct icaltimetype tt;
-  ICalParameter *related_param;
-
-  ICalPropertyTmpPtr trigger_prop = this->get_first_property(ICAL_TRIGGER_PROPERTY);
-
-  // all VALARMs must have a TRIGGER
-  if (trigger_prop == NULL)  
-    return ICAL_3_1_INVPROPVAL_STATUS; 
-
-  *tr = trigger_prop->get_trigger();
-
-  tt = icaltime_null_time();
-
-  if (icaltime_is_null_time(tr->time)) {
-
-    // relative time trigger
-
-    // TRIGGER;RELATED=END:P5M 5 minutes after END
-    // TRIGGER;RELATED=START:-P15M 15 minutes before START
-    // get RELATED parameter
-
-    related_param = trigger_prop->get_first_parameter(ICAL_RELATED_PARAMETER);
-
-    if (related_param && related_param->is_valid()) {
-
-        // get RELATED parameter value
-        icalparameter_related related = related_param->get_related();
-
-        if(related) {
-            switch(related) {
-                case ICAL_RELATED_END:
-                    if (c.isa() == ICAL_VEVENT_COMPONENT) {
-                        tt = c.get_dtend();
-
-			// If a recurrenceid exists, use that to calculate the
-			// dtend from the dtstart.
-			struct icaltimetype recur_time = c.get_recurrenceid();
-			if (!(icaltime_is_null_time(recur_time))) {
-			    struct icaldurationtype dur = icaltime_subtract(c.get_dtstart(), tt);
-			    tt = icaltime_add(recur_time, dur);
-		        } 
-		    }	
-                    else if (c.isa() == ICAL_VTODO_COMPONENT) {
-                        tt = c.get_due();
-			struct icaltimetype recur_time = c.get_recurrenceid();
-			if (!(icaltime_is_null_time(recur_time))) {
-			    tt = recur_time;
-			}
-		    }
-                    // @@@ TODO: if not DTEND or DUE, then DTSTART and DURATION must be present
-                break;
-                case ICAL_RELATED_START:
-                case ICAL_RELATED_X:
-                case ICAL_RELATED_NONE:
-                default:
-                    tt = c.get_dtstart();
-                    struct icaltimetype recur_time = c.get_recurrenceid();
-                    if (!(icaltime_is_null_time(recur_time))) {
-                        tt = recur_time;
-                    }
-                break;
-            }
-
-        }
-    }
-    else { // no RELATED explicity specified, the default is 
-           // relative to the start of an event or to-do, rfc2445
-        // if no RELATED, we are forced to use dtstart for VEVENT,
-        // due for VTODO to calculate trigger time. 
-	// If a recur time exists, use that. Recur time trumps dtstart or due.
-        struct icaltimetype recur_time = c.get_recurrenceid();
-	if (!(icaltime_is_null_time(recur_time))) {
-	    tt = recur_time;
-	}
-	else if (c.isa() == ICAL_VEVENT_COMPONENT)
-            tt = c.get_dtstart();
-        else if (c.isa() == ICAL_VTODO_COMPONENT)
-            tt = c.get_due();
-    }
-
-    // malformed? encapsulating VEVENT or VTODO MUST have DTSTART/DTEND 
-    if(icaltime_is_null_time(tt))
-      return ICAL_3_1_INVPROPVAL_STATUS;;
-
-    // now offset using tr.duration
-    tr->time = icaltime_add(tt, tr->duration);
-  }
-  // else absolute time trigger
-
-  return ICAL_2_0_SUCCESS_STATUS;
-}
-
-
-/* VFreeBusy */
-
-VFreeBusy::VFreeBusy() : VComponent(icalcomponent_new_vfreebusy()){}
-VFreeBusy::VFreeBusy(const VFreeBusy& v) : VComponent(v) {}
-VFreeBusy& VFreeBusy::operator=(const VFreeBusy& v){
-	if (this == &v) return *this;
-	VComponent::operator=(v);
-
-	return *this;
-}
-VFreeBusy::~VFreeBusy(){}
-
-VFreeBusy::VFreeBusy(icalcomponent* v) : VComponent(v){}
-VFreeBusy::VFreeBusy(string str) : VComponent(str){}
-
-
-/* VTimezone */
-
-VTimezone::VTimezone() : VComponent(icalcomponent_new_vtimezone()){}
-VTimezone::VTimezone(const VTimezone& v) : VComponent(v) {}
-VTimezone& VTimezone::operator=(const VTimezone& v){
-	if (this == &v) return *this;
-	VComponent::operator=(v);
-
-	return *this;
-}
-VTimezone::~VTimezone(){}
-
-VTimezone::VTimezone(icalcomponent* v) : VComponent(v){}
-VTimezone::VTimezone(string str) : VComponent(str){}
-
-
-/* XStandard */
-
-XStandard::XStandard() : VComponent(icalcomponent_new_xstandard()){}
-XStandard::XStandard(const XStandard& v) : VComponent(v) {}
-XStandard& XStandard::operator=(const XStandard& v){
-	if (this == &v) return *this;
-	VComponent::operator=(v);
-
-	return *this;
-}
-XStandard::~XStandard(){}
-
-XStandard::XStandard(icalcomponent* v) : VComponent(v){}
-XStandard::XStandard(string str) : VComponent(str){}
-
-
-/* XDaylight */
-
-XDaylight::XDaylight() : VComponent(icalcomponent_new_xdaylight()){}
-XDaylight::XDaylight(const XDaylight& v) : VComponent(v) {}
-XDaylight& XDaylight::operator=(const XDaylight& v){
-	if (this == &v) return *this;
-	VComponent::operator=(v);
-
-	return *this;
-}
-XDaylight::~XDaylight(){}
-
-XDaylight::XDaylight(icalcomponent* v) : VComponent(v){}
-XDaylight::XDaylight(string str) : VComponent(str){}
diff --git a/libical/src/libical/vcomponent.h b/libical/src/libical/vcomponent.h
deleted file mode 100644
index fb128adc1c..0000000000
--- a/libical/src/libical/vcomponent.h
+++ /dev/null
@@ -1,340 +0,0 @@
-/* -*- Mode: C++ -*- */
-
-/**
- * @file    vcomponent.h
- * @author  fnguyen (12/10/01)
- * @brief   C++ classes for the icalcomponent wrapper (VToDo VEvent, etc..).
- *
- * (C) COPYRIGHT 2001, Critical Path
- */
-
-#ifndef VCOMPONENT_H
-#define VCOMPONENT_H
-
-#include "ical.h"
-#include "icptrholder.h"
-
-typedef	char* string; // Will use the string library from STL
-
-class ICalProperty;
-
-/**
- * @class VComponent
- * @brief A class wrapping the libical icalcomponent functions
- *
- * @exception icalerrorenum   Any errors generated in libical are
- *                            propogated via this exception type.
- */
-
-class VComponent {
-public:
-	VComponent()                             throw (icalerrorenum);
-	VComponent(const VComponent&)            throw (icalerrorenum);
-	VComponent& operator=(const VComponent&) throw (icalerrorenum);
-	virtual ~VComponent();
-
-	VComponent(icalcomponent* v)        throw (icalerrorenum);
-	VComponent(string str)              throw (icalerrorenum);
-	VComponent(icalcomponent_kind kind) throw (icalerrorenum);;
-
-	operator icalcomponent* () { return imp; }
-
-	void new_from_string(string str);
-
-	// detach imp to this object. use with caution. it would cause
-	// memory leak if you are not careful.
-	void detach() {
-	    imp = NULL;
-	}
-
-public:
-	string as_ical_string() throw (icalerrorenum);
-	bool is_valid();
-	icalcomponent_kind isa();
-	int isa_component(void* component);
-
-	/// Working with properties
-	void add_property(ICalProperty* property);
-	void remove_property(ICalProperty* property);
-	int count_properties(icalproperty_kind kind);
-
-	// Iterate through the properties
-	ICalProperty* get_current_property();
-	ICalProperty* get_first_property(icalproperty_kind kind);
-	ICalProperty* get_next_property(icalproperty_kind kind);
-
-	// Working with components
-
-	/**
-	 *  Return the first VEVENT, VTODO or VJOURNAL sub-component if
-	 *   it is one of those types 
-	 */
-
-	VComponent* get_inner();
-
-	void add_component(VComponent* child);
-	void remove_component(VComponent* child);
-	int count_components(icalcomponent_kind kind);
-
-	/**
-	 * Iteration Routines. There are two forms of iterators,
-	 * internal and external. The internal ones came first, and
-	 * are almost completely sufficient, but they fail badly when
-	 * you want to construct a loop that removes components from
-	 * the container.
-	*/
-
-	/// Iterate through components
-	VComponent* get_current_component();
-	VComponent* get_first_component(icalcomponent_kind kind);
-	VComponent* get_next_component(icalcomponent_kind kind);
-
-	/// Using external iterators
-	icalcompiter begin_component(icalcomponent_kind kind);
-	icalcompiter end_component(icalcomponent_kind kind);
-	VComponent* next(icalcompiter* i);
-	VComponent* prev(icalcompiter* i);
-	VComponent* current(icalcompiter* i);
-
-	/// Working with embedded error properties
-	int count_errors();
-
-	/// Remove all X-LIC-ERROR properties
-	void strip_errors();
-
-	/// Convert some X-LIC-ERROR properties into RETURN-STATUS properties
-	void convert_errors();
-
-	/// Kind conversion routines 
-	static icalcomponent_kind string_to_kind(string str);
-	static string kind_to_string(icalcomponent_kind kind);
-
-public:
-	struct icaltimetype get_dtstart();
-	void set_dtstart(struct icaltimetype v);
-
-	/** For the icalcomponent routines only, dtend and duration
-	 *  are tied together. If you call the set routine for one and
-	 *  the other exists, the routine will calculate the change to
-	 *  the other. That is, if there is a DTEND and you call
-	 *  set_duration, the routine will modify DTEND to be the sum
-	 *  of DTSTART and the duration. If you call a get routine for
-	 *  one and the other exists, the routine will calculate the
-	 *  return value. If you call a set routine and neither
-	 *  exists, the routine will create the apropriate property
-	*/
-
-	struct icaltimetype get_dtend();
-	void set_dtend(struct icaltimetype v);
-
-        struct icaltimetype get_due();
-        void set_due(struct icaltimetype v);
-
-	struct icaldurationtype get_duration();
-	void set_duration(struct icaldurationtype v);
-
-	icalproperty_method get_method();
-	void set_method(icalproperty_method method);
-
-	struct icaltimetype get_dtstamp();
-	void set_dtstamp(struct icaltimetype v);
-
-	string get_summary();
-	void set_summary(string v);
-
-        string get_location();
-        void set_location(string v);
-
-        string get_description();
-        void set_description(string v);
-
-	string get_comment();
-	void set_comment(string v);
-
-	string get_uid();
-	void set_uid(string v);
-
-	string get_relcalid();
-	void set_relcalid(string v);
-
-	struct icaltimetype get_recurrenceid();
-	void set_recurrenceid(struct icaltimetype v);
-
-        int get_sequence();
-        void set_sequence(int v);
-
-        int get_status();
-        void set_status(int v);
-
-
-public:
-	/**
-	 * For VCOMPONENT: Return a reference to the first VEVENT,
-	 * VTODO, or VJOURNAL
-	*/
-	VComponent* get_first_real_component();
-
-	/** 
-	 * For VEVENT, VTODO, VJOURNAL and VTIMEZONE: report the
-	 * start and end times of an event in UTC 
-	 */
-	virtual struct icaltime_span get_span();
-
-        int recurrence_is_excluded(struct icaltimetype *dtstart,
-                                   struct icaltimetype *recurtime);
-
-
-public:
-	/**
-	   helper functions for adding/removing/updating property and
-	   sub-components */
-
-	/// Note: the VComponent kind have to be the same
-
-	bool remove(VComponent&, bool ignoreValue);
-	bool update(VComponent&, bool removeMissing);
-	bool add(VComponent&);
-
-private:
-	/* Internal operations. They are private, and you should not be using them. */
-	VComponent* get_parent();
-	void set_parent(VComponent *parent);
-
-        char* quote_ical_string(char* str);
-
-private:
-	icalcomponent* imp;
-};
-
-class VCalendar : public VComponent {
-public:
-	VCalendar();
-	VCalendar(const VCalendar&);
-	VCalendar& operator=(const VCalendar&);
-	~VCalendar();
-
-	VCalendar(icalcomponent* v);
-	VCalendar(string str);
-};
-
-
-class VEvent : public VComponent {
-public:
-	VEvent();
-	VEvent(const VEvent&);
-	VEvent& operator=(const VEvent&);
-	~VEvent();
-
-	VEvent(icalcomponent* v);
-	VEvent(string str);
-};
-
-class VToDo : public VComponent {
-public:
-	VToDo();
-	VToDo(const VToDo&);
-	VToDo& operator=(const VToDo&);
-	~VToDo();
-
-	VToDo(icalcomponent* v);
-	VToDo(string str);
-};
-
-class VAgenda : public VComponent {
-public:
-        VAgenda();
-        VAgenda(const VAgenda&);
-        VAgenda& operator=(const VAgenda&);
-        ~VAgenda();
-
-	VAgenda(icalcomponent* v);
-        VAgenda(string str);
-};
-
-class VQuery : public VComponent {
-public:
-	VQuery();
-	VQuery(const VQuery&);
-	VQuery& operator=(const VQuery&);
-	~VQuery();
-
-	VQuery(icalcomponent* v);
-	VQuery(string str);
-};
-
-class VJournal : public VComponent {
-public:
-	VJournal();
-	VJournal(const VJournal&);
-	VJournal& operator=(const VJournal&);
-	~VJournal();
-
-	VJournal(icalcomponent* v);
-	VJournal(string str);
-};
-
-class VAlarm : public VComponent {
-public:
-	VAlarm();
-	VAlarm(const VAlarm&);
-	VAlarm& operator=(const VAlarm&);
-	~VAlarm();
-
-	VAlarm(icalcomponent* v);
-	VAlarm(string str);
-
-	/**
-	 *  compute the absolute trigger time for this alarm. trigger
-	 *  may be related to the containing component c.  the result
-	 *  is populated in tr->time
-	 */
-	icalrequeststatus getTriggerTime(VComponent &c, struct icaltriggertype *tr);
-};
-
-class VFreeBusy : public VComponent {
-public:
-	VFreeBusy();
-	VFreeBusy(const VFreeBusy&);
-	VFreeBusy& operator=(const VFreeBusy&);
-	~VFreeBusy();
-
-	VFreeBusy(icalcomponent* v);
-	VFreeBusy(string str);
-};
-
-class VTimezone : public VComponent {
-public:
-	VTimezone();
-	VTimezone(const VTimezone&);
-	VTimezone& operator=(const VTimezone&);
-	~VTimezone();
-
-	VTimezone(icalcomponent* v);
-	VTimezone(string str);
-};
-
-class XStandard : public VComponent {
-public:
-	XStandard();
-	XStandard(const XStandard&);
-	XStandard& operator=(const XStandard&);
-	~XStandard();
-
-	XStandard(icalcomponent* v);
-	XStandard(string str);
-};
-
-class XDaylight : public VComponent {
-public:
-	XDaylight();
-	XDaylight(const XDaylight&);
-	XDaylight& operator=(const XDaylight&);
-	~XDaylight();
-
-	XDaylight(icalcomponent* v);
-	XDaylight(string str);
-};
-
-typedef ICPointerHolder<VComponent> VComponentTmpPtr; /* see icptrholder.h for comments */
-
-#endif /* VComponent_H */
diff --git a/libical/src/libical/vsnprintf.c b/libical/src/libical/vsnprintf.c
deleted file mode 100644
index 982920b21c..0000000000
--- a/libical/src/libical/vsnprintf.c
+++ /dev/null
@@ -1,172 +0,0 @@
-#ifndef WIN32
-#include "config.h"
-#endif
-#ifndef HAVE_SNPRINTF
-/*
- * Revision 12: http://theos.com/~deraadt/snprintf.c
- *
- * Copyright (c) 1997 Theo de Raadt
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WIN32
-#include <sys/param.h>
-#include <sys/mman.h>
-#include <unistd.h>
-#endif
-#include <sys/types.h>
-#include <signal.h>
-#include <stdio.h>
-#include <string.h>
-#if __STDC__
-#include <stdarg.h>
-#include <stdlib.h>
-#else
-#include <varargs.h>
-#endif
-#include <setjmp.h>
-
-#ifndef roundup
-#define roundup(x, y) ((((x)+((y)-1))/(y))*(y))
-#endif
-
-static int pgsize;
-static char *curobj;
-static sigjmp_buf bail;
-
-#define EXTRABYTES	2	/* XXX: why 2? you don't want to know */
-
-static char *
-msetup(str, n)
-	char *str;
-	size_t n;
-{
-	char *e;
-
-	if (n == 0)
-		return NULL;
-	if (pgsize == 0)
-		pgsize = getpagesize();
-	curobj = (char *)malloc(n + EXTRABYTES + pgsize * 2);
-	if (curobj == NULL)
-		return NULL;
-	e = curobj + n + EXTRABYTES;
-	e = (char *)roundup((unsigned long)e, pgsize);
-	if (mprotect(e, pgsize, PROT_NONE) == -1) {
-		free(curobj);
-		curobj = NULL;
-		return NULL;
-	}
-	e = e - n - EXTRABYTES;
-	*e = '\0';
-	return (e);
-}
-
-static void
-mcatch(int i)
-{
-	siglongjmp(bail, 1);
-}
-
-static void
-mcleanup(str, n, p)
-	char *str;
-	size_t n;
-	char *p;
-{
-	strncpy(str, p, n-1);
-	str[n-1] = '\0';
-	if (mprotect((caddr_t)(p + n + EXTRABYTES), pgsize,
-	    PROT_READ|PROT_WRITE|PROT_EXEC) == -1)
-		mprotect((caddr_t)(p + n + EXTRABYTES), pgsize,
-		    PROT_READ|PROT_WRITE);
-	free(curobj);
-}
-
-int
-#if __STDC__
-vsnprintf(char *str, size_t n, char const *fmt, va_list ap)
-#else
-vsnprintf(str, n, fmt, ap)
-	char *str;
-	size_t n;
-	char *fmt;
-	char *ap;
-#endif
-{
-	struct sigaction osa, nsa;
-	char *p;
-	int ret = n + 1;	/* if we bail, indicated we overflowed */
-
-	memset(&nsa, 0, sizeof nsa);
-	nsa.sa_handler = mcatch;
-	sigemptyset(&nsa.sa_mask);
-
-	p = msetup(str, n);
-	if (p == NULL) {
-		*str = '\0';
-		return 0;
-	}
-	if (sigsetjmp(bail, 1) == 0) {
-		if (sigaction(SIGSEGV, &nsa, &osa) == -1) {
-			mcleanup(str, n, p);
-			return (0);
-		}
-		ret = vsprintf(p, fmt, ap);
-	}
-	mcleanup(str, n, p);
-	(void) sigaction(SIGSEGV, &osa, NULL);
-	return (ret);
-}
-
-int
-#if __STDC__
-snprintf(char *str, size_t n, char const *fmt, ...)
-#else
-snprintf(str, n, fmt, va_alist)
-	char *str;
-	size_t n;
-	char *fmt;
-	va_dcl
-#endif
-{
-	va_list ap;
-#if __STDC__
-	va_start(ap, fmt);
-#else
-	va_start(ap);
-#endif
-
-	return (vsnprintf(str, n, fmt, ap));
-	va_end(ap);
-}
-
-
-#else
-
-/* ANSI C forbids an empty source file... */
-
-static void vsnprintf_dummy_func() {
-   vsnprintf_dummy_func();
-}
-
-#endif
diff --git a/libical/src/libicalcap/.cvsignore b/libical/src/libicalcap/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/libical/src/libicalcap/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/libical/src/libicalcap/Makefile.am b/libical/src/libicalcap/Makefile.am
deleted file mode 100644
index f6112b7c05..0000000000
--- a/libical/src/libicalcap/Makefile.am
+++ /dev/null
@@ -1,73 +0,0 @@
-#======================================================================
-#  FILE: Makefile.am
-#  CREATOR: acampi 
-#  
-#  $Id: Makefile.am,v 1.5 2003/10/21 18:28:26 ettore Exp $
-#
-#
-# (C) COPYRIGHT 2003, Andrea Campi, mailto:a.campi@inet.it
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either: 
-#
-#    The LGPL as published by the Free Software Foundation, version
-#    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-#
-#  Or:
-#
-#    The Mozilla Public License Version 1.0. You may obtain a copy of
-#    the License at http://www.mozilla.org/MPL/
-#
-#  
-#
-#======================================================================
-
-
-lib_LTLIBRARIES = libicalcap-evolution.la
-
-INCLUDES =			\
-	-I$(top_builddir)	\
-	-I$(top_srcdir)/src	\
-	-I$(top_builddir)/src	\
-	-I$(top_srcdir)/src/libical	\
-	-I$(top_builddir)/libical	\
-	-I$(srcdir)		\
-	-DWITH_RR $(RRCAP_CFLAGS)
-
-libicalcap_evolution_la_LDFLAGS = $(RRCAP_LIBS) -version-info 0:0:0
-
-
-libicalcap_evolution_la_SOURCES =		\
-	icalcap.c		\
-	icalcap.h		\
-	icalcap_impl.h		\
-	icalcap_message.c	\
-	icalcap_message_impl.h	\
-	icalcap_rr.c		\
-	icalcap_server.c	\
-	icalcap_server.h	\
-	icalcap_server_impl.h	\
-	icalcap_session.c	\
-	icalcap_session.h	\
-	icalcap_session_impl.h	\
-	icalcap_utils.c
-
-libicalcap_evolutionincludedir = $(includedir)
-
-libicalcap_evolutioninclude_HEADERS =	\
-	icalcap.h		\
-	icalcap_impl.h		\
-	icalcap_message_impl.h	\
-	icalcap_server.h	\
-	icalcap_server_impl.h	\
-	icalcap_session.h	\
-	icalcap_session_impl.h
-
-
-noinst_PROGRAMS = client
-
-LDADD =  ../libicalss/libicalss-evolution.la ../libicalvcal/libicalvcal-evolution.la ../libical/libical-evolution.la libicalcap-evolution.la $(RRCAP_LIBS)
-
-
-client_SOURCES = client.c
-
diff --git a/libical/src/libicalcap/client.c b/libical/src/libicalcap/client.c
deleted file mode 100644
index 399568ac79..0000000000
--- a/libical/src/libicalcap/client.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/*-
- * $Id$
- *
- * See the file LICENSE for redistribution information. 
- * If you have not received a copy of the license, please contact CodeFactory
- * by email at info@codefactory.se, or on the web at http://www.codefactory.se/
- * You may also write to: CodeFactory AB, SE-903 47, Umeå, Sweden.
- *
- * Copyright (c) 2002 Jonas Borgström <jonas@codefactory.se>
- * Copyright (c) 2002 Daniel Lundin   <daniel@codefactory.se>
- * Copyright (c) 2002 CodeFactory AB.  All rights reserved.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <librr/rr.h>
-
-#include "icalcap.h"
-#include "icalcap_session.h"
-
-#define CLIENT_CAPABILITY \
-"Content-Type: text/html\n\n\
-BEGIN:VCALENDAR\n\
-VERSION:2.0\n\
-PRODIR:rrcap-client\n\
-CMD:REPLY\n\
-BEGIN:VREPLY\n\
-CAP-VERSION:1.0\n\
-PRODID:rrcap-client\n\
-QUERY-LEVEL:CAL-QL-NONE\n\
-CAR-LEVEL:CAR-FULL-NONE\n\
-DATE-MAX:99991231T235959Z\n\
-DATE-MIN:00000101T000000Z\n\
-MAX-COMPONENT-SIZE:0\n\
-COMPONENTS:VCALENDAR,VTODO,VJOURNAL,VEVENT,VCAR,\n\
- VALARM,VFREEBUSY,VTIMEZONE,STANDARD,DAYLIGHT,VREPLY\n\
-ITIP-VERSION:2447\n\
-RECUR-ACCEPTED:TRUE\n\
-RECUR-EXPAND:TRUE\n\
-RECUR-LIMIT:0\n\
-STORES-EXPANDED:FALSE\n\
-END:VREPLY\n\
-END:VCALENDAR\n"
-
-
-icalcomponent *
-icalcap_send_cmd(const icalcap *cap, const gchar *cmd, const gchar *id, int timeout) {
-
-	icalcap_message*capmsg;
-	icalcomponent  *comp, *ret = NULL;
-	icalproperty   *prop;
-
-	prop = icalproperty_vanew_cmd(
-		icalproperty_string_to_enum(cmd),
-		icalparameter_new_id(id),
-		0);
-
-	if (timeout > 0) {
-		char buf[16];
-
-		snprintf(buf, 16, "%d", timeout);
-		icalproperty_add_parameter(prop,
-			icalparameter_new_latency(buf));
-
-		icalproperty_add_parameter(prop,
-			icalparameter_new_actionparam(ICAL_ACTIONPARAM_ABORT));
-	}
-
-	comp = icalcomponent_vanew(
-		ICAL_VCALENDAR_COMPONENT,
-		icalproperty_new_version("2.0"),
-		icalproperty_new_prodid("-//I.Net spa//NONSGML//EN"),
-		prop,
-		0);
-
-	capmsg = icalcap_message_new(cap, comp);
-	ret = icalcap_message_sync_send(capmsg, timeout);
-	icalcap_message_free(capmsg);
-	icalcomponent_free(comp);
-
-	return ret;
-}
-
-icalcomponent *
-icalcap_new_reply_component(const char *id, const icalcomponent *comp) {
-
-	if (comp == NULL)
-		return NULL;
-
-	return icalcomponent_vanew(
-		ICAL_VCALENDAR_COMPONENT,
-		icalproperty_new_version("2.0"),
-		icalproperty_new_prodid("-//I.Net spa//NONSGML//EN"),
-		icalproperty_vanew_cmd(
-			ICAL_CMD_REPLY,
-/* 			icalparameter_new_id(id), */
-			0),
-		comp,
-		0);
-}
-
-
-static int
-msg_handler(const icalcap_message *capmsg) {
-
-	icalcomponent *reply;
-
-	g_message("Got: %s", icalcomponent_as_ical_string(capmsg->comp));
-
-	/* FIXME Check it's a GET-CAPABILITY */
-
-	reply = icalcap_new_reply_component(NULL, capmsg->comp);
-	if (reply == NULL) {
-		return FALSE;
-	}
-
-	icalcomponent_add_property(reply,
-		icalproperty_new_prodid("client"));
-
-	icalcomponent_free(reply);
-	return TRUE;
-}
-
-int
-main (gint argc, gchar **argv)
-{
-	icalcap_session*conn;
-	icalcap	       *cap;
-	icalcomponent  *comp;
-
-	int		i, n;
-	int		verbose = 0;
-
-	if ((conn = icalcap_session_new()) == NULL) {
-		fprintf(stderr, "Init failed\n");
-		exit(0);
-	}
-
-	if (!icalcap_session_connect(conn, "gundam.inet.it", 0)) {
-		fprintf(stderr, "Connect failed\n");
-		exit(0);
-	}
-
-	if (!icalcap_session_login(conn, "user@example.com", "user@example.com", "password")) {
-		fprintf(stderr, "Login failed\n");
-		exit(0);
-	}
-
-	if ((cap = icalcap_session_start(conn, msg_handler)) == NULL) {
-		fprintf(stderr, "Start failed\n");
-		exit(0);
-	}
-
-	if (argc > 1 && *argv[1] == '1')
-		n = 100;
-	else
-		n = 1;
-
-	for (i=0; i<n; i++) {
-		g_print("Test 1: %d\n", i);
-
-		if ((comp = icalcap_send_cmd(cap, "GET-CAPABILITY", "zero",15))
-		    == NULL) {
-			fprintf(stderr, "Send failed\n");
-			exit(0);
-		}
-
-		if (verbose)
-			g_print("Got %s\n", icalcomponent_as_ical_string(comp));
-
-		if (comp)
-			icalcomponent_free(comp);
-	}
-
-	if (!icalcap_stop(cap)) {
-		fprintf(stderr, "Stop failed\n");
-		exit(0);
-	}
-
-	if (!icalcap_session_disconnect(conn)) {
-		fprintf(stderr, "Disconnect failed\n");
-		exit(0);
-	}
-
-	return 0;
-}
diff --git a/libical/src/libicalcap/icalcap.c b/libical/src/libicalcap/icalcap.c
deleted file mode 100644
index 8d404f0ad4..0000000000
--- a/libical/src/libicalcap/icalcap.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include "config.h"
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#include "icalcap.h"
-#include "icalcap_impl.h"
-#include "icalcap_session_impl.h"	/* FIXME */
-
-
-void
-icalcap_free(icalcap *cap) {
-
-#ifdef WITH_RR
-	icalcap_free_rr(cap);
-#endif
-}
-
-int
-icalcap_stop(icalcap *cap) {
-
-#ifdef WITH_RR
-	return icalcap_stop_rr(cap);
-#else
-	return 0;
-#endif
-}
-
-const char *
-icalcap_get_username(const icalcap *cap) {
-
-#ifdef WITH_RR
-	if (cap == NULL || cap->username == NULL)
-		return NULL;
-
-	return cap->username;
-#else
-	return NULL;
-#endif
-}
diff --git a/libical/src/libicalcap/icalcap.h b/libical/src/libicalcap/icalcap.h
deleted file mode 100644
index 5e61bf9c8e..0000000000
--- a/libical/src/libicalcap/icalcap.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef __ICALCAP_H__
-#define __ICALCAP_H__
-
-#include <ical.h>
-
-/*
- * Opaque objects
- */
-typedef struct _icalcap icalcap;
-typedef struct _icalerror icalerror;
-typedef struct _icalcap_message icalcap_message;
-
-/*
- * Callback
- */
-typedef int  (*icalcap_msg_handler)(const icalcap_message *msg);
-
-/*
- * icalcap member functions
- */
-void		icalcap_free(icalcap *cap);
-int		icalcap_stop(icalcap *cap);
-const char     *icalcap_get_username(const icalcap *cap);
-
-/*
- * icalcap_message member functions
- */
-
-struct _icalcap_message {
-	icalcap			       *cap;
-	int				type;
-
-	icalcomponent		       *comp;
-};
-
-icalcap_message*icalcap_message_new(const icalcap *cap, const icalcomponent *comp);
-icalcap_message*icalcap_message_new_reply(const icalcap_message *capmsg, const icalcomponent *comp);
-void		icalcap_message_free(icalcap_message *capmsg);
-
-int		icalcap_message_reply_error(const icalcap_message *orig, enum icalrequeststatus status,
-			const char *msg, const char *debug);
-int		icalcap_message_reply_component(const icalcap_message *orig, icalcomponent *comp);
-
-int		icalcap_message_send(icalcap_message *capmsg);
-icalcomponent  *icalcap_message_sync_send(icalcap_message *capmsg, int timeout);
-
-#endif
diff --git a/libical/src/libicalcap/icalcap_impl.h b/libical/src/libicalcap/icalcap_impl.h
deleted file mode 100644
index 19f8c1db06..0000000000
--- a/libical/src/libicalcap/icalcap_impl.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef __ICALCAP_IMPL_H__
-#define __ICALCAP_IMPL_H__
-
-#include "icalcap_session.h"
-
-#ifdef WITH_RR
-
-#include <librr/rr.h>
-#include <librrsasl/rr-sasl.h>
-#include <librrtls/rr-tls.h>
-#include <librrcap/rr-cap.h>
-
-struct _icalcap {
-	RRCAP	       *chan;
-	const char     *username,
-		       *authname;
-};
-
-struct _icalerror {
-	GError *err;
-};
-
-
-void	icalcap_free_rr(icalcap *cap);
-
-int	icalcap_stop_rr(icalcap *cap);
-
-icalcomponent *icalcap_send_component_rr(const icalcap *cap, const icalcomponent *comp, int timeout);
-
-#else
-#error "No implementation of icalcap found!"
-#endif
-
-#endif
diff --git a/libical/src/libicalcap/icalcap_message.c b/libical/src/libicalcap/icalcap_message.c
deleted file mode 100644
index 32abbf0a73..0000000000
--- a/libical/src/libicalcap/icalcap_message.c
+++ /dev/null
@@ -1,225 +0,0 @@
-#include "config.h"
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#include "ical.h"
-#include "icalcap.h"
-#include "icalcap_message_impl.h"
-
-
-/**
- * constructor
- *
- * Create a new icalcap_message from a component. This represents a command.
- */
-icalcap_message *
-icalcap_message_new(const icalcap *cap, const icalcomponent *comp) {
-
-	icalcap_message *ret = NULL;
-
-#ifdef WITH_RR
-	ret = icalcap_message_new_rr(cap, comp);
-#else
-	ret = NULL;
-#endif
-	return ret;
-}
-
-/**
- * constructor
- *
- * Create a new icalcap_message from a component. This represents a reply.
- */
-icalcap_message *
-icalcap_message_new_reply(const icalcap_message *capmsg, const icalcomponent *comp) {
-
-#ifdef WITH_RR
-	return icalcap_message_new_reply_rr(capmsg, comp);
-#else
-	return NULL;
-#endif
-}
-
-/**
- * destructor
- *
- * Delete icalcap_message
- */
-void
-icalcap_message_free(icalcap_message *capmsg) {
-
-#ifdef WITH_RR
-	icalcap_message_free_rr(capmsg);
-#else
-#endif
-}
-
-/**
- * Send the icalcap_message and wait for an answer.
- * The icalcap_message will be invalid after this call, and only valid call will be
- * icalcap_message_free().
- */
-icalcomponent *
-icalcap_message_sync_send(icalcap_message *capmsg, int timeout) {
-
-	g_return_val_if_fail(capmsg, NULL);
-
-#ifdef WITH_RR
-	return icalcap_message_sync_send_rr(capmsg, timeout);
-#else
-	return NULL;
-#endif
-}
-
-/**
- * Send the icalcap_message.
- * The icalcap_message will be invalid after this call, and only valid call will be
- * icalcap_message_free().
- */
-int
-icalcap_message_send(icalcap_message *capmsg) {
-
-	int	rc = FALSE;
-	char   *str;
-
-	g_return_val_if_fail(capmsg, FALSE);
-
-#ifdef WITH_RR
-	rc = icalcap_message_send_reply_rr(capmsg);
-#else
-	rc = FALSE;
-#endif
-
-	return rc;
-}
-
-/**
- * Convenience method to send a component in reply to the given icalcap_message.
- * The icalcomponent is not modified in any way.
- *
- * FIXME should be const icalcomponent *
- */
-int
-icalcap_message_reply_component(const icalcap_message *orig, icalcomponent *in) {
-
-	icalcap_message*reply;
-	int		rc;
-
-	reply = icalcap_message_new_reply(orig, in);
-	if (reply == NULL)
-		return FALSE;
-
-	rc = icalcap_message_send(reply);
-	icalcap_message_free(reply);
-
-	return rc;
-}
-
-/* Only used by icalcap_message_reply_error */
-static icalcomponent *new_reply_component(const icalcap_message *capmsg, const icalcomponent *comp);
-
-/**
- * Convenience method to send an error in reply to the given icalcap_message.
- */
-int
-icalcap_message_reply_error(const icalcap_message *orig, enum icalrequeststatus status,
-						const char *msg, const char *debug) {
-
-	struct icalreqstattype	stat;
-	icalcomponent	       *comp, *vreply;
-	int			rc;
-
-	/* Prepare the REQUEST-STATUS */
-	stat = icalreqstattype_from_string(
-		icalenum_reqstat_code(status));
-
-	if (msg != NULL) {
-		/* FIXME we used to do
-			stat.desc = strdup(msg);
-		   but this created a memory leak. Maybe the destructor for reqstat? */
-		stat.desc = msg;
-	} else {
-		stat.desc = icalenum_reqstat_desc(status);
-	}
-
-	if (debug != NULL)
-		stat.debug = debug;
-
-	/* Prepare a VREPLY component */
-	vreply = icalcomponent_vanew(
-		ICAL_VREPLY_COMPONENT,
-		icalproperty_new_requeststatus(stat),
-		0);
-	if (vreply == NULL) {
-		/* FIXME */
-		return FALSE;
-	}
-
-	comp = new_reply_component(orig, vreply);
-
-	rc = icalcap_message_reply_component(orig, comp);
-
-	icalcomponent_free(comp);
-	icalcomponent_free(vreply);
-
-	return rc;
-}
-
-
-/* internal use */
-
-/* only used by new_reply_component */
-static const char *
-get_id(icalcomponent *comp) {
-
-	icalproperty   *prop;
-	icalparameter  *param;
-
-	prop = icalcomponent_get_first_property(comp, ICAL_CMD_PROPERTY);
-	if (prop == NULL)
-		return NULL;
-
-	param = icalproperty_get_first_parameter(prop, ICAL_ID_PARAMETER);
-	if (param == NULL)
-		return NULL;
-
-	return icalparameter_get_id(param);
-}
-
-/* only used by icalcap_message_reply_error */
-static icalcomponent *
-new_reply_component(const icalcap_message *capmsg, const icalcomponent *comp) {
-
-	icalcomponent  *clone, *cal, *root;
-	icalproperty   *cmd;
-	const char     *id;
-
-	cmd = icalproperty_new_cmd(ICAL_CMD_REPLY);
-
-	if (capmsg->comp != NULL) {
-		id = get_id(capmsg->comp);
-
-		if (id != NULL)
-			icalproperty_add_parameter(cmd, icalparameter_new_id(id));
-	}
-
-	cal = icalcomponent_vanew(
-		ICAL_VCALENDAR_COMPONENT,
-		icalproperty_new_version("2.0"),
-		icalproperty_new_prodid("-//I.Net spa//NONSGML//EN"),
-		cmd,
-		0);
-
-	if (comp != NULL) {
-		clone = icalcomponent_new_clone(comp);
-		icalcomponent_add_component(cal, clone);
-	}
-
-	root = icalcomponent_vanew(
-		ICAL_XROOT_COMPONENT,
-		cal,
-		0);
-	return root;
-}
diff --git a/libical/src/libicalcap/icalcap_message_impl.h b/libical/src/libicalcap/icalcap_message_impl.h
deleted file mode 100644
index ae234d2efa..0000000000
--- a/libical/src/libicalcap/icalcap_message_impl.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef __ICALCAP_MESSAGE_IMPL_H__
-#define __ICALCAP_MESSAGE_IMPL_H__
-
-#ifdef WITH_RR
-
-#include <ical.h>
-#include <librr/rr.h>
-
-#define	ICALCAP_MESSAGE_CMD	1
-#define	ICALCAP_MESSAGE_REPLY	1
-
-struct _icalcap_message_rr {
-	const icalcap		       *cap;
-	int				type;
-
-	icalcomponent		       *comp;
-
-	RRFrame			       *frame;
-	RRMessage		       *msg;
-};
-
-icalcap_message*icalcap_message_new_rr(const icalcap *cap, const icalcomponent *comp);
-icalcap_message*icalcap_message_new_reply_rr(const icalcap_message *capmsg, const icalcomponent *comp);
-void		icalcap_message_free_rr(icalcap_message *capmsg);
-
-int		icalcap_message_send_reply_rr(icalcap_message *capmsg);
-icalcomponent  *icalcap_message_sync_send_rr(icalcap_message *capmsg, int timeout);
-
-#else
-#error "No implementation of icalcap found!"
-#endif
-
-#endif
diff --git a/libical/src/libicalcap/icalcap_rr.c b/libical/src/libicalcap/icalcap_rr.c
deleted file mode 100644
index 7e464ee155..0000000000
--- a/libical/src/libicalcap/icalcap_rr.c
+++ /dev/null
@@ -1,545 +0,0 @@
-#include "config.h"
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#include "icalcap.h"
-#include "icalcap_session.h"
-#include "icalcap_server.h"
-
-#include "icalcap_impl.h"
-#include "icalcap_message_impl.h"
-#include "icalcap_session_impl.h"
-#include "icalcap_server_impl.h"
-
-icalcomponent *icalcap_component_new_from_string(const char *data);
-
-static int	default_msg_handler(RRCAP *cap, RRFrame *frame, GError **error);
-static void	client_final_handler(RRCAP *cap);
-
-/**
- * Implementation of functions in icalcap
- */
-void
-icalcap_free_rr(icalcap *cap) {
-
-	g_return_if_fail(cap);
-
-	if (cap->username)
-		free(cap->username);
-
-	if (cap->authname)
-		free(cap->authname);
-
-	g_free(cap);
-}
-
-/**
- * Implementation of functions in icalcap_session
- */
-icalcap_session *
-icalcap_session_new_rr(void) {
-
-	icalcap_session *sess;
-	GError  *error = NULL;
-
-	/* Initialize roadrunner */
-	if (!rr_init(0, NULL, &error))
-		return 0;
-
-	if ((sess = g_new0(icalcap_session, 1)) == NULL) {
-		/* FIXME return an error */
-		return NULL;
-	}
-
-	sess->cfg = rr_cap_config_new();
-
-	/* Tell roadrunner which profiles we want to support */
-	sess->profreg = rr_profile_registry_new();
-	rr_profile_registry_add_profile(sess->profreg, RR_TYPE_CAP, NULL);
-	rr_profile_registry_add_profile(sess->profreg, RR_TYPE_TLS, NULL);
-  	rr_profile_registry_add_profile(sess->profreg, RR_TYPE_SASL_DIGEST_MD5, NULL);
-
-	return sess;
-}
-
-int
-icalcap_session_connect_rr(icalcap_session *sess, const char *hostname, const int port) {
-
-	GError	       *error = NULL;
-
-	if (sess == NULL) {
-		/* FIXME return the error */
-		return FALSE;
-	}
-
-	/* Create a connection object */
-	sess->connection = rr_tcp_connection_new(sess->profreg, hostname, port, &error);
-	if (sess->connection == NULL) {
-		/* FIXME return the error */
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-int
-icalcap_session_login_rr(icalcap_session *sess, const char *username, const char *authname,
-			const char *password) {
-
-	/* assert cap != NULL */
-	GError	*error = NULL;
-
-	rr_sasl_set_username(sess->connection, username);
-	rr_sasl_set_authname(sess->connection, authname);
-	rr_sasl_set_password(sess->connection, password);
-
-	/* FIXME */
-	if (!rr_sasl_login(sess->connection, RR_TYPE_SASL_DIGEST_MD5, 
-			    "foo.example.com", NULL, &error)) {
-		/* FIXME return the error */
-		return 0;
-	}
-
-	return 1;
-}
-
-icalcap *
-icalcap_session_start_rr(const icalcap_session *sess, icalcap_msg_handler handler) {
-
-	/* assert sess != NULL */
-	icalcap	       *cap;
-	RRCAP	       *channel;
-	GError	       *error = NULL;
-
-	if ((cap = g_new0(icalcap, 1)) == NULL) {
-		/* FIXME return an error */
-		return NULL;
-	}
-
-	if (handler != NULL) {
-		rr_cap_config_set_msg_handler(sess->cfg, default_msg_handler, (void *)handler);
-		/* FIXME rr_cap_config_set_final_handler(cfg, client_final_handler); */
-	}
-
-	if ((channel = rr_cap_client_start(sess->connection, sess->cfg, &error)) == NULL) {
-		/* FIXME return the error */
-		goto FAILED;
-	}
-
-	cap->chan = channel;
-	channel->hl = cap;
-
-	return cap;
-
-FAILED:
-	g_free(cap);
-	return NULL;
-}
-
-int
-icalcap_stop_rr(icalcap *cap) {
-
-	/* assert cap != NULL */
-	GError	*error = NULL;
-
-	if (!rr_cap_close(cap->chan, &error)) {
-		/* FIXME return the error */
-		return 0;
-	}
-
-	cap->chan = NULL;
-	g_free(cap);
-
-	return 1;
-}
-
-int
-icalcap_session_disconnect_rr(icalcap_session *sess) {
-
-	/* assert cap != NULL */
-	GError	*error = NULL;
-
-	if (!rr_connection_disconnect(sess->connection, &error)) {
-		/* FIXME return the error */
-		return 0;
-	}
-
-	sess->connection = NULL;
-	g_free(sess);
-
-	if (!rr_exit(&error)) {
-		/* FIXME return the error */
-		return 0;
-	}
-
-	return 1;
-}
-
-/**
- * Implementation of functions in icalcap_server
- */
-
-/**
- * If the user properly authenticated (via SASL), initialize the channel
- * credentials. Otherwise, refuse to open the channel.
- */
-static int
-server_init_handler(RRCAP *chan, const gchar *piggyback, GError **error) {
-
-	icalcap		       *cap;
-	RRConnection	       *connection;
-
-	icalcap_auth_handler	func;
-	const gchar	       *username, *authname;
-	int			rc;
-
-	g_return_val_if_fail(chan, FALSE);
-	g_return_val_if_fail(chan->cfg, FALSE);
-	g_return_val_if_fail(chan->cfg->server_init_data, FALSE);
-
-	connection = rr_channel_get_connection(RR_CHANNEL(chan));
-	if ((username = rr_sasl_get_username(connection)) == NULL)
-		return FALSE;
-	if ((authname = rr_sasl_get_authname(connection)) == NULL)
-		return FALSE;
-
-	if ((cap = g_new0(icalcap, 1)) == NULL) {
-		return FALSE;
-	}
-
-	cap->chan = chan;
-	chan->hl = cap;
-
-	cap->username = strdup(username);
-	cap->authname = strdup(authname);
-
-	func = (icalcap_auth_handler)chan->cfg->server_init_data;
-	return func(cap, piggyback);
-}
-
-static void
-server_confirmation_handler(RRCAP *chan) {
-
-	icalcap_chanup_handler	func;
-
-	g_return_if_fail(chan);
-	g_return_if_fail(chan->cfg);
-	g_return_if_fail(chan->cfg->server_confirmation_data);
-
-	func = (icalcap_chanup_handler)chan->cfg->server_confirmation_data;
-
-	func(chan->hl);
-}
-
-static gboolean
-server_frame_handler(RRCAP *cap, RRFrame *frame, GError **error)
-{
-	if (frame->type == RR_FRAME_TYPE_MSG)
-		/* FIXME */
-		return default_msg_handler(cap, frame, error);
-	else
-		return FALSE;
-}
-
-static void
-server_final_handler(RRCAP *cap)
-{
-	g_return_if_fail(cap);
-	g_return_if_fail(RR_CAP(cap));
-
-	if (cap->hl != NULL) {
-		icalcap_free(cap->hl);
-		cap->hl = NULL;
-	}
-}
-
-/*
- * FIXME Do we want to pass argc and argv in?
- */
-icalcap_server *
-icalcap_server_new_rr(icalcap_auth_handler auth_cb, icalcap_chanup_handler chanup_cb,
-								icalcap_msg_handler msg_cb) {
-
-	icalcap_server *serv;
-	GError	       *error = NULL;
-
-	/* Initialize roadrunner */
-	if (!rr_init(0, NULL, &error))
-		return 0;
-
-	if ((serv = g_new0(icalcap_server, 1)) == NULL) {
-		/* FIXME return an error */
-		return NULL;
-	}
-	serv->handler = msg_cb;
-
-	/* This is somewhat hackish */
-	serv->cfg = rr_cap_config_new();
-	rr_cap_config_set_msg_handler(serv->cfg, NULL, (void *)msg_cb);
-	rr_cap_config_set_frame_handler(serv->cfg, server_frame_handler);
-	rr_cap_config_set_final_handler(serv->cfg, server_final_handler);
-	rr_cap_config_set_server_init_handler(serv->cfg, server_init_handler, (void *)auth_cb);
-	rr_cap_config_set_server_confirmation_handler(serv->cfg,
-						server_confirmation_handler, (void *)chanup_cb);
-
-	/* Tell roadrunner which profiles we want to support */
-	serv->profreg = rr_profile_registry_new();
-	rr_profile_registry_add_profile(serv->profreg, RR_TYPE_CAP, serv->cfg);
-	rr_profile_registry_add_profile(serv->profreg, RR_TYPE_TLS, NULL);
-  	rr_profile_registry_add_profile(serv->profreg, RR_TYPE_SASL_DIGEST_MD5, NULL);
-
-	return serv;
-}
-
-int
-icalcap_server_listen_rr(icalcap_server *serv, const char *hostname, const int port) {
-
-	GError	       *error = NULL;
-	g_return_val_if_fail(serv, FALSE);
-
-	/* Create a listener object */
-	serv->listener = rr_tcp_listener_new(serv->profreg, hostname, port, &error);
-	if (serv->listener == NULL) {
-		/* FIXME return the error */
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-int
-icalcap_server_run_rr(const icalcap_server *serv) {
-
-	/* assert cap != NULL */
-	GError	*error = NULL;
-
-	if (!rr_wait_until_done(&error)) {
-		/* FIXME return the error */
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-int
-icalcap_server_shutdown_rr(icalcap_server *serv) {
-
-	/* assert cap != NULL */
-	GError	*error = NULL;
-
-	if (!rr_listener_shutdown(serv->listener, &error)) {
-		/* FIXME return the error */
-		return 0;
-	}
-
-	serv->listener = NULL;
-	g_free(serv);
-
-	return 1;
-}
-
-/*
- * icalcap_message.c
- */
-
-/*
- * Internal constructor
- */
-static struct _icalcap_message_rr *
-_icalcap_message_new_from_component_rr(const icalcap *cap, int type, icalcomponent *comp) {
-
-	struct _icalcap_message_rr	*ret;
-
-	if ((ret = g_new0(struct _icalcap_message_rr, 1)) == NULL) {
-		/* FIXME return an error */
-		return NULL;
-	}
-
-	ret->cap	= cap;
-	ret->type	= type;
-
-	ret->comp	= comp;
-
-	return ret;
-}
-
-static icalcap_message *
-_icalcap_message_new_from_frame_rr(const icalcap *cap, int type, RRFrame *frame) {
-
-	struct _icalcap_message_rr	*ret;
-
-	if ((ret = g_new0(struct _icalcap_message_rr, 1)) == NULL) {
-		/* FIXME return an error */
-		return NULL;
-	}
-
-	ret->cap	= cap;
-	ret->type	= type;
-	ret->frame	= frame;
-
-	ret->comp	= icalcap_component_new_from_string(ret->frame->payload);
-
-	return (icalcap_message *)ret;
-}
-
-icalcap_message *
-icalcap_message_new_rr(const icalcap *cap, const icalcomponent *comp) {
-
-	struct _icalcap_message_rr	*ret;
-	gchar				*str;
-
-	if (comp == NULL) {
-		/* FIXME return an error */
-		return NULL;
-	}
-
-	ret = _icalcap_message_new_from_component_rr(cap, ICALCAP_MESSAGE_CMD, NULL);
-
-	str = g_strdup_printf("%s\n\n%s",
-		"Content-Type: text/calendar",
-		icalcomponent_as_ical_string(comp));
-
-	ret->msg	= rr_message_static_new(RR_FRAME_TYPE_MSG, str, strlen(str), TRUE);
-
-	return (icalcap_message *)ret;
-}
-
-/*
- * This method and its implementation are critical. It has the responsibility for
- * serializing the component. The tricky part is that we have a options for encoding XROOT.
- */
-icalcap_message *
-icalcap_message_new_reply_rr(const icalcap_message *orig, const icalcomponent *comp) {
-
-	struct _icalcap_message_rr     *in, *ret;
-	icalcomponent		       *cc;
-	GString			       *str;
-
-	if ((in = (struct _icalcap_message_rr *)orig) == NULL) {
-		/* FIXME return an error */
-		return NULL;
-	}
-
-	ret = _icalcap_message_new_from_component_rr(in->cap, ICALCAP_MESSAGE_REPLY, NULL);
-
-	/* FIXME */
-	if (icalcomponent_isa(comp) != ICAL_XROOT_COMPONENT)
-		return NULL;
-
-	/* FIXME don't hardcode */
-	str = g_string_new("Content-Type: text/calendar\n\n");
-
-	for (cc = icalcomponent_get_first_component(comp,
-					ICAL_VCALENDAR_COMPONENT);
-	     cc != NULL;
-	     cc = icalcomponent_get_next_component(comp,
-					ICAL_VCALENDAR_COMPONENT)) {
-		g_string_append(str, icalcomponent_as_ical_string(cc));
-	}
-
-	ret->msg	= rr_message_static_new(RR_FRAME_TYPE_RPY, str->str, strlen(str->str), TRUE);
-	/* FIXME this should now be ok but if change the API we need to change */
-	ret->msg->msgno = in->frame->msgno;
-
-	return (icalcap_message *)ret;
-}
-
-void
-icalcap_message_free_rr(icalcap_message *in) {
-
-	struct _icalcap_message_rr *capmsg = (struct _icalcap_message_rr *)in;
-	g_return_if_fail(capmsg);
-
-	if (capmsg->comp != NULL) {
-		icalcomponent_free(capmsg->comp);
-		capmsg->comp = NULL;
-	}
-
-	if (capmsg->msg != NULL) {
-		g_free(capmsg->msg);
-	}
-
-	g_free(capmsg);
-}
-
-int
-icalcap_message_send_reply_rr(icalcap_message *in) {
-
-	struct _icalcap_message_rr     *capmsg = (struct _icalcap_message_rr *)in;
-	GError			       *error = NULL;
-	int				rc;
-
-	if ((rc = rr_channel_send_message(RR_CHANNEL(capmsg->cap->chan), capmsg->msg, &error)) == 0)
-		g_message("error = %s", error->message);
-	/* FIXME handle error */
-
-	capmsg->msg = NULL;
-
-	return rc;
-}
-
-icalcomponent *
-icalcap_message_sync_send_rr(icalcap_message *in, int timeout) {
-
-	struct _icalcap_message_rr     *capmsg = (struct _icalcap_message_rr *)in;
-	icalcomponent		       *comp, *ret;
-
-	gchar			       *str2;
-	GError			       *error = NULL;
-	int				rc;
-
-	/* FIXME */
-	rc = rr_cap_cmd(capmsg->cap->chan, capmsg->msg, 3 * timeout, &str2, &error);
-	capmsg->msg = NULL;
-	if (rc == 0) {
-		g_message("error = %s", error->message);
-		/* FIXME handle error */
-		return 0;
-	}
-
-	comp = icalcap_component_new_from_string(str2);
-	g_free(str2);
-	if (ret == NULL)
-		return NULL;
-
-	return comp;
-}
-
-/*
- *
- */
-
-/*
- * FIXME We assume we can safely create an icalcap_message derived object
- * without calls to the base object
- */
-int
-default_msg_handler(RRCAP *cap, RRFrame *frame, GError **error) {
-
-	icalcap_msg_handler	func;
-	icalcap_message        *msg;
-	int			ret;
-
-	g_return_val_if_fail(cap, FALSE);
-	g_return_val_if_fail(cap->cfg, FALSE);
-	g_return_val_if_fail(cap->cfg->msg_handler_data, FALSE);
-
-	func = (icalcap_msg_handler)cap->cfg->msg_handler_data;
-
-	msg = _icalcap_message_new_from_frame_rr(cap->hl, ICALCAP_MESSAGE_CMD, frame);
-	if (msg == NULL) {
-		/* FIXME */
-		g_message("error");
-		return FALSE;
-	}
-
-	ret = func(msg);
-	icalcap_message_free(msg);
-
-	return ret;
-}
diff --git a/libical/src/libicalcap/icalcap_server.c b/libical/src/libicalcap/icalcap_server.c
deleted file mode 100644
index 77b8484554..0000000000
--- a/libical/src/libicalcap/icalcap_server.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "config.h"
-
-#include "icalcap.h"
-#include "icalcap_server.h"
-#include "icalcap_server_impl.h"
-
-
-icalcap_server *
-icalcap_server_new(icalcap_auth_handler auth_cb, icalcap_chanup_handler chanup_cb,
-	icalcap_msg_handler msg_cb) {
-
-#ifdef WITH_RR
-	return icalcap_server_new_rr(auth_cb, chanup_cb, msg_cb);
-#else
-	return NULL;
-#endif
-}
-
-int
-icalcap_server_listen(icalcap_server *cap, const char *hostname, const int _port) {
-
-	int port = _port;
-
-	if (port <= 0)
-		port = 1026;
-
-#ifdef WITH_RR
-	return icalcap_server_listen_rr(cap, hostname, port);
-#else
-	return 0;
-#endif
-}
-
-int
-icalcap_server_run(const icalcap_server *cap) {
-
-#ifdef WITH_RR
-	return icalcap_server_run_rr(cap);
-#else
-	return 0;
-#endif
-}
-
-int
-icalcap_server_shutdown(icalcap_server *cap) {
-
-#ifdef WITH_RR
-	return icalcap_server_shutdown_rr(cap);
-#else
-	return 0;
-#endif
-}
diff --git a/libical/src/libicalcap/icalcap_server.h b/libical/src/libicalcap/icalcap_server.h
deleted file mode 100644
index 53c73d3bab..0000000000
--- a/libical/src/libicalcap/icalcap_server.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef __ICALCAP_SERVER_H__
-#define __ICALCAP_SERVER_H__
-
-#include "icalcap.h"
-
-typedef struct _icalcap_server icalcap_server;
-
-typedef int  (*icalcap_auth_handler)(const icalcap *cap, const char *piggyback);
-typedef void (*icalcap_chanup_handler)(const icalcap *cap);
-
-icalcap_server*icalcap_server_new(icalcap_auth_handler	auth_cb,
-				  icalcap_chanup_handler chanup_cb,
-				  icalcap_msg_handler	msg_cb);
-
-int	icalcap_server_listen(icalcap_server *cap, const char *hostname, const int port);
-int	icalcap_server_run(const icalcap_server *cap);
-int	icalcap_server_shutdown(icalcap_server *cap);
-
-#endif
diff --git a/libical/src/libicalcap/icalcap_server_impl.h b/libical/src/libicalcap/icalcap_server_impl.h
deleted file mode 100644
index c5d527d266..0000000000
--- a/libical/src/libicalcap/icalcap_server_impl.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef __ICALCAP_SERVER_IMPL_H__
-#define __ICALCAP_SERVER_IMPL_H__
-
-#ifdef WITH_RR
-
-#include <librr/rr.h>
-#include <librrsasl/rr-sasl.h>
-#include <librrtls/rr-tls.h>
-#include <librrcap/rr-cap.h>
-
-struct _icalcap_server {
-	RRProfileRegistry      *profreg;
-	RRListener	       *listener;
-	RRCAPConfig	       *cfg;
-	icalcap_msg_handler	handler;
-};
-
-icalcap_server *icalcap_server_new_rr(icalcap_auth_handler auth_cb,
-					icalcap_chanup_handler chanup_cb,
-					icalcap_msg_handler msg_cb);
-int		icalcap_server_listen_rr(icalcap_server *cap,
-					const char *hostname,
-					const int port);
-int		icalcap_server_run_rr(const icalcap_server *cap);
-int		icalcap_server_shutdown_rr(icalcap_server *cap);
-
-#else
-#error "No implementation of icalcap found!"
-#endif
-
-#endif
diff --git a/libical/src/libicalcap/icalcap_session.c b/libical/src/libicalcap/icalcap_session.c
deleted file mode 100644
index 2f8fb2a701..0000000000
--- a/libical/src/libicalcap/icalcap_session.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#include "config.h"
-
-#include "icalcap.h"
-#include "icalcap_session.h"
-#include "icalcap_session_impl.h"
-
-
-icalcap_session *
-icalcap_session_new(void) {
-
-#ifdef WITH_RR
-	return icalcap_session_new_rr();
-#else
-	return NULL;
-#endif
-}
-
-int
-icalcap_session_connect(icalcap_session *sess, const char *hostname, const int _port) {
-
-	int port = _port;
-
-	if (port <= 0)
-		port = 1026;
-
-#ifdef WITH_RR
-	return icalcap_session_connect_rr(sess, hostname, port);
-#else
-	return 0;
-#endif
-}
-
-int
-icalcap_session_login(icalcap_session *sess, const char *username, const char *authname,
-			const char *password) {
-
-#ifdef WITH_RR
-	return icalcap_session_login_rr(sess, username, authname, password);
-#else
-	return 0;
-#endif
-}
-
-icalcap *
-icalcap_session_start(const icalcap_session *sess, icalcap_msg_handler handler) {
-
-#ifdef WITH_RR
-	return icalcap_session_start_rr(sess, handler);
-#else
-	return 0;
-#endif
-}
-
-int
-icalcap_session_disconnect(icalcap_session *sess) {
-
-#ifdef WITH_RR
-	return icalcap_session_disconnect_rr(sess);
-#else
-	return 0;
-#endif
-}
diff --git a/libical/src/libicalcap/icalcap_session.h b/libical/src/libicalcap/icalcap_session.h
deleted file mode 100644
index c12d434b8c..0000000000
--- a/libical/src/libicalcap/icalcap_session.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef __ICALCAP_SESSION_H__
-#define __ICALCAP_SESSION_H__
-
-#include "icalcap.h"
-
-typedef struct _icalcap_session icalcap_session;
-
-icalcap_session*icalcap_session_new(void);
-int	icalcap_session_connect(icalcap_session *cap, const char *hostname, const int port);
-int	icalcap_session_login(icalcap_session *cap, const char *username, const char *authname,
-			const char *password);
-icalcap*icalcap_session_start(const icalcap_session *cap, icalcap_msg_handler handler);
-int	icalcap_session_disconnect(icalcap_session *cap);
-
-#endif
diff --git a/libical/src/libicalcap/icalcap_session_impl.h b/libical/src/libicalcap/icalcap_session_impl.h
deleted file mode 100644
index 26bb7d107d..0000000000
--- a/libical/src/libicalcap/icalcap_session_impl.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef __ICALCAP_SESSION_IMPL_H__
-#define __ICALCAP_SESSION_IMPL_H__
-
-#ifdef WITH_RR
-
-#include <librr/rr.h>
-#include <librrsasl/rr-sasl.h>
-#include <librrtls/rr-tls.h>
-#include <librrcap/rr-cap.h>
-
-struct _icalcap_session {
-	RRProfileRegistry      *profreg;
-	RRConnection	       *connection;
-	RRCAPConfig	       *cfg;
-	icalcap_msg_handler	handler;
-
-	char		       *username;
-};
-
-icalcap_session*icalcap_session_new_rr(void);
-int		icalcap_session_connect_rr(icalcap_session *cap,
-					const char *hostname,
-					const int port);
-int		icalcap_session_login_rr(icalcap_session *cap,
-					const char *username,
-					const char *authname,
-					const char *password);
-icalcap	       *icalcap_session_start_rr(const icalcap_session *cap,
-					icalcap_msg_handler handler);
-int		icalcap_session_disconnect_rr(icalcap_session *cap);
-
-#else
-#error "No implementation of icalcap found!"
-#endif
-
-#endif
diff --git a/libical/src/libicalcap/icalcap_utils.c b/libical/src/libicalcap/icalcap_utils.c
deleted file mode 100644
index b676f6272d..0000000000
--- a/libical/src/libicalcap/icalcap_utils.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*-
- * $Id$
- *
- * See the file LICENSE for redistribution information. 
- *
- * Copyright (c) 2002 Andrea Campi <a.campi@inet.it>
- */
-
-#include "config.h"
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#include "icalcap.h"
-
-#define	CONTENT_TYPE	"Content-Type: text/calendar"
-
-
-icalcomponent *
-icalcap_component_new_from_string(const char *data) {
-
-	icalcomponent  *ret = NULL;
-	char	       *mtype;
-
-	/* FIXME split the check */
-	if (strncmp(data, CONTENT_TYPE, strlen(CONTENT_TYPE))) {
-		return NULL;
-	}
-
-	mtype = (char *)data+strlen(CONTENT_TYPE);
-
-	ret = icalcomponent_new_from_string(mtype);
-	if (ret == NULL) {
-		return NULL;
-	}
-
-#ifdef DEBUG
-	g_message("icalcap_component_new_from_string icalcomponent_new_from_string = %p", ret);
-#endif
-
-	/* FIXME
-	 * Validate here: should check at least the version
-	 */
-	if (icalcomponent_isa(ret) != ICAL_VCALENDAR_COMPONENT &&
-	    icalcomponent_isa(ret) != ICAL_XROOT_COMPONENT) {
-		icalcomponent_free(ret);
-
-		return NULL;
-	}
-
-	return ret;
-}
-
-#if 0
-RRCAPCmdArgs *
-msg_parse(RRCAP *cap, icalcomponent *comp) {
-
-	icalproperty   *prop;
-	icalparameter  *param;
-	icalvalue      *value;
-	RRCAPCmdArgs   *ret = g_new0(RRCAPCmdArgs, 1);
-
-	ret->comp = comp;
-
-	/* Find the command */
-	if ((prop = icalcomponent_get_first_property(comp, ICAL_CMD_PROPERTY)) == NULL) {
-		rr_cap_send_error(cap, NULL, ICAL_9_0_UNRECOGNIZED_COMMAND,
-			"No CMD sent", NULL);
-		goto FAILED;
-	}
-	if ((value = icalproperty_get_value(prop)) == NULL) {
-		rr_cap_send_error(cap, NULL, ICAL_9_0_UNRECOGNIZED_COMMAND,
-			"CMD has no value", icalproperty_as_ical_string(prop));
-		goto FAILED;
-	}
-	ret->cmd = icalvalue_get_cmd(value);
-
-	/* Look for params */
-
-	/* ID */
-	if ((param = icalproperty_get_first_parameter(prop,
-						ICAL_ID_PARAMETER)) != NULL) {
-		if ((ret->id = icalparameter_get_id(param)) == NULL) {
-			rr_cap_send_error(cap, NULL,
-				ICAL_9_0_UNRECOGNIZED_COMMAND,
-				"ID param is garbled",
-				icalproperty_as_ical_string(prop));
-			goto FAILED;
-		}
-	}
-
-	/* LATENCY */
-	if ((param = icalproperty_get_first_parameter(prop,
-						ICAL_LATENCY_PARAMETER)) != NULL) {
-		const char *tmp;
-		if ((tmp = icalparameter_get_latency(param)) == NULL) {
-			rr_cap_send_error(cap, NULL,
-				ICAL_9_0_UNRECOGNIZED_COMMAND,
-				"LATENCY is garbled",
-				icalproperty_as_ical_string(prop));
-			goto FAILED;
-		}
-
-		ret->latency = atoi(tmp);
-	}
-
-	/* ACTION */
-	if ((param = icalproperty_get_first_parameter(prop,
-						ICAL_ACTIONPARAM_PARAMETER)) != NULL) {
-		if ((ret->action = icalparameter_get_actionparam(param))
-		    == NULL) {
-			rr_cap_send_error(cap, NULL,
-				ICAL_9_0_UNRECOGNIZED_COMMAND,
-				"ACTION is garbled",
-				icalproperty_as_ical_string(prop));
-			goto FAILED;
-		}
-	}
-
-	if ((ret->latency >= 0) ^ (ret->action != ICAL_ACTIONPARAM_NONE)) {
-		rr_cap_send_error(cap, NULL, ICAL_9_0_UNRECOGNIZED_COMMAND,
-			"LATENCY and ACTION must be both present",
-			icalproperty_as_ical_string(prop));
-		goto FAILED;
-	}
-
-	return ret;
-
-FAILED:
-	g_free(ret);
-	return NULL;
-}
-#endif
diff --git a/libical/src/libicalss/.cvsignore b/libical/src/libicalss/.cvsignore
deleted file mode 100644
index 1fe9dcf1e9..0000000000
--- a/libical/src/libicalss/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-Makefile
-Makefile.in
-.deps
-.libs
-*.lo
-*.la
-icalss.h
diff --git a/libical/src/libicalss/Makefile.am b/libical/src/libicalss/Makefile.am
deleted file mode 100644
index 9fd810b653..0000000000
--- a/libical/src/libicalss/Makefile.am
+++ /dev/null
@@ -1,123 +0,0 @@
-#======================================================================
-#  FILE: Makefile.am
-#  CREATOR: eric 
-#  
-#  $Id: Makefile.am,v 1.24 2003/11/05 22:47:35 jpr Exp $
-#
-#
-# (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either: 
-#
-#    The LGPL as published by the Free Software Foundation, version
-#    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-#
-#  Or:
-#
-#    The Mozilla Public License Version 1.0. You may obtain a copy of
-#    the License at http://www.mozilla.org/MPL/
-#
-#  
-#
-#======================================================================
-
-
-AM_YFLAGS =-d -v -p ss
-AM_LFLAGS = -Pss 
-LEX_OUTPUT_ROOT = lex.ss
-
-# just to get it built
-$(srcdir)/icalgauge.c: icalssyacc.h
-$(srcdir)/icalsslexer.c: icalssyacc.h 
-
-
-if WITH_BDB4
-BDB_INCLUDE=-I@BDB_DIR_INCLUDE@ -DWITH_BDB4
-BDB_SOURCEFILES=icalbdbset.c icalbdbset.h icalbdbsetimpl.h
-BDB_HEADERFILES=$(srcdir)/icalbdbset.h
-libicalssinclude_BDBHEADERS=icalbdbset.h icalbdbsetimpl.h
-BDB_LIBFILES=@BDB_DIR_LIB@/@BDB_LIB@
-else
-BDB_INCLUDE=
-BDB_SOURCEFILES=
-BDB_HEADERFILES=
-endif
-
-if WITH_CXX_BINDINGS
-cxx_lib=libicalss-evolution_cxx.la
-cxx_headers=icalspanlist_cxx.h
-else
-cxx_lib=
-cxx_headers=
-endif
-
-noinst_LTLIBRARIES = libicalss-evolution.la $(cxx_lib)
-
-INCLUDES =			\
-	-I$(top_srcdir)/src	\
-	$(BDB_INCLUDE)
-
-libicalss_evolution_la_LDFLAGS = -version-info 0:0:0
-libicalss_evolution_la_LIBADD = $(BDB_LIBFILES)
-
-if DEV
-libicalss_evolution_la_DEVSOURCES = icalsslexer.l icalssyacc.y
-else
-libicalss_evolution_la_DEVSOURCES = icalsslexer.c icalssyacc.c
-endif
-
-libicalss_evolution_la_SOURCES =		\
-	icalcalendar.c		\
-	icalcalendar.h		\
-	icalclassify.c		\
-	icalclassify.h		\
-	icalcluster.c		\
-	icalcluster.h		\
-	icalclusterimpl.h	\
-	icalgauge.c		\
-	icalgauge.h		\
-	icalgaugeimpl.h		\
-	icaldirset.c		\
-	icaldirset.h		\
-	icaldirsetimpl.h	\
-	icalfileset.c		\
-	icalfileset.h		\
-	icalfilesetimpl.h	\
-	icalset.c		\
-	icalset.h		\
-	icalssyacc.h		\
-	icalspanlist.c		\
-	icalspanlist.h		\
-	icalmessage.c		\
-	icalmessage.h		\
-	$(BDB_SOURCEFILES)	\
-	$(libicalss_evolution_la_DEVSOURCES)
-
-libicalssincludedir = $(privincludedir)/libical
-
-COMBINEDHEADERS = \
-        $(srcdir)/icalgauge.h \
-        $(srcdir)/icalset.h \
-        $(srcdir)/icalcluster.h \
-        $(srcdir)/icalfileset.h \
-        $(srcdir)/icaldirset.h \
-	$(BDB_HEADERFILES) \
-        $(srcdir)/icalcalendar.h  \
-        $(srcdir)/icalclassify.h \
-	$(srcdir)/icalspanlist.h	\
-	$(srcdir)/icalmessage.h
-
-if WITH_CXX_BINDINGS
-libicalss_evolution_cxx_la_SOURCES =	\
-	$(libicalss_evolution_la_SOURCES)	\
-	icalspanlist_cxx.h	\
-	icalspanlist_cxx.cpp
-
-endif
-
-
-libicalssinclude_HEADERS = icalss.h  icalcalendar.h icalclassify.h icalcluster.h icaldirset.h icaldirsetimpl.h icalfileset.h icalfilesetimpl.h icalgauge.h icalgaugeimpl.h icalmessage.h icalset.h icalspanlist.h icalssyacc.h $(libicalssinclude_BDBHEADERS) $(cxx_headers)
-
-CONFIG_CLEAN_FILES = y.output
-
diff --git a/libical/src/libicalss/icalbdbset.c b/libical/src/libicalss/icalbdbset.c
deleted file mode 100644
index 6b11e46741..0000000000
--- a/libical/src/libicalss/icalbdbset.c
+++ /dev/null
@@ -1,1598 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalbdbset.c
- ======================================================================*/
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "icalbdbset.h"
-#include "icalgauge.h"
-#include <errno.h>
-#include <sys/stat.h> /* for stat */
-#include <stdio.h>
-
-#ifndef WIN32
-#include <unistd.h> /* for stat, getpid, unlink */
-#include <fcntl.h> /* for fcntl */
-#include <unistd.h> /* for fcntl */
-#else
-#define	S_IRUSR	S_IREAD		/* R for owner */
-#define	S_IWUSR	S_IWRITE	/* W for owner */
-#endif
-#include <stdlib.h>
-#include <string.h>
-
-#include "icalbdbsetimpl.h"
-
-#define STRBUF_LEN 255
-#define MAX_RETRY 5
-
-extern int errno;
-
-
-
-/* these are just stub functions */
-icalerrorenum icalbdbset_read_database(icalbdbset* bset, char *(*pfunc)(const DBT *dbt));
-icalerrorenum icalbdbset_create_cluster(const char *path);
-int icalbdbset_cget(DBC *dbcp, DBT *key, DBT *data, int access_method);
-
-static int _compare_keys(DB *dbp, const DBT *a, const DBT *b);
-
-    
-/** Default options used when NULL is passed to icalset_new() **/
-icalbdbset_options icalbdbset_options_default = {ICALBDB_EVENTS, DB_BTREE, 0644, 0, NULL, NULL};
-
-
-static DB_ENV *ICAL_DB_ENV = 0;
-
-/** Initialize the db environment */
-
-int icalbdbset_init_dbenv(char *db_env_dir, void (*logDbFunc)(const char*, char*)) {
-  int ret;
-  int flags;
-
-  if (db_env_dir) {
-    struct stat env_dir_sb;
-    
-    if (stat(db_env_dir, &env_dir_sb)) {
-      fprintf(stderr, "The directory '%s' is missing, please create it.\n", db_env_dir);
-      return EINVAL;
-    }
-  }
-  
-  ret = db_env_create(&ICAL_DB_ENV, 0);
-
-  if (ret) {
-    /* some kind of error... */
-    return ret;
-  }
-
-  /* Do deadlock detection internally */
-  if ((ret = ICAL_DB_ENV->set_lk_detect(ICAL_DB_ENV, DB_LOCK_DEFAULT)) != 0) {
-    char * foo = db_strerror(ret);
-    fprintf(stderr, "Could not initialize the database locking environment\n");
-    return ret;
-  }    
-
-  flags = DB_INIT_LOCK | DB_INIT_TXN | DB_CREATE | DB_THREAD | \
-    DB_RECOVER | DB_INIT_LOG | DB_INIT_MPOOL;
-  ret = ICAL_DB_ENV->open(ICAL_DB_ENV, db_env_dir,  flags, S_IRUSR|S_IWUSR);
-  
-  if (ret) {
-    char * foo = db_strerror(ret);
-    ICAL_DB_ENV->err(ICAL_DB_ENV, ret, "dbenv->open");
-    return ret;
-  }
-
-  /* display additional error messages */
-  if (logDbFunc != NULL) {
-     ICAL_DB_ENV->set_errcall(ICAL_DB_ENV, logDbFunc);
-  }
-
-  return ret;
-}
-
-void icalbdbset_checkpoint(void)
-{
-  int ret;
-  char *err;
-
-  switch (ret = ICAL_DB_ENV->txn_checkpoint(ICAL_DB_ENV, 0,0,0)) {
-  case 0:
-  case DB_INCOMPLETE:
-    break;
-  default:
-    err = db_strerror(ret);
-    ICAL_DB_ENV->err(ICAL_DB_ENV, ret, "checkpoint failed");
-    abort();
-  }
-}
-
-void icalbdbset_rmdbLog(void)
-{
-    int      ret = 0;
-    char**   listp;
-
-    /* remove log files that are archivable (ie. no longer needed) */
-    if (ICAL_DB_ENV->log_archive(ICAL_DB_ENV, &listp, DB_ARCH_ABS) == 0) {
-       if (listp != NULL) {
-          int ii = 0;
-          while (listp[ii] != NULL) {
-              ret = unlink(listp[ii]);
-              ii++;
-          }
-          free(listp);
-       }
-    }
-}
-
-int icalbdbset_cleanup(void)
-{
-  int ret = 0;
-
-  /* one last checkpoint.. */
-  icalbdbset_checkpoint();
-
-    /* remove logs that are not needed anymore */
-    icalbdbset_rmdbLog();
-
-  if (ICAL_DB_ENV) 
-     ret = ICAL_DB_ENV->close(ICAL_DB_ENV, 0);
-
-  return ret;
-}
-
-DB_ENV *icalbdbset_get_env(void) {
-  return ICAL_DB_ENV;
-}
-
-
-/** Initialize an icalbdbset.  Also attempts to populate from the
- *  database (primary if only dbp is given, secondary if sdbp is
- *  given) and creates an empty object if retrieval is unsuccessful.
- *  pfunc is used to unpack data from the database.  If not given, we
- *  assume data is a string.
- */
-
-icalset* icalbdbset_init(icalset* set, const char* dsn, void* options_in)
-{
-    icalbdbset *bset = (icalbdbset*)set;
-    icalbdbset_options *options = options_in;
-    int ret;
-    DB *cal_db;
-    char *subdb_name;
-
-    if (options == NULL) 
-      *options = icalbdbset_options_default;
-
-    switch (options->subdb) {
-    case ICALBDB_CALENDARS:
-      subdb_name = "calendars";
-      break;
-    case ICALBDB_EVENTS:
-      subdb_name = "events";
-      break;
-    case ICALBDB_TODOS:
-      subdb_name = "todos";
-      break;
-    case ICALBDB_REMINDERS:
-      subdb_name = "reminders";
-      break;
-    }
-  
-    cal_db = icalbdbset_bdb_open(set->dsn, 
-				 subdb_name, 
-				 options->dbtype, 
-				 options->mode,
-				 options->flag);
-    if (cal_db == NULL)
-      return NULL;
-
-    bset->dbp = cal_db;
-    bset->sdbp = NULL;
-    bset->gauge = 0;
-    bset->cluster = 0;
-  
-    if ((ret = icalbdbset_read_database(bset, options->pfunc)) != ICAL_NO_ERROR) {
-      return NULL;
-    }
-
-    return (icalset *)bset;
-}
-
-
-/** open a database and return a reference to it.  Used only for
-    opening the primary index.
-    flag = set_flag() DUP | DUP_SORT
- */
-
-icalset* icalbdbset_new(const char* database_filename, 
-			icalbdbset_subdb_type subdb_type,
-			int dbtype, int flag)
-{
-  icalbdbset_options options = icalbdbset_options_default;
-
-  options.subdb = subdb_type;
-  options.dbtype = dbtype;
-  options.flag = flag;
-  
-  /* this will in turn call icalbdbset_init */
-  return icalset_new(ICAL_BDB_SET, database_filename, &options);
-}
-
-/**
- *  Open a secondary database, used for accessing secondary indices.
- *  The callback function tells icalbdbset how to associate secondary
- *  key information with primary data.  See the BerkeleyDB reference
- *  guide for more information.
- */
-
-DB * icalbdbset_bdb_open_secondary(DB *dbp,
-			       const char *database,
-			       const char *sub_database, 
-			       int (*callback) (DB *db, 
-						const DBT *dbt1, 
-						const DBT *dbt2, 
-						DBT *dbt3),
-			       int type)
-{
-  int ret;
-  int flags;
-    DB  *sdbp = NULL;
-
-  if (!sub_database) 
-        return NULL;
-
-  if (!ICAL_DB_ENV)
-        icalbdbset_init_dbenv(NULL, NULL);
-
-  /* Open/create secondary */
-  if((ret = db_create(&sdbp, ICAL_DB_ENV, 0)) != 0) {
-        ICAL_DB_ENV->err(ICAL_DB_ENV, ret, "secondary index: %s", sub_database);
-        return NULL;
-  }
-
-  if ((ret = sdbp->set_flags(sdbp, DB_DUP | DB_DUPSORT)) != 0) {
-        ICAL_DB_ENV->err(ICAL_DB_ENV, ret, "set_flags error for secondary index: %s", sub_database);
-        return NULL;
-  }
-
-  flags = DB_CREATE  | DB_THREAD;
-  if ((ret = sdbp->open(sdbp, database, sub_database, type, (u_int32_t) flags, 0644)) != 0) {
-        ICAL_DB_ENV->err(ICAL_DB_ENV, ret, "failed to open secondary index: %s", sub_database);
-        if (ret == DB_RUNRECOVERY)
-            abort();
-        else
-            return NULL;
-  }
-
-  /* Associate the primary index with a secondary */
-  if((ret = dbp->associate(dbp, sdbp, callback, 0)) != 0) {
-        ICAL_DB_ENV->err(ICAL_DB_ENV, ret, "failed to associate secondary index: %s", sub_database);
-        return NULL;
-  }
-
-  return sdbp;
-}
-
-DB* icalbdbset_bdb_open(const char* path, 
-				  const char *subdb, 
-				int dbtype, 
-				mode_t mode,
-				int flag)
-{
-    DB  *dbp = NULL;
-  int ret;
-  int flags;
-
-  /* Initialize the correct set of db subsystems (see capdb.c) */
-  flags =  DB_CREATE | DB_THREAD;
-
-  /* should just abort here instead of opening an env in the current dir..  */
-  if (!ICAL_DB_ENV)
-        icalbdbset_init_dbenv(NULL, NULL);
-
-  /* Create and initialize database object, open the database. */
-  if ((ret = db_create(&dbp, ICAL_DB_ENV, 0)) != 0) {
-        return (NULL);
-  }
-
-  /* set comparison function, if BTREE */
-  if (dbtype == DB_BTREE)
-    dbp->set_bt_compare(dbp, _compare_keys);
-
-  /* set DUP, DUPSORT */
-  if (flag != 0)
-    dbp->set_flags(dbp, flag);
-
-  if ((ret = dbp->open(dbp, path, subdb, dbtype, flags, mode)) != 0) {
-        ICAL_DB_ENV->err(ICAL_DB_ENV, ret, "%s (database: %s): open failed.", path, subdb);
-        if (ret == DB_RUNRECOVERY)
-    abort();
-        else
-            return NULL;
-  }
-
-  return (dbp);
-}
-
-    
-/* icalbdbset_parse_data -- parses using pfunc to unpack data. */
-char *icalbdbset_parse_data(DBT *dbt, char *(*pfunc)(const DBT *dbt)) 
-{
-  char *ret;
-
-  if(pfunc) {
-    ret = (char *)pfunc(dbt);
-  } else {
-    ret = (char *) dbt->data;
-  }
-
-  return (ret);
-}
-
-/* This populates a cluster with the entire contents of a database */
-icalerrorenum icalbdbset_read_database(icalbdbset* bset, char *(*pfunc)(const DBT *dbt))
-{
-
-  DB *dbp;
-  DBC *dbcp;
-  DBT key, data;
-  char *str, *szpstr;
-  int ret;
-  char keystore[256];
-  char datastore[1024];
-  char *more_mem = NULL;
-  DB_TXN *tid;
-
-  memset(&key, 0, sizeof(DBT));
-  memset(&data, 0, sizeof(DBT));
-
-  if (bset->sdbp) { dbp = bset->sdbp; }
-  else { dbp = bset->dbp; }
-     
-  if(!dbp) { goto err1; }
-
-  bset->cluster = icalcomponent_new(ICAL_XROOT_COMPONENT);
-
-  if ((ret = ICAL_DB_ENV->txn_begin(ICAL_DB_ENV, NULL, &tid, 0)) != 0) {
-	char *foo = db_strerror(ret);
-	abort();
-  }
-
-  /* acquire a cursor for the database */
-  if ((ret = dbp->cursor(dbp, tid, &dbcp, 0)) != 0) {
-    dbp->err(dbp, ret, "primary index");
-    goto err1;
-  }
-
-  key.flags = DB_DBT_USERMEM;
-  key.data = keystore;
-  key.ulen = sizeof(keystore);
-
-  data.flags= DB_DBT_USERMEM;
-  data.data = datastore;
-  data.ulen = sizeof(datastore);
-
-
-  /* fetch the key/data pair */
-  while (1) {
-    ret = dbcp->c_get(dbcp, &key, &data, DB_NEXT);
-    if (ret == DB_NOTFOUND) {
-      break;
-    } else if (ret == ENOMEM) {
-      if (more_mem) free (more_mem);
-      more_mem = malloc(data.ulen+1024);
-      data.data = more_mem;
-      data.ulen = data.ulen+1024;
-    } else if (ret == DB_LOCK_DEADLOCK) {
-      char *foo = db_strerror(ret);
-      abort(); /* should retry in case of DB_LOCK_DEADLOCK */
-    } else if (ret) {
-      char *foo = db_strerror(ret);
-      /* some other weird-ass error  */
-      dbp->err(dbp, ret, "cursor");
-      abort();
-    } else {
-      icalcomponent *cl;
-      
-      /* this prevents an array read bounds error */
-      if((str = (char *)calloc(data.size + 1, sizeof(char)))==NULL)
-	goto err2;
-      memcpy(str, (char *)data.data, data.size);
-      
-      cl = icalparser_parse_string(str);
-      
-      icalcomponent_add_component(bset->cluster, cl);
-      free(str);
-    }
-  }
-  if(ret != DB_NOTFOUND) {
-      goto err2;
-  }
-
-
-  if (more_mem) {
-      free(more_mem);
-      more_mem = NULL;
-  }
-
-  if ((ret = dbcp->c_close(dbcp)) != 0) {
-        char * foo = db_strerror(ret);
-        abort(); /* should retry in case of DB_LOCK_DEADLOCK */
-  }
-
-    if ((ret = tid->commit(tid, 0)) != 0) {
-        char * foo = db_strerror(ret);
-        abort();
-    }
-
-  return ICAL_NO_ERROR;
-
- err2:
-  if (more_mem) free(more_mem);
-  dbcp->c_close(dbcp);
-  abort(); /* should retry in case of DB_LOCK_DEADLOCK */
-  return ICAL_INTERNAL_ERROR;
-
- err1:
-  dbp->err(dbp, ret, "cursor index");
-  abort();
-  return (ICAL_FILE_ERROR);
-}
-
-
-/* XXX add more to this */
-void icalbdbset_free(icalset* set)
-{
-    icalbdbset *bset = (icalbdbset*)set;
-    int ret;
-
-    icalerror_check_arg_rv((bset!=0),"bset");
-
-    if (bset->cluster != 0){
-	icalbdbset_commit(set);
-	icalcomponent_free(bset->cluster);
-	bset->cluster=0;
-    }
-
-    if(bset->gauge !=0){
-	icalgauge_free(bset->gauge);
-    }
-
-    if(bset->path != 0){
-	free((char *)bset->path);
-	bset->path = 0;
-    }
-
-    if(bset->sindex != 0) {
-      free((char *)bset->sindex);
-      bset->sindex = 0;
-    }
-
-    if (bset->dbp && 
-	((ret = bset->dbp->close(bset->dbp, 0)) != 0)) {
-    }
-    bset->dbp = NULL;
-}
-
-/* return cursor is in rdbcp */
-int icalbdbset_acquire_cursor(DB *dbp, DB_TXN *tid, DBC **rdbcp) {
-  int ret=0;
-
-  if((ret = dbp->cursor(dbp, tid, rdbcp, 0)) != 0) {
-    dbp->err(dbp, ret, "couldn't open cursor");
-    goto err1;
-  }
-
-  return ICAL_NO_ERROR;
-
- err1:
-  return ICAL_FILE_ERROR;
-
-}
-
-/* returns key/data in arguments */
-int icalbdbset_get_first(DBC *dbcp, DBT *key, DBT *data) {
-  return icalbdbset_cget(dbcp, key, data, DB_FIRST);
-}
-
-int icalbdbset_get_next(DBC *dbcp, DBT *key, DBT *data) {
-  return icalbdbset_cget(dbcp, key, data, DB_NEXT);
-}
-
-int icalbdbset_get_last(DBC *dbcp, DBT *key, DBT *data) {
-  return icalbdbset_cget(dbcp, key, data, DB_LAST);
-}
-
-int icalbdbset_get_key(DBC *dbcp, DBT *key, DBT *data) {
-  return icalbdbset_cget(dbcp, key, data, DB_SET);
-}
-
-int icalbdbset_delete(DB *dbp, DBT *key) {
-  DB_TXN *tid;
-  int ret;
-    int done = 0;
-    int retry = 0;
-
-    while ((retry < MAX_RETRY) && !done) {
-
-  if ((ret = ICAL_DB_ENV->txn_begin(ICAL_DB_ENV, NULL, &tid, 0)) != 0) {
-            if (ret == DB_LOCK_DEADLOCK) {
-                retry++;
-                continue;
-            }
-            else {
-	char *foo = db_strerror(ret);
-	abort();
-  }
-        }
-
-        if ((ret = dbp->del(dbp, tid, key, 0)) != 0) {
-            if (ret == DB_NOTFOUND) {
-                /* do nothing - not an error condition */
-            }
-            else if (ret == DB_LOCK_DEADLOCK) {
-                tid->abort(tid);
-                retry++;
-                continue;
-            }
-            else {
-                char *strError = db_strerror(ret);
-                icalerror_warn("icalbdbset_delete faild: ");
-                icalerror_warn(strError);
-                tid->abort(tid);
-                return ICAL_FILE_ERROR;
-            }
-  }
-
-  if ((ret = tid->commit(tid, 0)) != 0) {
-            if (ret == DB_LOCK_DEADLOCK) {
-                tid->abort(tid);
-                retry++;
-                continue;
-            }
-            else {
-        char * foo = db_strerror(ret);
-        abort();
-  }
-       }
-
-       done = 1;   /* all is well */
-    }
-
-    if (!done) {
-        if (tid != NULL) tid->abort(tid);
-    }
-
-  return ret;
-}
-
-int icalbdbset_cget(DBC *dbcp, DBT *key, DBT *data, int access_method) {
-  int ret=0;
-
-  key->flags |= DB_DBT_MALLOC; /* change these to DB_DBT_USERMEM */
-  data->flags |= DB_DBT_MALLOC;
-
-  /* fetch the key/data pair */
-  if((ret = dbcp->c_get(dbcp, key, data, access_method)) != 0) {
-    goto err1;
-  }
-
-  return ICAL_NO_ERROR;
-
- err1:
-  return ICAL_FILE_ERROR;
-}
-
-
-int icalbdbset_cput(DBC *dbcp, DBT *key, DBT *data, int access_method) {
-  int ret=0;
-
-  key->flags |= DB_DBT_MALLOC; /* change these to DB_DBT_USERMEM */
-  data->flags |= DB_DBT_MALLOC;
-
-  /* fetch the key/data pair */
-  if((ret = dbcp->c_put(dbcp, key, data, 0)) != 0) {
-    goto err1;
-  }
-
-  return ICAL_NO_ERROR;
-
- err1:
-  return ICAL_FILE_ERROR;
-}
-
-
-int icalbdbset_put(DB *dbp, DBT *key, DBT *data, int access_method)
-{
-    int     ret   = 0;
-    DB_TXN *tid   = NULL;
-    int     retry = 0;
-    int     done  = 0;
-
-    while ((retry < MAX_RETRY) && !done) {
-
-  if ((ret = ICAL_DB_ENV->txn_begin(ICAL_DB_ENV, NULL, &tid, 0)) != 0) {
-            if (ret == DB_LOCK_DEADLOCK) {
-                retry++;
-                continue;
-            }
-            else {
-	char *foo = db_strerror(ret);
-	abort();
-  }
-        }
-  
-        if ((ret = dbp->put(dbp, tid, key, data, access_method)) != 0) {
-            if (ret == DB_LOCK_DEADLOCK) {
-                tid->abort(tid);
-                retry++;
-                continue;
-            }
-            else {
-    char *strError = db_strerror(ret);
-    icalerror_warn("icalbdbset_put faild: ");
-    icalerror_warn(strError);
-    tid->abort(tid);
-    return ICAL_FILE_ERROR;
-  }
-        }
-
-  if ((ret = tid->commit(tid, 0)) != 0) {
-            if (ret == DB_LOCK_DEADLOCK) {
-                tid->abort(tid);
-                retry++;
-                continue;
-            }
-            else {
-        char * foo = db_strerror(ret);
-        abort();
-  }
-       }
-
-       done = 1;   /* all is well */
-    }
-
-    if (!done) {
-        if (tid != NULL) tid->abort(tid);
-        return ICAL_FILE_ERROR;
-    }
-    else
-  return ICAL_NO_ERROR;
-}
-
-int icalbdbset_get(DB *dbp, DB_TXN *tid, DBT *key, DBT *data, int flags)
-{
-    return (dbp->get(dbp, tid, key, data, flags));
-}
-
-/** Return the path of the database file **/
-
-const char* icalbdbset_path(icalset* set)
-{
-    icalerror_check_arg_rz((set!=0),"set");
-
-    return set->dsn;
-}
-
-const char* icalbdbset_subdb(icalset* set)
-{
-    icalbdbset *bset = (icalbdbset*)set;
-    icalerror_check_arg_rz((bset!=0),"bset");
-
-    return bset->subdb;
-}
-
-
-/** Write changes out to the database file.
- */
-
-icalerrorenum icalbdbset_commit(icalset *set) {
-  DB *dbp;
-  DBC *dbcp;
-  DBT key, data;
-  icalcomponent *c;
-  char *str;
-  int ret=0;
-    int           reterr = ICAL_NO_ERROR;
-  char keystore[256];
-    char          uidbuf[256];
-  char datastore[1024];
-  char *more_mem = NULL;
-    DB_TXN        *tid = NULL;
-  icalbdbset *bset = (icalbdbset*)set;
-  int bad_uid_counter = 0;
-    int           retry = 0, done = 0, completed = 0, deadlocked = 0;
-
-  icalerror_check_arg_re((bset!=0),"bset",ICAL_BADARG_ERROR);  
-
-  dbp = bset->dbp;
-  icalerror_check_arg_re((dbp!=0),"dbp is invalid",ICAL_BADARG_ERROR);
-
-  if (bset->changed == 0)
-    return ICAL_NO_ERROR;
-
-  memset(&key, 0, sizeof(key));
-  memset(&data, 0, sizeof(data));
-
-  key.flags = DB_DBT_USERMEM; 
-  key.data = keystore;
-  key.ulen = sizeof(keystore);
-
-  data.flags = DB_DBT_USERMEM;
-  data.data = datastore;
-  data.ulen = sizeof(datastore);
-  
-  if (!ICAL_DB_ENV)
-        icalbdbset_init_dbenv(NULL, NULL);
-
-    while ((retry < MAX_RETRY) && !done) {
-
-  if ((ret = ICAL_DB_ENV->txn_begin(ICAL_DB_ENV, NULL, &tid, 0)) != 0) {
-            if (ret ==  DB_LOCK_DEADLOCK) {
-                retry++;
-                continue;
-            }
-            else if (ret == DB_RUNRECOVERY) {
-                ICAL_DB_ENV->err(ICAL_DB_ENV, ret, "icalbdbset_commit: txn_begin failed");
-	abort();
-  }
-            else {
-                ICAL_DB_ENV->err(ICAL_DB_ENV, ret, "icalbdbset_commit");
-                return ICAL_INTERNAL_ERROR;
-            }
-        }
-
-  /* first delete everything in the database, because there could be removed components */
-  if ((ret = dbp->cursor(dbp, tid, &dbcp, DB_DIRTY_READ)) != 0) {
-            tid->abort(tid);
-            if (ret == DB_LOCK_DEADLOCK) {
-                retry++;
-                continue;
-            }
-            else if (ret == DB_RUNRECOVERY) {
-                ICAL_DB_ENV->err(ICAL_DB_ENV, ret, "curor failed");
-    abort();
-            }
-            else {
-                ICAL_DB_ENV->err(ICAL_DB_ENV, ret, "curor failed");
-    /* leave bset->changed set to true */
-    return ICAL_INTERNAL_ERROR;
-  }
-        }
-
-  /* fetch the key/data pair, then delete it */
-        completed = 0;
-        while (!completed && !deadlocked) {
-    ret = dbcp->c_get(dbcp, &key, &data, DB_NEXT);
-    if (ret == DB_NOTFOUND) {
-                completed = 1;
-    } else if (ret == ENOMEM)  {
-      if (more_mem) free(more_mem);
-      more_mem = malloc(data.ulen+1024);
-      data.data = more_mem;
-      data.ulen = data.ulen+1024;
-    } else if (ret == DB_LOCK_DEADLOCK) {
-                deadlocked = 1;
-            } else if (ret == DB_RUNRECOVERY) {
-                tid->abort(tid);
-                ICAL_DB_ENV->err(ICAL_DB_ENV, ret, "c_get failed.");
-      abort();
-            } else if (ret == 0) {
-       if ((ret = dbcp->c_del(dbcp,0))!=0) {
-         dbp->err(dbp, ret, "cursor");
-         if (ret == DB_KEYEMPTY) {
-	    /* never actually created, continue onward.. */
-                        /* do nothing - break; */
-         } else if (ret == DB_LOCK_DEADLOCK) {
-                        deadlocked = 1;
-         } else {
-            char *foo = db_strerror(ret);
-            abort();
-         }
-       }
-            } else {  /* some other non-fatal error */
-                dbcp->c_close(dbcp);
-                tid->abort(tid);
-                if (more_mem) {
-                    free(more_mem);
-                    more_mem = NULL;
-                }
-                return ICAL_INTERNAL_ERROR;
-    }
-  }
-
-  if (more_mem) {
-	  free(more_mem);
-	  more_mem = NULL;
-  }
-
-        if (deadlocked) {
-            dbcp->c_close(dbcp);
-            tid->abort(tid);
-            retry++;
-            continue;  /* next retry */
-        }
-
-        deadlocked = 0;
-        for (c = icalcomponent_get_first_component(bset->cluster,ICAL_ANY_COMPONENT);
-             c != 0 && !deadlocked;
-      c = icalcomponent_get_next_component(bset->cluster,ICAL_ANY_COMPONENT)) {
-
-            memset(&key, 0, sizeof(key));
-            memset(&data, 0, sizeof(data));
-
-    /* Note that we're always inserting into a primary index. */
-    if (icalcomponent_isa(c) != ICAL_VAGENDA_COMPONENT)  {
-      char *uidstr = (char *)icalcomponent_get_uid(c);
-                if (!uidstr) {   /* this shouldn't happen */
-                    /* no uid string, we need to add one */
-                    snprintf(uidbuf, 256, "baduid%d-%d", getpid(), bad_uid_counter++);
-                    key.data = uidbuf;
-      } else {
-                    key.data = uidstr;
-      }
-    } else {
-      char *relcalid = NULL;
-      relcalid = (char*)icalcomponent_get_relcalid(c);
-      if (relcalid == NULL) {
-                    snprintf(uidbuf, 256, "baduid%d-%d", getpid(), bad_uid_counter++);
-                    key.data = uidbuf;
-      } else {
-                    key.data = relcalid;
-      }
-    }
-    key.size = strlen(key.data);
-
-            str = icalcomponent_as_ical_string(c);
-            data.data = str;
-    data.size = strlen(str);
-
-    if ((ret = dbcp->c_put(dbcp, &key, &data, DB_KEYLAST)) != 0) {
-                if (ret == DB_LOCK_DEADLOCK) {
-                    deadlocked = 1;
-                }
-                else if (ret == DB_RUNRECOVERY) {
-                    ICAL_DB_ENV->err(ICAL_DB_ENV, ret, "c_put failed.");
-                    abort();
-                }
-                else {
-                    ICAL_DB_ENV->err(ICAL_DB_ENV, ret, "c_put failed %s.", str);
-                    /* continue to try to put as many icalcomponent as possible */
-                    reterr = ICAL_INTERNAL_ERROR;
-                }
-            }
-    }
-
-        if (deadlocked) {
-            dbcp->c_close(dbcp);
-            tid->abort(tid);
-            retry++;
-            continue;
-  } 
-
-  if ((ret = dbcp->c_close(dbcp)) != 0) {
-            tid->abort(tid);
-            if (ret == DB_LOCK_DEADLOCK) {
-                retry++;
-                continue;
-            }
-            else if (ret == DB_RUNRECOVERY) {
-                ICAL_DB_ENV->err(ICAL_DB_ENV, ret, "c_closed failed.");
-                abort();
-            }
-            else {
-                ICAL_DB_ENV->err(ICAL_DB_ENV, ret, "c_closed failed.");
-                reterr = ICAL_INTERNAL_ERROR;
-            }
-  }
-
-  if ((ret = tid->commit(tid, 0)) != 0) {
-            tid->abort(tid);
-            if (ret == DB_LOCK_DEADLOCK) {
-                retry++;
-                continue;
-            }
-            else if (ret == DB_RUNRECOVERY) {
-                ICAL_DB_ENV->err(ICAL_DB_ENV, ret, "commit failed.");
-    abort();
-  }
-            else {
-                ICAL_DB_ENV->err(ICAL_DB_ENV, ret, "commit failed.");
-                reterr = ICAL_INTERNAL_ERROR;
-            }
-        }
-
-        done = 1;
-    }
-
-  bset->changed = 0;    
-    return reterr;
-} 
-
-
-void icalbdbset_mark(icalset* set)
-{
-    icalbdbset *bset = (icalbdbset*)set;
-    icalerror_check_arg_rv((bset!=0),"bset");
-
-    bset->changed = 1;
-}
-
-
-icalcomponent* icalbdbset_get_component(icalset* set)
-{
-    icalbdbset *bset = (icalbdbset*)set;
-    icalerror_check_arg_rz((bset!=0),"bset");
-
-    return bset->cluster;
-}
-
-
-/* manipulate the components in the cluster */
-
-icalerrorenum icalbdbset_add_component(icalset *set,
-					icalcomponent* child)
-{
-    icalbdbset *bset = (icalbdbset*)set;
-    icalerror_check_arg_re((bset!=0),"bset", ICAL_BADARG_ERROR);
-    icalerror_check_arg_re((child!=0),"child",ICAL_BADARG_ERROR);
-
-    icalcomponent_add_component(bset->cluster,child);
-
-    icalbdbset_mark(set);
-
-    return ICAL_NO_ERROR;
-}
-
-
-icalerrorenum icalbdbset_remove_component(icalset *set,
-					   icalcomponent* child)
-{
-    icalbdbset *bset = (icalbdbset*)set;
-    icalerror_check_arg_re((bset!=0),"bset", ICAL_BADARG_ERROR);
-    icalerror_check_arg_re((child!=0),"child",ICAL_BADARG_ERROR);
-
-    icalcomponent_remove_component(bset->cluster,child);
-
-    icalbdbset_mark(set);
-
-    return ICAL_NO_ERROR;
-}
-
-
-int icalbdbset_count_components(icalset *set,
-				 icalcomponent_kind kind)
-{
-    icalbdbset *bset = (icalbdbset*)set;
-
-    if(set == 0){
-	icalerror_set_errno(ICAL_BADARG_ERROR);
-	return -1;
-    }
-
-    return icalcomponent_count_components(bset->cluster,kind);
-}
-
-
-/** Set the gauge **/
-
-icalerrorenum icalbdbset_select(icalset* set, icalgauge* gauge)
-{
-    icalbdbset *bset = (icalbdbset*)set;
-    icalerror_check_arg_re((bset!=0),"bset", ICAL_BADARG_ERROR);
-    icalerror_check_arg_re(gauge!=0,"gauge",ICAL_BADARG_ERROR);
-
-    bset->gauge = gauge;
-
-    return ICAL_NO_ERROR;
-}
-
-    
-/** Clear the gauge **/
-
-void icalbdbset_clear(icalset* set)
-{
-  icalbdbset *bset = (icalbdbset*)set;
-  icalerror_check_arg_rv((bset!=0),"bset");
-    
-  bset->gauge = 0;
-}
-
-
-icalcomponent* icalbdbset_fetch(icalset* set, icalcomponent_kind kind, const char* uid)
-{
-    icalcompiter i;    
-  icalbdbset *bset = (icalbdbset*)set;
-  icalerror_check_arg_rz((bset!=0),"bset");
-    
-  for(i = icalcomponent_begin_component(bset->cluster, kind);
-	icalcompiter_deref(&i)!= 0; icalcompiter_next(&i)){
-	
-	icalcomponent *this = icalcompiter_deref(&i);
-	icalproperty  *p = NULL;
-	const char    *this_uid = NULL;
-
-	if (this != 0){
-	    if (kind == ICAL_VAGENDA_COMPONENT) {
-		p = icalcomponent_get_first_property(this,ICAL_RELCALID_PROPERTY);
-		if (p != NULL) this_uid = icalproperty_get_relcalid(p);
-	    } else {
-		p = icalcomponent_get_first_property(this,ICAL_UID_PROPERTY);
-		if (p != NULL) this_uid = icalproperty_get_uid(p);
-	    }
-
-	    if(this_uid==NULL){
-		icalerror_warn("icalbdbset_fetch found a component with no UID");
-		continue;
-	    }
-
-	    if (strcmp(uid,this_uid)==0){
-		return this;
-	    }
-	}
-    }
-
-    return 0;
-}
-
-
-int icalbdbset_has_uid(icalset* store,const char* uid)
-{
-    assert(0); /* HACK, not implemented */
-    return 0;
-}
-
-
-/******* support routines for icalbdbset_fetch_match *********/
-
-struct icalbdbset_id {
-    char* uid;
-    char* recurrence_id;
-    int sequence;
-};
-
-void icalbdbset_id_free(struct icalbdbset_id *id)
-{
-    if(id->recurrence_id != 0){
-	free(id->recurrence_id);
-    }
-
-    if(id->uid != 0){
-	free(id->uid);
-    }
-
-}
-
-struct icalbdbset_id icalbdbset_get_id(icalcomponent* comp)
-{
-
-    icalcomponent *inner;
-    struct icalbdbset_id id;
-    icalproperty *p;
-
-    inner = icalcomponent_get_first_real_component(comp);
-    
-    p = icalcomponent_get_first_property(inner, ICAL_UID_PROPERTY);
-
-    assert(p!= 0);
-
-    id.uid = strdup(icalproperty_get_uid(p));
-
-    p = icalcomponent_get_first_property(inner, ICAL_SEQUENCE_PROPERTY);
-
-    if(p == 0) {
-	id.sequence = 0;
-    } else { 
-	id.sequence = icalproperty_get_sequence(p);
-    }
-
-    p = icalcomponent_get_first_property(inner, ICAL_RECURRENCEID_PROPERTY);
-
-    if (p == 0){
-	id.recurrence_id = 0;
-    } else {
-	icalvalue *v;
-	v = icalproperty_get_value(p);
-	id.recurrence_id = strdup(icalvalue_as_ical_string(v));
-
-	assert(id.recurrence_id != 0);
-    }
-
-    return id;
-}
-
-/* Find the component that is related to the given
-   component. Currently, it just matches based on UID and
-   RECURRENCE-ID */
-
-icalcomponent* icalbdbset_fetch_match(icalset* set, icalcomponent *comp)
-{
-    icalbdbset *bset = (icalbdbset*)set;
-    icalcompiter i;    
-    struct icalbdbset_id comp_id, match_id;
-    
-    icalerror_check_arg_rz((bset!=0),"bset");
-    comp_id = icalbdbset_get_id(comp);
-
-    for(i = icalcomponent_begin_component(bset->cluster,ICAL_ANY_COMPONENT);
-	icalcompiter_deref(&i)!= 0; icalcompiter_next(&i)){
-	
-	icalcomponent *match = icalcompiter_deref(&i);
-
-	match_id = icalbdbset_get_id(match);
-
-	if(strcmp(comp_id.uid, match_id.uid) == 0 &&
-	   ( comp_id.recurrence_id ==0 || 
-	     strcmp(comp_id.recurrence_id, match_id.recurrence_id) ==0 )){
-
-	    /* HACK. What to do with SEQUENCE? */
-
-	    icalbdbset_id_free(&match_id);
-	    icalbdbset_id_free(&comp_id);
-	    return match;
-	    
-	}
-	
-	icalbdbset_id_free(&match_id);
-    }
-
-    icalbdbset_id_free(&comp_id);
-    return 0;
-
-}
-
-
-icalerrorenum icalbdbset_modify(icalset* set, icalcomponent *old,
-				 icalcomponent *newc)
-{
-    assert(0); /* HACK, not implemented */
-    return ICAL_NO_ERROR;
-}
-
-/* caller is responsible to cal icalbdbset_free_cluster first */
-icalerrorenum  icalbdbset_set_cluster(icalset* set, icalcomponent* cluster)
-{
-    icalbdbset *bset = (icalbdbset*)set;
-    icalerror_check_arg_rz((bset!=0),"bset"); 
-
-    bset->cluster = cluster;
-}
-
-icalerrorenum  icalbdbset_free_cluster(icalset* set)
-{
-    icalbdbset *bset = (icalbdbset*)set;
-    icalerror_check_arg_rz((bset!=0),"bset");
-
-    if (bset->cluster != NULL) icalcomponent_free(bset->cluster);
-}
-
-icalcomponent* icalbdbset_get_cluster(icalset* set)
-{
-    icalbdbset *bset = (icalbdbset*)set;
-    icalerror_check_arg_rz((bset!=0),"bset");
-
-    return (bset->cluster);
-}
-
-
-/** Iterate through components. */
-icalcomponent* icalbdbset_get_current_component (icalset* set)
-{
-    icalbdbset *bset = (icalbdbset*)set;
-
-    icalerror_check_arg_rz((bset!=0),"bset");
-
-    return icalcomponent_get_current_component(bset->cluster);
-}
-
-
-icalcomponent* icalbdbset_get_first_component(icalset* set)
-{
-    icalbdbset *bset = (icalbdbset*)set;
-    icalcomponent *c=0;
-
-    icalerror_check_arg_rz((bset!=0),"bset");
-
-    do {
-        if (c == 0)
-	    c = icalcomponent_get_first_component(bset->cluster,
-						  ICAL_ANY_COMPONENT);
-        else
-	    c = icalcomponent_get_next_component(bset->cluster,
-						 ICAL_ANY_COMPONENT);
-
-	     if(c != 0 && (bset->gauge == 0 ||
-		      icalgauge_compare(bset->gauge,c) == 1)){
-	    return c;
-	}
-
-      } while (c!=0);
-
-    return 0;
-}
-
-
-icalsetiter icalbdbset_begin_component(icalset* set, icalcomponent_kind kind, icalgauge* gauge, const char* tzid)
-{
-    icalsetiter itr = icalsetiter_null;
-    icalcomponent* comp = NULL;
-    icalcompiter citr;
-    icalbdbset *bset = (icalbdbset*) set;
-    struct icaltimetype start, next, end;
-    icalproperty *dtstart, *rrule, *prop, *due;
-    struct icalrecurrencetype recur;
-    icaltimezone *u_zone;
-    int g = 0;
-    int orig_time_was_utc = 0;
-
-    icalerror_check_arg_re((set!=0), "set", icalsetiter_null);
-
-    itr.gauge = gauge;
-    itr.tzid = tzid;
-
-    citr = icalcomponent_begin_component(bset->cluster, kind);
-    comp = icalcompiter_deref(&citr);
-
-    if (gauge == 0) {
-        itr.iter = citr;
-        return itr;
-    }
-
-    /* if there is a gauge, the first matched component is returned */
-    while (comp != 0) {
-
-        /* check if it is a recurring component and with guage expand, if so
-         * we need to add recurrence-id property to the given component */
-        rrule = icalcomponent_get_first_property(comp, ICAL_RRULE_PROPERTY);
-        g = icalgauge_get_expand(gauge);
-
-        if (rrule != 0
-            && g == 1) {
-
-            /* it is a recurring event */
-
-            u_zone = icaltimezone_get_builtin_timezone(itr.tzid);
-
-      	    /* use UTC, if that's all we have. */
-            if (!u_zone)
-                u_zone = icaltimezone_get_utc_timezone();
-
-
-            recur = icalproperty_get_rrule(rrule);
-
-            if (icalcomponent_isa(comp) == ICAL_VEVENT_COMPONENT) {
-                dtstart = icalcomponent_get_first_property(comp, ICAL_DTSTART_PROPERTY);
-                if (dtstart)
-                    start = icalproperty_get_dtstart(dtstart);
-            } else if (icalcomponent_isa(comp) == ICAL_VTODO_COMPONENT) {
-                    due = icalcomponent_get_first_property(comp, ICAL_DUE_PROPERTY);
-                    if (due)
-                        start = icalproperty_get_due(due);
-            }
-
-            /* Convert to the user's timezone in order to be able to compare
-             * the results from the rrule iterator. */
-            if (icaltime_is_utc(start)) {
-	        start = icaltime_convert_to_zone(start, u_zone);
-                orig_time_was_utc = 1;
-            }
-
-            if (itr.last_component == NULL) {
-                itr.ritr = icalrecur_iterator_new(recur, start);
-                next = icalrecur_iterator_next(itr.ritr);
-                itr.last_component = comp;
-            }
-            else {
-                next = icalrecur_iterator_next(itr.ritr);
-                if (icaltime_is_null_time(next)){
-                    itr.last_component = NULL;
-                    icalrecur_iterator_free(itr.ritr);
-                    itr.ritr = NULL;
-                    /* no matched occurence */
-                    goto getNextComp;
-                } else {
-                    itr.last_component = comp;
-                }
-            }
-
-            /* if it is excluded, do next one */
-            if (icalproperty_recurrence_is_excluded(comp, &start, &next)) {
-	        icalrecur_iterator_decrement_count(itr.ritr);
-                continue;
-            }
-
-            /* add recurrence-id value to the property if the property already exist;
-             * add the recurrence id property and the value if the property does not exist */
-            prop = icalcomponent_get_first_property(comp, ICAL_RECURRENCEID_PROPERTY);
-            if (prop == 0)
-                icalcomponent_add_property(comp, icalproperty_new_recurrenceid(next));
-            else
-                icalproperty_set_recurrenceid(prop, next);
-
-            /* convert the next recurrence time into the user's timezone */
-            if (orig_time_was_utc) 
-                next = icaltime_convert_to_zone(next, icaltimezone_get_utc_timezone());
-
-        } /* end of a recurring event */
-
-        if (gauge == 0 || icalgauge_compare(itr.gauge, comp) == 1) {
-	    /* find a matched and return it */
-            itr.iter = citr;
-            return itr;
-        }
-       
-        /* if it is a recurring but no matched occurrence has been found OR
-         * it is not a recurring and no matched component has been found,
-         * read the next component to find out */
-getNextComp: 
-        if ((rrule != NULL && itr.last_component == NULL) ||
-           (rrule == NULL)) {
-            comp =  icalcompiter_next(&citr);
-            comp = icalcompiter_deref(&citr);
-    }
-    } /* while */
-
-    /* no matched component has found */
-    return icalsetiter_null;
-}
-
-icalcomponent* icalbdbset_form_a_matched_recurrence_component(icalsetiter* itr)
-{
-    icalcomponent* comp = NULL;
-    struct icaltimetype start, next, end;
-    icalproperty *dtstart, *rrule, *prop, *due;
-    struct icalrecurrencetype recur;
-    icaltimezone *u_zone;
-    int g = 0;
-    int orig_time_was_utc = 0;
-
-    comp = itr->last_component;
-
-    if (comp == NULL || itr->gauge == NULL) {
-        return NULL;
-    }
-
-
-    rrule = icalcomponent_get_first_property(comp, ICAL_RRULE_PROPERTY);
-    /* if there is no RRULE, simply return to the caller */
-    if (rrule == NULL)
-        return NULL;
-
-    u_zone = icaltimezone_get_builtin_timezone(itr->tzid);
-
-    /* use UTC, if that's all we have. */
-    if (!u_zone)
-        u_zone = icaltimezone_get_utc_timezone();
-
-    recur = icalproperty_get_rrule(rrule);
-
-    if (icalcomponent_isa(comp) == ICAL_VEVENT_COMPONENT) {
-        dtstart = icalcomponent_get_first_property(comp, ICAL_DTSTART_PROPERTY);
-        if (dtstart)
-            start = icalproperty_get_dtstart(dtstart);
-    } else if (icalcomponent_isa(comp) == ICAL_VTODO_COMPONENT) {
-        due = icalcomponent_get_first_property(comp, ICAL_DUE_PROPERTY);
-        if (due)
-            start = icalproperty_get_due(due);
-    }
-
-    /* Convert to the user's timezone in order to be able to compare the results
-     * from the rrule iterator. */
-    if (icaltime_is_utc(start)) {
-        start = icaltime_convert_to_zone(start, u_zone);
-        orig_time_was_utc = 1;
-    }
-
-    if (itr->ritr == NULL) {
-        itr->ritr = icalrecur_iterator_new(recur, start);
-        next = icalrecur_iterator_next(itr->ritr);
-        itr->last_component = comp;
-    } else {
-        next = icalrecur_iterator_next(itr->ritr);
-        if (icaltime_is_null_time(next)){
-            /* no more recurrence, returns */
-            itr->last_component = NULL;
-            icalrecur_iterator_free(itr->ritr);
-            itr->ritr = NULL;
-            /* no more pending matched occurence,
-             * all the pending matched occurences have been returned */
-            return NULL;
-        } else {
-            itr->last_component = comp;
-        }
-    }
-
-    /* if it is excluded, return NULL to the caller */
-    if (icalproperty_recurrence_is_excluded(comp, &start, &next)) {
-        icalrecur_iterator_decrement_count(itr->ritr);
-       return NULL; 
-    }
-
-    /* set recurrence-id value to the property if the property already exist;
-     * add the recurrence id property and the value if the property does not exist */
-    prop = icalcomponent_get_first_property(comp, ICAL_RECURRENCEID_PROPERTY);
-    if (prop == 0)
-        icalcomponent_add_property(comp, icalproperty_new_recurrenceid(next));
-    else
-        icalproperty_set_recurrenceid(prop, next);
-
-    if (orig_time_was_utc) {
-        next = icaltime_convert_to_zone(next, icaltimezone_get_utc_timezone());
-    }
-
-
-     if (itr->gauge == 0 || icalgauge_compare(itr->gauge, comp) == 1) {
-         /* find a matched and return it */
-         return comp;
-     } 
-
-     /* not matched */
-     return NULL;
-
-}
-
-icalcomponent* icalbdbsetiter_to_next(icalset *set, icalsetiter* i)
-{
-
-    icalcomponent* comp = NULL;
-    icalbdbset *bset = (icalbdbset*) set;
-    struct icaltimetype start, next, end;
-    icalproperty *dtstart, *rrule, *prop, *due;
-    struct icalrecurrencetype recur;
-    icaltimezone *u_zone;
-    int g = 0;
-    int orig_time_was_utc = 0;
-
-    do {
-
-        /* no pending occurence, read the next component */
-        if (i->last_component == NULL) {
-            comp = icalcompiter_next(&(i->iter));
-        }
-        else {
-            comp = i->last_component;
-        }
-
-        /* no next component, simply return */
-        if (comp == 0) return NULL;
-        if (i->gauge == 0) return comp;
-
-        /* finding the next matched component and return it to the caller */
-
-        rrule = icalcomponent_get_first_property(comp, ICAL_RRULE_PROPERTY);
-        g = icalgauge_get_expand(i->gauge);
-
-        /* a recurring component with expand query */
-        if (rrule != 0
-            && g == 1) {
-
-            u_zone = icaltimezone_get_builtin_timezone(i->tzid);
-
-            /* use UTC, if that's all we have. */
-            if (!u_zone)
-                u_zone = icaltimezone_get_utc_timezone();
-
-            recur = icalproperty_get_rrule(rrule);
-
-            if (icalcomponent_isa(comp) == ICAL_VEVENT_COMPONENT) {
-                dtstart = icalcomponent_get_first_property(comp, ICAL_DTSTART_PROPERTY);
-                if (dtstart)
-                    start = icalproperty_get_dtstart(dtstart);
-            } else if (icalcomponent_isa(comp) == ICAL_VTODO_COMPONENT) {
-                due = icalcomponent_get_first_property(comp, ICAL_DUE_PROPERTY);
-                if (due)
-                    start = icalproperty_get_due(due);
-            }
-
-            /* Convert to the user's timezone in order to be able to compare
-             * the results from the rrule iterator. */
-            if (icaltime_is_utc(start)) {
-                start = icaltime_convert_to_zone(start, u_zone);
-                orig_time_was_utc = 1;
-            }
-
-            if (i->ritr == NULL) {
-                i->ritr = icalrecur_iterator_new(recur, start);
-                next = icalrecur_iterator_next(i->ritr);
-                i->last_component = comp;
-            } else {
-                next = icalrecur_iterator_next(i->ritr);
-                if (icaltime_is_null_time(next)) {
-                    i->last_component = NULL;
-                    icalrecur_iterator_free(i->ritr);
-                    i->ritr = NULL;
-                    /* no more occurence, should go to get next component */
-                    continue;
-                } else {
-                    i->last_component = comp;
-                }
-            }
-
-            /* if it is excluded, do next one */
-            if (icalproperty_recurrence_is_excluded(comp, &start, &next)) {
-                icalrecur_iterator_decrement_count(i->ritr);
-                continue;
-            }
-
-            /* set recurrence-id value to the property if the property already exist;
-             * add the recurrence id property and the value if the property does not exist */
-            prop = icalcomponent_get_first_property(comp, ICAL_RECURRENCEID_PROPERTY);
-            if (prop == 0)
-               icalcomponent_add_property(comp, icalproperty_new_recurrenceid(next));
-            else
-               icalproperty_set_recurrenceid(prop, next);
-
-            if (orig_time_was_utc) {
-                next = icaltime_convert_to_zone(next, icaltimezone_get_utc_timezone());
-            }
- 
-        } /* end of recurring event with expand query */
-
-        if(comp != 0 && (i->gauge == 0 ||
-            icalgauge_compare(i->gauge, comp) == 1)){
-           /* found a matched, return it */ 
-            return comp;
-        }
-    } while (comp != 0);
-
-    return 0;
-
-}
-
-icalcomponent* icalbdbset_get_next_component(icalset* set)
-{
-    icalbdbset *bset = (icalbdbset*)set;
-    icalcomponent *c=0;
-
-    struct icaltimetype start, next;
-    icalproperty *dtstart, *rrule, *prop, *due;
-    struct icalrecurrencetype recur;
-    int g = 0;
-
-    icalerror_check_arg_rz((bset!=0),"bset");
-    
-    do {
-            c = icalcomponent_get_next_component(bset->cluster,
-					     ICAL_ANY_COMPONENT);
-                if(c != 0 && (bset->gauge == 0 ||
-                    icalgauge_compare(bset->gauge,c) == 1)){
-                    return c;
-                }
-
-    } while(c != 0);
-    
-    return 0;
-}
-
-int icalbdbset_begin_transaction(DB_TXN* parent_tid, DB_TXN** tid)
-{
-    return (ICAL_DB_ENV->txn_begin(ICAL_DB_ENV, parent_tid, tid, 0));
-}
-
-int icalbdbset_commit_transaction(DB_TXN* txnid)
-{
-    return (txnid->commit(txnid, 0));
-}
-
-
-static int _compare_keys(DB *dbp, const DBT *a, const DBT *b)
-{
-/* 
- * Returns: 
- * < 0 if a < b 
- * = 0 if a = b 
- * > 0 if a > b 
- */ 
-	
-    char*  ac = (char*)a->data;
-    char*  bc = (char*)b->data;
-    return (strncmp(ac, bc, a->size));
-}
-
-
-
diff --git a/libical/src/libicalss/icalbdbset.h b/libical/src/libicalss/icalbdbset.h
deleted file mode 100644
index 4c278bea31..0000000000
--- a/libical/src/libicalss/icalbdbset.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalbdbset.h
- CREATOR: dml 12 December 2001
- (C) COPYRIGHT 2001, Critical Path
-
- $Id$
- $Locker$
-======================================================================*/
-
-#ifndef ICALBDBSET_H
-#define ICALBDBSET_H
-
-#include <libical/ical.h>
-#include <libicalss/icalset.h>
-#include <libicalss/icalgauge.h>
-#include <db.h>
-
-typedef struct icalbdbset_impl icalbdbset;
-
-enum icalbdbset_subdb_type {ICALBDB_CALENDARS, ICALBDB_EVENTS, ICALBDB_TODOS, ICALBDB_REMINDERS};
-typedef enum icalbdbset_subdb_type icalbdbset_subdb_type;
-
-/** sets up the db environment, should be done in parent thread.. */
-int icalbdbset_init_dbenv(char *db_env_dir, void (*logDbFunc)(const char*, char*));
-
-icalset*  icalbdbset_init(icalset* set, const char *dsn, void *options);
-int icalbdbset_cleanup(void);
-void icalbdbset_checkpoint(void);
-void icalbdbset_rmdbLog(void);
-
-/** Creates a component handle.  flags allows caller to 
-   specify if database is internally a BTREE or HASH */
-icalset * icalbdbset_new(const char* database_filename, 
-			 icalbdbset_subdb_type subdb_type,
-			 int dbtype, int flag);
-
-DB * icalbdbset_bdb_open_secondary(DB *dbp,
-			       const char *subdb,
-			       const char *sindex, 
-			       int (*callback) (DB *db, 
-						const DBT *dbt1, 
-						const DBT *dbt2, 
-						DBT *dbt3),
-			       int type);
-			       
-char *icalbdbset_parse_data(DBT *dbt, char *(*pfunc)(const DBT *dbt)) ;
-
-void icalbdbset_free(icalset* set);
-
-/* cursor operations */
-int icalbdbset_acquire_cursor(DB *dbp, DB_TXN* tid, DBC **rdbcp);
-int icalbdbset_cget(DBC *dbcp, DBT *key, DBT *data, int access_method);
-int icalbdbset_cput(DBC *dbcp, DBT *key, DBT *data, int access_method);
-
-int icalbdbset_get_first(DBC *dbcp, DBT *key, DBT *data);
-int icalbdbset_get_next(DBC *dbcp, DBT *key, DBT *data);
-int icalbdbset_get_last(DBC *dbcp, DBT *key, DBT *data);
-int icalbdbset_get_key(DBC *dbcp, DBT *key, DBT *data);
-int icalbdbset_delete(DB *dbp, DBT *key);
-int icalbdbset_put(DB *dbp, DBT *key, DBT *data, int access_method);
-int icalbdbset_get(DB *dbp, DB_TXN *tid, DBT *key, DBT *data, int flags);
-
-const char* icalbdbset_path(icalset* set);
-const char* icalbdbset_subdb(icalset* set);
-
-/* Mark the set as changed, so it will be written to disk when it
-   is freed. Commit writes to disk immediately. */
-void icalbdbset_mark(icalset* set);
-icalerrorenum icalbdbset_commit(icalset *set);
-
-icalerrorenum icalbdbset_add_component(icalset* set,
-					icalcomponent* child);
-
-icalerrorenum icalbdbset_remove_component(icalset* set,
-					   icalcomponent* child);
-
-int icalbdbset_count_components(icalset* set,
-				 icalcomponent_kind kind);
-
-/* Restrict the component returned by icalbdbset_first, _next to those
-   that pass the gauge. _clear removes the gauge */
-icalerrorenum icalbdbset_select(icalset* store, icalgauge* gauge);
-void icalbdbset_clear(icalset* store);
-
-/* Get and search for a component by uid */
-icalcomponent* icalbdbset_fetch(icalset* set, icalcomponent_kind kind, const char* uid);
-int icalbdbset_has_uid(icalset* set, const char* uid);
-icalcomponent* icalbdbset_fetch_match(icalset* set, icalcomponent *c);
-
-
-icalerrorenum icalbdbset_modify(icalset* set, icalcomponent *old,
-				icalcomponent *newc);
-
-/* cluster management functions */
-icalerrorenum  icalbdbset_set_cluster(icalset* set, icalcomponent* cluster);
-icalerrorenum  icalbdbset_free_cluster(icalset* set);
-icalcomponent* icalbdbset_get_cluster(icalset* set);
-
-/* Iterate through components. If a gauge has been defined, these
-   will skip over components that do not pass the gauge */
-
-icalcomponent* icalbdbset_get_current_component (icalset* set);
-icalcomponent* icalbdbset_get_first_component(icalset* set);
-icalcomponent* icalbdbset_get_next_component(icalset* set);
-
-/* External iterator for thread safety */
-icalsetiter icalbdbset_begin_component(icalset* set, icalcomponent_kind kind, icalgauge* gauge, const char* tzid);
-
-icalcomponent* icalbdbset_form_a_matched_recurrence_component(icalsetiter* itr);
-
-icalcomponent* icalbdbsetiter_to_next(icalset* set, icalsetiter* i);
-icalcomponent* icalbdbsetiter_to_prior(icalset* set, icalsetiter* i);
-
-/* Return a reference to the internal component. You probably should
-   not be using this. */
-
-icalcomponent* icalbdbset_get_component(icalset* set);
-
-DB_ENV *icalbdbset_get_env(void);
-
-
-int icalbdbset_begin_transaction(DB_TXN* parent_id, DB_TXN** txnid);
-int icalbdbset_commit_transaction(DB_TXN* txnid);
-
-DB* icalbdbset_bdb_open(const char* path, 
-			const char *subdb,
-			int type,
-			mode_t mode, int flag);
-
-
-typedef struct icalbdbset_options {
-  icalbdbset_subdb_type subdb;	   /**< the subdatabase to open */
-  int                   dbtype;	   /**< db_open type: DB_HASH | DB_BTREE */
-  mode_t                mode;	   /**< file mode */
-  u_int32_t             flag;      /**< DB->set_flags(): DB_DUP | DB_DUPSORT */
-  char *(*pfunc)(const DBT *dbt);  /**< parsing function */
-  int (*callback) (DB *db,	   /**< callback for secondary db open */
-		   const DBT *dbt1, 
-		   const DBT *dbt2, 
-		   DBT *dbt3);
-} icalbdbset_options;
-
-#endif /* !ICALBDBSET_H */
-
-
-
diff --git a/libical/src/libicalss/icalbdbset_cxx.h b/libical/src/libicalss/icalbdbset_cxx.h
deleted file mode 100644
index a80e195139..0000000000
--- a/libical/src/libicalss/icalbdbset_cxx.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalbdbset_cxx.h
- CREATOR: dml 12/12/01
- (C) COPYRIGHT 2001, Critical Path
-======================================================================*/
-
-#ifndef ICALBDBSET_CXX_H
-#define ICALBDBSET_CXX_H
-
-
-extern "C" {
-#include <libical/ical.h>
-#include <libicalss/icalgauge.h>
-}
-
-#include "vcomponent.h"
-#include <db_cxx.h>
-
-typedef	char* string; // Will use the string library from STL
-
-class ICalBDBSet {
-public:
-
-  ICalBDBSet();
-  ICalBDBSet(const ICalBDBSet&);
-  ICalBDBSet operator=(const ICalBDBSet &);
-  ~ICalBDBSet();
-
-  ICalBDBSet(const string& path, int flags);
-
-public:
-
-  void free();
-  string path();
-
-  icalerrorenum add_component(VComponent* child);
-  icalerrorenum remove_component(VComponent* child);
-  int count_components(icalcomponent_kind kind);
-
-  // Restrict the component returned by icalbdbset_first, _next to those
-  // that pass the gauge. _clear removes the gauge 
-  icalerrorenum select(icalgauge *gauge);
-  void clear();
-
-  // Get and search for a component by uid 
-  VComponent* fetch(string &uid);
-  VComponent* fetch_match(icalcomponent *c);
-  int has_uid(string &uid);
-
-  // Iterate through components. If a guage has been defined, these
-  // will skip over components that do not pass the gauge 
-  VComponent* get_current_component();
-  VComponent* get_first_component();
-  VComponent* get_next_component();
-
-  VComponent* get_component();
-
-};
-
-#endif
diff --git a/libical/src/libicalss/icalbdbsetimpl.h b/libical/src/libicalss/icalbdbsetimpl.h
deleted file mode 100644
index 9cde41b36b..0000000000
--- a/libical/src/libicalss/icalbdbsetimpl.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalbdbsetimpl.h
-  CREATOR: dml 12 December 2001
-  (C) COPYRIGHT 2001, Critical Path
-
-  $Id$
-  $Locker$
- ======================================================================*/
-
-#ifndef ICALBDBSETIMPL_H
-#define ICALBDBSETIMPL_H
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <libicalss/icalgauge.h>
-#include <db.h>
-
-/* This definition is in its own file so it can be kept out of the
-   main header file, but used by "friend classes" like icaldirset*/
-
-struct icalbdbset_impl {
-  icalset super;		/**< parent class */
-  const char *path;
-  const char *subdb;
-  const char *sindex;
-  const char *key;
-  void *data;
-  int datasize;
-  int changed;
-  icalcomponent* cluster;
-  icalgauge* gauge;
-  DB_ENV *dbenv;
-  DB *dbp;
-  DB *sdbp;
-  DBC *dbcp;
-};
-
-#endif
diff --git a/libical/src/libicalss/icalcalendar.c b/libical/src/libicalss/icalcalendar.c
deleted file mode 100644
index 1f24f88db6..0000000000
--- a/libical/src/libicalss/icalcalendar.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/*======================================================================
-  FILE: icalcalendar.c
-  CREATOR: eric 23 December 1999
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- ======================================================================*/
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-
-#include "icalcalendar.h"
-#include "icalset.h"
-#include "icalfileset.h"
-#include "icaldirset.h"
-#include <limits.h> 
-#include <sys/stat.h> /* For mkdir, stat */
-#include <sys/types.h> /* For mkdir */
-#include <fcntl.h> /* For mkdir */
-
-#ifndef WIN32
-#include <unistd.h>  /* For mkdir, stat */    
-#endif
-
-#ifndef PATH_MAX
-#define PATH_MAX 512
-#endif
-
-
-#include <stdlib.h> /* for malloc */
-#include <string.h> /* for strcat */
-#include <errno.h>
-
-#define BOOKED_DIR "booked"
-#define INCOMING_FILE "incoming.ics"
-#define PROP_FILE "properties.ics"
-#define FBLIST_FILE "freebusy.ics"
-
-struct icalcalendar_impl 
-{
-	char* dir;
-	icalset* freebusy;
-	icalset* properties;
-	icalset* booked;
-	icalset* incoming;
-};
-
-struct icalcalendar_impl* icalcalendar_new_impl(void)
-{
-    struct icalcalendar_impl* impl;
-
-    if ( ( impl = (struct icalcalendar_impl*)
-	   malloc(sizeof(struct icalcalendar_impl))) == 0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-    return impl;
-}
-
-
-icalerrorenum icalcalendar_create(struct icalcalendar_impl* impl)
-{
-    char path[PATH_MAX];
-    struct stat sbuf;
-    int r;
-    
-    icalerror_check_arg_re((impl != 0),"impl",ICAL_BADARG_ERROR);
-
-    path[0] = '\0';
-    strcpy(path,impl->dir);
-    strcat(path,"/");
-    strcat(path,BOOKED_DIR);
-
-    r = stat(path,&sbuf);
-
-    if( r != 0 && errno == ENOENT){
-
-	if(mkdir(path,0777)!=0){
-	    icalerror_set_errno(ICAL_FILE_ERROR);
-	    return ICAL_FILE_ERROR;
-	}
-    }
-
-    return ICAL_NO_ERROR;
-}
-
-icalcalendar* icalcalendar_new(char* dir)
-{
-    struct icalcalendar_impl* impl;
-
-    icalerror_check_arg_rz((dir != 0),"dir");
-    
-    impl = icalcalendar_new_impl();
-
-    if (impl == 0){
-	return 0;
-    }
-
-    impl->dir = (char*)strdup(dir);
-    impl->freebusy = 0;
-    impl->properties = 0;
-    impl->booked = 0;
-    impl->incoming = 0;
-
-    if (icalcalendar_create(impl) != ICAL_NO_ERROR){
-	free(impl);
-	return 0;
-    }
-
-    return impl;
-}
-
-void icalcalendar_free(icalcalendar* impl)
-{
-    if (impl->dir !=0){
-	free(impl->dir);
-    }
-
-    if (impl->freebusy !=0){
-	icalset_free(impl->booked);
-    }
-
-    if (impl->properties !=0){
-	icalset_free(impl->properties);
-    }
-
-    if (impl->booked !=0){
-	icalset_free(impl->booked);
-    }
-
-    if (impl->incoming !=0){
-	icalset_free(impl->incoming);
-    }
-
-    impl->dir = 0;
-    impl->freebusy = 0;
-    impl->properties = 0;
-    impl->booked = 0;
-    impl->incoming = 0;
-
-
-    free(impl);
-}
-
-
-int icalcalendar_lock(icalcalendar* impl)
-{
-    icalerror_check_arg_rz((impl != 0),"impl");
-    return 0;
-}
-
-int icalcalendar_unlock(icalcalendar* impl)
-{
-    icalerror_check_arg_rz((impl != 0),"impl");
-    return 0;
-}
-
-int icalcalendar_islocked(icalcalendar* impl)
-{
-    icalerror_check_arg_rz((impl != 0),"impl");
-    return 0;
-}
-
-int icalcalendar_ownlock(icalcalendar* impl)
-{
-    icalerror_check_arg_rz((impl != 0),"impl");
-    return 0;
-}
-
-icalset* icalcalendar_get_booked(icalcalendar* impl)
-{
-    char dir[PATH_MAX];
-
-    icalerror_check_arg_rz((impl != 0),"impl");
-    
-    dir[0] = '\0';
-    strcpy(dir,impl->dir);
-    strcat(dir,"/");
-    strcat(dir,BOOKED_DIR);
-
-    if (impl->booked == 0){
-	icalerror_clear_errno();
-	impl->booked = icaldirset_new(dir);
-	assert(icalerrno == ICAL_NO_ERROR);
-    }
-
-    return impl->booked;
-
-}
-
-icalset* icalcalendar_get_incoming(icalcalendar* impl)
-{
-    char path[PATH_MAX];
-    icalerror_check_arg_rz((impl != 0),"impl");
-
-    path[0] = '\0';
-    strcpy(path,impl->dir);
-    strcat(path,"/");
-    strcat(path,INCOMING_FILE);
-
-    if (impl->properties == 0){
-	impl->properties = icalfileset_new(path);
-    }
-
-    return impl->properties;
-}
-
-icalset* icalcalendar_get_properties(icalcalendar* impl)
-{
-    char path[PATH_MAX];
-    icalerror_check_arg_rz((impl != 0),"impl");
-
-    path[0] = '\0';
-    strcpy(path,impl->dir);
-    strcat(path,"/");
-    strcat(path,PROP_FILE);
-
-    if (impl->properties == 0){
-	impl->properties = icalfileset_new(path);
-    }
-
-    return impl->properties;
-}
-
-icalset* icalcalendar_get_freebusy(icalcalendar* impl)
-{
-    char path[PATH_MAX];
-    icalerror_check_arg_rz((impl != 0),"impl");
-
-    path[0] = '\0';
-    strcpy(path,impl->dir);
-    strcat(path,"/");
-    strcat(path,FBLIST_FILE);
-
-
-    if (impl->freebusy == 0){
-	impl->freebusy = icalfileset_new(path);
-    }
-
-    return impl->freebusy;
-}
-
-
-
-
diff --git a/libical/src/libicalss/icalcalendar.h b/libical/src/libicalss/icalcalendar.h
deleted file mode 100644
index 62abdfa7c0..0000000000
--- a/libical/src/libicalss/icalcalendar.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalcalendar.h
- CREATOR: eric 23 December 1999
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
-======================================================================*/
-
-#ifndef ICALCALENDAR_H
-#define ICALCALENDAR_H
-
-#include <libical/ical.h>
-#include <libicalss/icalset.h>
-
-/* icalcalendar
- * Routines for storing calendar data in a file system. The calendar 
- * has two icaldirsets, one for incoming components and one for booked
- * components. It also has interfaces to access the free/busy list
- * and a list of calendar properties */
-
-typedef struct icalcalendar_impl icalcalendar;
-
-icalcalendar* icalcalendar_new(char* dir);
-
-void icalcalendar_free(icalcalendar* calendar);
-
-int icalcalendar_lock(icalcalendar* calendar);
-
-int icalcalendar_unlock(icalcalendar* calendar);
-
-int icalcalendar_islocked(icalcalendar* calendar);
-
-int icalcalendar_ownlock(icalcalendar* calendar);
-
-icalset* icalcalendar_get_booked(icalcalendar* calendar);
-
-icalset* icalcalendar_get_incoming(icalcalendar* calendar);
-
-icalset* icalcalendar_get_properties(icalcalendar* calendar);
-
-icalset* icalcalendar_get_freebusy(icalcalendar* calendar);
-
-
-#endif /* !ICALCALENDAR_H */
-
-
-
diff --git a/libical/src/libicalss/icalcaputil.h b/libical/src/libicalss/icalcaputil.h
deleted file mode 100644
index 4f9bcb31c4..0000000000
--- a/libical/src/libicalss/icalcaputil.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalutil.h
- CREATOR: eric 23 December 1999
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
- =========================================================================*/
-
-
-/* Create new components that have a form suitable for the various
-   iTIP trasactions */
-
-/* Scheduling commands */ 
-icalcomponent* icalcaputil_new_accept_reply(icalcomponent* comp, char* calid);
-icalcomponent* icalcaputil_new_decline_reply(icalcomponent* comp, char* calid);
-icalcomponent* icalcaputil_new_refresh(icalcomponent* comp, char* calid);
-icalcomponent* icalcaputil_new_cancel(icalcomponent* comp);
-icalcomponent* icalcaputil_new_counter(icalcomponent* comp);
-icalcomponent* icalcaputil_new_declinecounter(icalcomponent* comp);
-
-/* Calendaring commands */
-icalcomponent* icalcaputil_new_create();
-icalcomponent* icalcaputil_new_delete();
-icalcomponent* icalcaputil_new_modify();
-icalerrorenum* icalcaputil_modify_add_old_prop(icalcomponent* c, 
-					       icalproperty *p);
-icalerrorenum* icalcaputil_modify_add_new_prop(icalcomponent* c, 
-					       icalproperty *p);
-icalerrorenum* icalcaputil_add_query(icalcomponent* c, char* str);
-
-
-icalcomponent* icalcaputil_new_move();
-icalcomponent* icalcaputil_new_read();
-
-icalerrorenum icalcaputil_add_target(icalcomponent* comp,char* target);
-icalerrorenum icalcaputil_add_to_vcar(icalcomponent* comp,char* target);
-
-
-				    
-
-
diff --git a/libical/src/libicalss/icalclassify.c b/libical/src/libicalss/icalclassify.c
deleted file mode 100644
index e67287bc1b..0000000000
--- a/libical/src/libicalss/icalclassify.c
+++ /dev/null
@@ -1,754 +0,0 @@
-/* -*- Mode: C -*-
-    ======================================================================
-    FILE: icalclassify.c
-    CREATOR: ebusboom 23 aug 2000
-  
-    $Id$
-    $Locker$
-    
-    (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-    
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of either: 
-    
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-    
-    Or:
-    
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
-    ======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <libical/ical.h>
-#include "icalclassify.h"
-#include <libical/icalmemory.h>
-
-#include <ctype.h>   /* For tolower() */
-#include <string.h> /* for index() */
-#include <stdlib.h> /* for malloc and free */
-
-
-
-struct icalclassify_parts {
-    icalcomponent *c;
-    icalcomponent_kind inner_kind;
-    icalproperty_method method;
-    char* organizer;
-    icalparameter_partstat reply_partstat;
-    char* reply_attendee;
-    char* uid;
-    int sequence;
-    struct icaltimetype dtstamp;	
-    struct icaltimetype recurrence_id;
-}; 
-	
-
-char* icalclassify_lowercase(const char* str)
-{
-    char* p = 0;
-    char* new = icalmemory_strdup(str);
-
-    if(str ==0){
-	return 0;
-    }
-
-    for(p = new; *p!=0; p++){
-	*p = tolower(*p);
-    }
-
-    return new;
-}
-
-/* Return a set of components that intersect in time with comp. For
-component X and Y to intersect:
-    X.DTSTART < Y.DTEND && X.DTEND > Y.DTSTART
-*/
-
-
-icalcomponent* icalclassify_find_overlaps(icalset* set, icalcomponent* comp)
-{
-    icalcomponent *return_set;
-    icalcomponent *c;
-    struct icaltime_span span,compspan;
-    
-    icalerror_clear_errno();
-    compspan = icalcomponent_get_span(comp);
-
-    if(icalerrno != ICAL_NO_ERROR){
-	return 0;
-    }
-
-
-    return_set = icalcomponent_new(ICAL_XROOT_COMPONENT);
-
-    for(c = icalset_get_first_component(set);
-	c != 0;
-	c = icalset_get_next_component(set)){
-
-	icalerror_clear_errno();
-
-	span = icalcomponent_get_span(c);
-
-	if(icalerrno != ICAL_NO_ERROR){
-	    continue;
-	}
-
-	if (compspan.start < span.end && 
-	    compspan.end > span.start){
-
-	    icalcomponent *clone = icalcomponent_new_clone(c);
-
-	    icalcomponent_add_component(return_set,clone);
-	}	
-    }
-
-    if(icalcomponent_count_components(return_set,ICAL_ANY_COMPONENT) !=0){
-	return return_set;
-    } else {
-	icalcomponent_free(return_set);
-	return 0;
-    }
-}
-
-
-
-icalproperty* icalclassify_find_attendee(icalcomponent *c, 
-						  const char* attendee)
-{
-    icalproperty *p;
-    icalcomponent* inner;
-    char* lattendee;
-    char* upn;
-
-    if(attendee == 0){
-        return 0;
-    }
-
-    lattendee = icalclassify_lowercase(attendee);
-    upn =  strchr(lattendee,':');
-
-    if (upn== 0){
-        upn = lattendee;
-    } else {
-        upn++; /* skip the ";"*/
-    }
-
-    inner = icalcomponent_get_first_real_component(c);
-
-    for(p  = icalcomponent_get_first_property(inner,ICAL_ATTENDEE_PROPERTY);
-	p != 0;
-	p  = icalcomponent_get_next_property(inner,ICAL_ATTENDEE_PROPERTY))
-    {
-	char* this_attendee
-	    = icalclassify_lowercase(icalproperty_get_attendee(p));
-	char* this_upn = strchr(this_attendee,':');
-
-        if(this_upn == 0){
-            continue;
-        } else {
-            this_upn++;
-        }
-
-	if(strcmp(this_upn,upn)==0){
-			free(lattendee);
-			free(this_attendee);
-            return p;
-	}
-
-		free(this_attendee);
-    }
-	free(lattendee);
-
-    return 0;
-
-}
-
-void icalssutil_free_parts(struct icalclassify_parts *parts)
-{
-    if(parts == 0){
-	return;
-    }
-
-    if(parts->organizer != 0){
-	free(parts->organizer);
-    }
-
-    if(parts->uid != 0){
-	free(parts->uid);
-    }
-
-    if(parts->reply_attendee){
-	free(parts->reply_attendee);
-    }
-}
-
-void icalssutil_get_parts(icalcomponent* c,  
-			  struct icalclassify_parts* parts)
-{
-    icalproperty *p;
-    icalcomponent *inner;
-
-    memset(parts,0,sizeof(struct icalclassify_parts));
-
-    parts->method = ICAL_METHOD_NONE;
-    parts->sequence = 0;
-    parts->reply_partstat = ICAL_PARTSTAT_NONE;
-
-    if(c == 0){
-	return;
-    }
-
-    parts->c = c;
-
-    p = icalcomponent_get_first_property(c,ICAL_METHOD_PROPERTY);
-    if(p!=0){
-	parts->method = icalproperty_get_method(p);
-    }
-
-    inner = icalcomponent_get_first_real_component(c);
-
-    parts->inner_kind = icalcomponent_isa(inner);
-
-    p = icalcomponent_get_first_property(inner,ICAL_ORGANIZER_PROPERTY);
-    if(p!=0){
-	parts->organizer = strdup(icalproperty_get_organizer(p));
-    }
-
-    p = icalcomponent_get_first_property(inner,ICAL_SEQUENCE_PROPERTY);    
-    if(p!=0){
-	parts->sequence = icalproperty_get_sequence(p);
-    }
-
-    p = icalcomponent_get_first_property(inner,ICAL_UID_PROPERTY);
-    if(p!=0){
-	parts->uid = strdup(icalproperty_get_uid(p));
-    }
-
-    p = icalcomponent_get_first_property(inner,ICAL_RECURRENCEID_PROPERTY);
-    if(p!=0){
-	parts->recurrence_id = icalproperty_get_recurrenceid(p);
-    }
-
-    p = icalcomponent_get_first_property(inner,ICAL_DTSTAMP_PROPERTY);
-    if(p!=0){
-	parts->dtstamp = icalproperty_get_dtstamp(p);
-    }
-
-    if(parts->method==ICAL_METHOD_REPLY){
-	icalparameter *param;
-	p  = icalcomponent_get_first_property(inner,ICAL_ATTENDEE_PROPERTY);
-
-	if(p!=0){
-
-	    param = icalproperty_get_first_parameter(p,ICAL_PARTSTAT_PARAMETER);
-	    
-	    if(param != 0){
-		parts->reply_partstat = 
-		    icalparameter_get_partstat(param);
-	    }
-	    
-	    parts->reply_attendee = strdup(icalproperty_get_attendee(p));
-	}
-
-    }    
-
-
-}
-
-
-int icalssutil_is_rescheduled(icalcomponent* a,icalcomponent* b)
-{
-    icalproperty *p1,*p2;
-    icalcomponent *i1,*i2;
-    int i;
-
-    icalproperty_kind kind_array[] = {
-	ICAL_DTSTART_PROPERTY,
-	ICAL_DTEND_PROPERTY,
-	ICAL_DURATION_PROPERTY,
-	ICAL_DUE_PROPERTY,
-	ICAL_RRULE_PROPERTY,
-	ICAL_RDATE_PROPERTY,
-	ICAL_EXRULE_PROPERTY,
-	ICAL_EXDATE_PROPERTY,
-	ICAL_NO_PROPERTY
-    };
-
-    i1 = icalcomponent_get_first_real_component(a);
-    i2 = icalcomponent_get_first_real_component(b);
-
-    for(i =0; kind_array[i] != ICAL_NO_PROPERTY; i++){
-	p1 = icalcomponent_get_first_property(i1,kind_array[i]);
-	p2 = icalcomponent_get_first_property(i2,kind_array[i]);
-	
-	if( (p1!=0)^(p2!=0) ){
-	    /* Return true if the property exists in one component and not
-	       the other */
-	    return 1;
-	}
-	
-	if(p1 && strcmp(icalproperty_as_ical_string(p1),
-			icalproperty_as_ical_string(p2)) != 0){
-	    return 1;
-	}
-    }
-
-    return 0;
-    
-}
-
-#define icalclassify_pre \
-    int rtrn =0; 
-
-#define icalclassify_post \
-    return rtrn;
-
-
-int icalclassify_publish_new(struct icalclassify_parts *comp, 
-				struct icalclassify_parts *match, 
-				const char* user)
-{
-    icalclassify_pre;
-
-    if(comp->method == ICAL_METHOD_PUBLISH &&
-	match == 0 && comp->inner_kind != ICAL_VFREEBUSY_COMPONENT){
-	rtrn = 1;
-    }
-	
-    icalclassify_post;
-
-}
-
-int icalclassify_publish_update(struct icalclassify_parts *comp, 
-				struct icalclassify_parts *match, 
-				const char* user)
-{
-    icalclassify_pre;
-
-    if(comp->method == ICAL_METHOD_PUBLISH &&
-	match !=0 && comp->inner_kind != ICAL_VFREEBUSY_COMPONENT){
-	rtrn = 1;
-    }
-	
-    icalclassify_post;
-
-}
-
-int icalclassify_publish_freebusy(struct icalclassify_parts *comp, 
-				struct icalclassify_parts *match, 
-				const char* user)
-{
-    icalclassify_pre;
-
-    if(comp->method == ICAL_METHOD_PUBLISH &&
-       comp->inner_kind == ICAL_VFREEBUSY_COMPONENT){
-	rtrn = 1;
-    }
-	
-    icalclassify_post;
-
-}
-
-
-int icalclassify_request_new(struct icalclassify_parts *comp, 
-				    struct icalclassify_parts *match, 
-				    const char* user)
-{
-    /* Method is  REQUEST, and there is no match */
-
-    icalclassify_pre
-
-    if(match->c==0 && comp->method == ICAL_METHOD_REQUEST){
-	rtrn = 1;
-    }
-
-    icalclassify_post
-
-}
-
-int icalclassify_request_update(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    /* REQUEST method, Higher SEQUENCE than match, and all
-       time-related properties are unchanged */
-    
-    icalclassify_pre
-
-    if (match != 0 &&
-	comp->sequence >= match->sequence &&
-	!icalssutil_is_rescheduled(comp->c,match->c)){
-	rtrn = 1;
-    }
-
-    icalclassify_post
-
-}
-
-int icalclassify_request_reschedule(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    /* REQUEST method, Higher SEQUENCE than match, and one or more
-       time-related properties are changed */
-    icalclassify_pre
-
-    if (match->c != 0 &&
-	comp->sequence > match->sequence &&
-	icalssutil_is_rescheduled(comp->c,match->c)){
-	rtrn = 1;
-    }
-
-    icalclassify_post
-
-}
-
-int icalclassify_request_delegate(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalproperty* attendee;
-    icalparameter* param;
-    icalclassify_pre;
-
-    attendee = icalclassify_find_attendee(comp->c,user);
-
-    if(attendee == 0){
-        return 0;
-    }
-
-    param = icalproperty_get_first_parameter(attendee,ICAL_DELEGATEDFROM_PARAMETER);
-	    
-    if (param != 0){
-	rtrn = 1;
-    }
-
-    icalclassify_post
-
-}
-
-int icalclassify_request_new_organizer(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    /*   Organizer has changed between match and component */
-    icalclassify_pre
-    icalerror_set_errno(ICAL_UNIMPLEMENTED_ERROR);
-    icalclassify_post
-
-}
-
-int icalclassify_request_status(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalclassify_pre
-    icalerror_set_errno(ICAL_UNIMPLEMENTED_ERROR);
-    icalclassify_post
-}
-
-int icalclassify_request_forward(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalclassify_pre
-    icalerror_set_errno(ICAL_UNIMPLEMENTED_ERROR);
-    icalclassify_post
-}
-
-int icalclassify_request_freebusy(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalclassify_pre
-    icalerror_set_errno(ICAL_UNIMPLEMENTED_ERROR);
-    icalclassify_post
-}
-
-int icalclassify_reply_accept(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalproperty* attendee;
-    icalclassify_pre;
-
-    attendee = icalclassify_find_attendee(match->c,comp->reply_attendee);
-
-    if(attendee != 0&&
-       comp->reply_partstat == ICAL_PARTSTAT_ACCEPTED){
-	rtrn = 1;
-    }
-
-    icalclassify_post
-}
-int icalclassify_reply_decline(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalproperty* attendee;
-    icalclassify_pre;
-
-    attendee = icalclassify_find_attendee(match->c,comp->reply_attendee);
-
-
-    if( attendee != 0 &&
-       comp->reply_partstat == ICAL_PARTSTAT_DECLINED){
-	rtrn = 1;
-    }
-    icalclassify_post
-}
-int icalclassify_reply_delegate(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalproperty* attendee;
-    icalclassify_pre;
-
-    attendee = icalclassify_find_attendee(match->c,comp->reply_attendee);
-
-    if( attendee != 0 &&
-       comp->reply_partstat == ICAL_PARTSTAT_DELEGATED){
-	rtrn = 1;
-    }
-    icalclassify_post
-}
-int icalclassify_reply_crasher_accept(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalproperty* attendee;
-    icalclassify_pre;
-
-    attendee= icalclassify_find_attendee(match->c,comp->reply_attendee);
-
-    if(attendee == 0 &&
-       comp->reply_partstat == ICAL_PARTSTAT_ACCEPTED){
-	rtrn = 1;
-    }
-    icalclassify_post
-}
-int icalclassify_reply_crasher_decline(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalproperty* attendee;
-    icalclassify_pre;
-
-
-    attendee = icalclassify_find_attendee(match->c,comp->reply_attendee);
-
-    if(attendee == 0 &&
-       comp->reply_partstat == ICAL_PARTSTAT_DECLINED){
-	rtrn = 1;
-    }
-    icalclassify_post
-}
-int icalclassify_add_instance(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalclassify_pre
-    if(comp->method == ICAL_METHOD_ADD){
-	rtrn = 1;
-    }
-    icalclassify_post
-}
-int icalclassify_cancel_event(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalclassify_pre
-    if(comp->method == ICAL_METHOD_CANCEL){
-	rtrn = 1;
-    }
-    icalclassify_post
-}
-int icalclassify_cancel_instance(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalclassify_pre
-    if(comp->method == ICAL_METHOD_CANCEL){
-	rtrn = 1;
-    }
-    icalclassify_post
-}
-int icalclassify_cancel_all(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalclassify_pre
-    if(comp->method == ICAL_METHOD_CANCEL){
-	rtrn = 1;
-    }
-    icalclassify_post
-}
-int icalclassify_refesh(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalclassify_pre
-    if(comp->method == ICAL_METHOD_REFRESH){
-	rtrn = 1;
-    }
-    icalclassify_post
-}
-int icalclassify_counter(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalclassify_pre
-    if(comp->method == ICAL_METHOD_COUNTER){
-	rtrn = 1;
-    }
-    icalclassify_post
-}
-int icalclassify_delinecounter(
-    struct icalclassify_parts *comp,
-    struct icalclassify_parts *match, 
-    const char* user)
-{
-    icalclassify_pre
-
-    if(comp->method == ICAL_METHOD_DECLINECOUNTER){
-	rtrn = 1;
-    }
-	
-    icalclassify_post
-}
-
-struct icalclassify_map {
-	icalproperty_method method;
-	int (*fn)(struct icalclassify_parts *comp,struct icalclassify_parts *match, const char* user);
-	icalproperty_xlicclass class;
-} icalclassify_map[] = 
-{ {ICAL_METHOD_PUBLISH,icalclassify_publish_new,ICAL_XLICCLASS_PUBLISHNEW},
- {ICAL_METHOD_PUBLISH,icalclassify_publish_update,ICAL_XLICCLASS_PUBLISHUPDATE},
- {ICAL_METHOD_PUBLISH,icalclassify_publish_freebusy,ICAL_XLICCLASS_PUBLISHFREEBUSY},
-  {ICAL_METHOD_REQUEST,icalclassify_request_delegate,ICAL_XLICCLASS_REQUESTDELEGATE},
-  {ICAL_METHOD_REQUEST,icalclassify_request_new,ICAL_XLICCLASS_REQUESTNEW},
-  {ICAL_METHOD_REQUEST,icalclassify_request_update,ICAL_XLICCLASS_REQUESTUPDATE},
-  {ICAL_METHOD_REQUEST,icalclassify_request_reschedule,ICAL_XLICCLASS_REQUESTRESCHEDULE},
-
-  {ICAL_METHOD_REQUEST,icalclassify_request_new_organizer,ICAL_XLICCLASS_REQUESTNEWORGANIZER},
-  {ICAL_METHOD_REQUEST,icalclassify_request_forward,ICAL_XLICCLASS_REQUESTFORWARD},
-  {ICAL_METHOD_REQUEST,icalclassify_request_status,ICAL_XLICCLASS_REQUESTSTATUS},
-  {ICAL_METHOD_REQUEST,icalclassify_request_freebusy,ICAL_XLICCLASS_REQUESTFREEBUSY},
-
-  {ICAL_METHOD_REPLY,icalclassify_reply_accept,ICAL_XLICCLASS_REPLYACCEPT},
-  {ICAL_METHOD_REPLY,icalclassify_reply_decline,ICAL_XLICCLASS_REPLYDECLINE},
-  {ICAL_METHOD_REPLY,icalclassify_reply_delegate,ICAL_XLICCLASS_REPLYDELEGATE},
-  {ICAL_METHOD_REPLY,icalclassify_reply_crasher_accept,ICAL_XLICCLASS_REPLYCRASHERACCEPT},
-  {ICAL_METHOD_REPLY,icalclassify_reply_crasher_decline,ICAL_XLICCLASS_REPLYCRASHERDECLINE},
-
-  {ICAL_METHOD_ADD,icalclassify_add_instance,ICAL_XLICCLASS_ADDINSTANCE},
-
-  {ICAL_METHOD_CANCEL,icalclassify_cancel_event,ICAL_XLICCLASS_CANCELEVENT},
-  {ICAL_METHOD_CANCEL,icalclassify_cancel_instance,ICAL_XLICCLASS_CANCELINSTANCE},
-  {ICAL_METHOD_CANCEL,icalclassify_cancel_all,ICAL_XLICCLASS_CANCELALL},
-
-  {ICAL_METHOD_REFRESH,icalclassify_refesh,ICAL_XLICCLASS_REFRESH},
-  {ICAL_METHOD_COUNTER,icalclassify_counter,ICAL_XLICCLASS_COUNTER},
-  {ICAL_METHOD_DECLINECOUNTER,icalclassify_delinecounter,ICAL_XLICCLASS_DECLINECOUNTER},
-  {ICAL_METHOD_NONE,0,ICAL_XLICCLASS_NONE}
-};
-
-
-icalproperty_xlicclass icalclassify(icalcomponent* c,icalcomponent* match, 
-			      const char* user)
-{
-    icalcomponent *inner;
-    icalproperty *p;
-    icalproperty_method method;
-    icalproperty_xlicclass class = ICAL_XLICCLASS_UNKNOWN;
-
-    int i;
-
-    struct icalclassify_parts comp_parts;
-    struct icalclassify_parts match_parts;
-
-    inner = icalcomponent_get_first_real_component(c);
-    
-    if (inner == 0) {
-	return ICAL_XLICCLASS_NONE;
-    }
-
-    icalssutil_get_parts(c,&comp_parts);
-    icalssutil_get_parts(match,&match_parts);
-
-    /* Determine if the incoming component is obsoleted by the match */
-    if(match != 0 && (
-	comp_parts.method == ICAL_METHOD_REQUEST
-	)){
-	assert ( ! ((comp_parts.dtstamp.is_utc==1)^
-		    (match_parts.dtstamp.is_utc==1)));
-
-	if( comp_parts.sequence<match_parts.sequence &&
-	    icaltime_compare(comp_parts.dtstamp,match_parts.dtstamp)>0)
-	{
-	    /* comp has a smaller sequence and a later DTSTAMP */
-	    class = ICAL_XLICCLASS_MISSEQUENCED;
-	    goto CLEANUP;
-	}
-
-	if( (comp_parts.sequence<match_parts.sequence )
-	     /*&&icaltime_compare(comp_parts.dtstamp,match_parts.dtstamp)<=0*/
-	     ||
-	   ( comp_parts.sequence == match_parts.sequence &&
-	     icaltime_compare(comp_parts.dtstamp,match_parts.dtstamp)<=0)){
-
-	    class = ICAL_XLICCLASS_OBSOLETE;
-	    goto CLEANUP;
-	}
-
-    }
-
-    p = icalcomponent_get_first_property(c,ICAL_METHOD_PROPERTY);
-    if (p == 0) {
-	class = ICAL_XLICCLASS_UNKNOWN;
-	goto CLEANUP;
-    }
-    method = icalproperty_get_method(p);
-
-    for (i =0; icalclassify_map[i].method != ICAL_METHOD_NONE; i++){
-	if(icalclassify_map[i].method == method){
-	    if( (*(icalclassify_map[i].fn))(&comp_parts,&match_parts,user)==1){
-		class = icalclassify_map[i].class;
-		break;
-	    }
-	}
-    }
-
-CLEANUP:
-    icalssutil_free_parts(&comp_parts); 
-    icalssutil_free_parts(&match_parts);
-
-    return class;
-
-}
-
diff --git a/libical/src/libicalss/icalclassify.h b/libical/src/libicalss/icalclassify.h
deleted file mode 100644
index 19021e8dd2..0000000000
--- a/libical/src/libicalss/icalclassify.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalclassify.h
- CREATOR: eric 21 Aug 2000
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
- =========================================================================*/
-
-#ifndef ICALCLASSIFY_H
-#define ICALCLASSIFY_H
-
-#include <libical/ical.h>
-#include <libicalss/icalset.h>
-
-icalproperty_xlicclass icalclassify(icalcomponent* c,icalcomponent* match, 
-			      const char* user);
-
-icalcomponent* icalclassify_find_overlaps(icalset* set, icalcomponent* comp);
-
-char* icalclassify_class_to_string(icalproperty_xlicclass c);
-
-
-#endif /* ICALCLASSIFY_H*/
-
-
-				    
-
-
diff --git a/libical/src/libicalss/icalcluster.c b/libical/src/libicalss/icalcluster.c
deleted file mode 100644
index 6d11078a72..0000000000
--- a/libical/src/libicalss/icalcluster.c
+++ /dev/null
@@ -1,245 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalcluster.c
-  CREATOR: acampi 13 March 2002
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2002, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
- ======================================================================*/
-
-
-/**
- *
- * icalcluster is an utility class design to manage clusters of
- * icalcomponents on behalf of an implementation of icalset. This is
- * done in order to split out common behavior different classes might
- * need.
- * The definition of what exactly a cluster will contain depends on the
- * icalset subclass. At the basic level, an icluster is just a tuple,
- * with anything as key and an icalcomponent as value.
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-
-#if 0
-#include <errno.h>
-#include <sys/stat.h> /* for stat */
-#ifndef WIN32
-#include <unistd.h> /* for stat, getpid */
-#else
-#include <io.h>
-#include <share.h>
-#endif
-#include <fcntl.h> /* for fcntl */
-#endif
-
-#include "icalcluster.h"
-#include "icalclusterimpl.h"
-#include "icalgauge.h"
-
-#ifdef WIN32
-#define snprintf	_snprintf
-#define strcasecmp	stricmp
-#endif
-
-
-icalcluster * icalcluster_new_impl(void) {
-
-	struct icalcluster_impl* impl;
-  
-	if ((impl = (struct icalcluster_impl*)malloc(
-				sizeof(struct icalcluster_impl))) == 0) {
-		icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-		return 0;
-	}
-  
-	memset(impl, 0, sizeof(struct icalcluster_impl));
-	strcpy(impl->id,ICALCLUSTER_ID);
-
-	return impl;
-}
-
-/**
- * Create a cluster with a key/value pair.
- *
- * @todo Always do a deep copy.
- */
-
-icalcluster * icalcluster_new(const char* key, icalcomponent *data) {
-	struct icalcluster_impl *impl = icalcluster_new_impl();
-	assert(impl->data == 0);
-
-	impl->key	= strdup(key);
-	impl->changed	= 0;
-	impl->data	= 0;
-
-	if (data != NULL) {
-		if (icalcomponent_isa(data) != ICAL_XROOT_COMPONENT) {
-			impl->data = icalcomponent_new(ICAL_XROOT_COMPONENT);
-			icalcomponent_add_component(impl->data, data);
-		} else {
-			impl->data = icalcomponent_new_clone(data);
-		}
-	} else {
-		impl->data = icalcomponent_new(ICAL_XROOT_COMPONENT);
-	}
-
-	return impl;
-}
-
-/**
- * Deep clone an icalcluster to a new one
- */
-
-icalcluster *icalcluster_new_clone(const icalcluster *data) {
-	struct icalcluster_impl *old = (struct icalcluster_impl *)data;
-	struct icalcluster_impl *impl = icalcluster_new_impl();
-
-	impl->key	= strdup(old->key);
-	impl->data	= icalcomponent_new_clone(old->data);
-	impl->changed	= 0;
-
-	return impl;
-}
-
-
-void icalcluster_free(icalcluster *impl) {
-	icalerror_check_arg_rv((impl!=0),"cluster");
-
-	if (impl->key != 0){
-		free(impl->key);
-		impl->key = 0;
-	}
-
-	if (impl->data != 0){
-		icalcomponent_free(impl->data);
-		impl->data = 0;
-	}
-
-	free(impl);
-}
-
-
-const char *icalcluster_key(icalcluster *impl) {
-	icalerror_check_arg_rz((impl!=0),"cluster");
-
-	return impl->key;
-}
-
-
-int icalcluster_is_changed(icalcluster *impl) {
-	icalerror_check_arg_rz((impl!=0),"cluster");
-
-	return impl->changed;
-}
-
-
-void icalcluster_mark(icalcluster *impl) {
-	icalerror_check_arg_rv((impl!=0),"cluster");
-
-	impl->changed = 1;
-}
-
-
-void icalcluster_commit(icalcluster *impl) {
-	icalerror_check_arg_rv((impl!=0),"cluster");
-
-	impl->changed = 0;
-}
-
-
-icalcomponent *icalcluster_get_component(icalcluster *impl) {
-
-	icalerror_check_arg_rz((impl!=0),"cluster");
-
-	if (icalcomponent_isa(impl->data) != ICAL_XROOT_COMPONENT) {
-		icalerror_warn("The top component is not an XROOT");
-		fprintf(stderr, "%s\n", icalcomponent_as_ical_string(impl->data));
-		abort();
-	}
-
-	return impl->data;
-}
-
-
-icalerrorenum icalcluster_add_component(icalcluster *impl, icalcomponent* child) {
-
-	icalerror_check_arg_re((impl!=0),"cluster", ICAL_BADARG_ERROR);
-	icalerror_check_arg_re((child!=0),"child",ICAL_BADARG_ERROR);
-
-	icalcomponent_add_component(impl->data, child);
-	icalcluster_mark(impl);
-
-	return ICAL_NO_ERROR;
-}
-
-
-icalerrorenum icalcluster_remove_component(icalcluster *impl, icalcomponent* child) {
-
-	icalerror_check_arg_re((impl!=0),"cluster",ICAL_BADARG_ERROR);
-	icalerror_check_arg_re((child!=0),"child",ICAL_BADARG_ERROR);
-
-	icalcomponent_remove_component(impl->data,child);
-	icalcluster_mark(impl);
-
-	return ICAL_NO_ERROR;
-}
-
-
-int icalcluster_count_components(icalcluster *impl, icalcomponent_kind kind) {
-
-	icalerror_check_arg_re((impl!=0),"cluster",ICAL_BADARG_ERROR);
-
-	return icalcomponent_count_components(impl->data, kind);
-}
-
-
-/** Iterate through components **/
-icalcomponent *icalcluster_get_current_component(icalcluster* impl) {
-
-	icalerror_check_arg_rz((impl!=0),"cluster");
-
-	return icalcomponent_get_current_component(impl->data);
-}
-
-
-icalcomponent *icalcluster_get_first_component(icalcluster* impl) {
-
-	icalerror_check_arg_rz((impl!=0),"cluster");
-
-	return icalcomponent_get_first_component(impl->data,
-						  ICAL_ANY_COMPONENT);
-}
-
-
-icalcomponent *icalcluster_get_next_component(icalcluster* impl) {
-
-	icalerror_check_arg_rz((impl!=0),"cluster");
-    
-	return icalcomponent_get_next_component(impl->data,
-					     ICAL_ANY_COMPONENT);
-}
diff --git a/libical/src/libicalss/icalcluster.h b/libical/src/libicalss/icalcluster.h
deleted file mode 100644
index e13bb0425c..0000000000
--- a/libical/src/libicalss/icalcluster.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalcluster.h
- CREATOR: eric 23 December 1999
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
-======================================================================*/
-
-#ifndef ICALCLUSTER_H
-#define ICALCLUSTER_H
-
-#include <libical/ical.h>
-#include <libicalss/icalset.h>
-
-typedef struct icalcluster_impl icalcluster;
-
-icalcluster* icalcluster_new(const char *key, icalcomponent *data);
-icalcluster* icalcluster_new_clone(const icalcluster *cluster);
-
-void icalcluster_free(icalcluster *cluster);
-
-const char* icalcluster_key(icalcluster *cluster);
-int icalcluster_is_changed(icalcluster *cluster);
-void icalcluster_mark(icalcluster *cluster);
-void icalcluster_commit(icalcluster *cluster);
-
-icalcomponent* icalcluster_get_component(icalcluster* cluster);
-int icalcluster_count_components(icalcluster *cluster, icalcomponent_kind kind);
-icalerrorenum icalcluster_add_component(icalcluster* cluster,
-					icalcomponent* child);
-icalerrorenum icalcluster_remove_component(icalcluster* cluster,
-					   icalcomponent* child);
-
-icalcomponent* icalcluster_get_current_component(icalcluster* cluster);
-icalcomponent* icalcluster_get_first_component(icalcluster* cluster);
-icalcomponent* icalcluster_get_next_component(icalcluster* cluster);
-
-#endif /* !ICALCLUSTER_H */
-
-
-
diff --git a/libical/src/libicalss/icalclusterimpl.h b/libical/src/libicalss/icalclusterimpl.h
deleted file mode 100644
index ef80e1af81..0000000000
--- a/libical/src/libicalss/icalclusterimpl.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalfilesetimpl.h
-  CREATOR: eric 23 December 1999
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
- ======================================================================*/
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-/* This definition is in its own file so it can be kept out of the
-   main header file, but used by "friend classes" like icaldirset*/
-
-#define ICALCLUSTER_ID "clus"
-
-struct icalcluster_impl {
-
-	char		id[5];		/* clus */
-
-	char	       *key;
-	icalcomponent  *data;
-	int		changed;
-};
diff --git a/libical/src/libicalss/icalcomponent.h b/libical/src/libicalss/icalcomponent.h
deleted file mode 100644
index 38025813e1..0000000000
--- a/libical/src/libicalss/icalcomponent.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalcomponent.h
- CREATOR: eric 20 March 1999
-
-
-  (C) COPYRIGHT 1999 Eric Busboom 
-  http://www.softwarestudio.org
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
- 
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and
-  limitations under the License.
-
-  The original author is Eric Busboom
-  The original code is icalcomponent.h
-
-======================================================================*/
-
-#ifndef ICALCOMPONENT_H
-#define ICALCOMPONENT_H
-
-#include <libicalss/icalproperty.h>
-#include <libicalss/icalvalue.h>
-#include <libicalss/icalenums.h> /* defines icalcomponent_kind */
-
-typedef void icalcomponent;
-
-icalcomponent* icalcomponent_new(icalcomponent_kind kind);
-icalcomponent* icalcomponent_new_clone(icalcomponent* component);
-icalcomponent* icalcomponent_new_from_string(char* str);
-icalcomponent* icalcomponent_vanew(icalcomponent_kind kind, ...);
-void icalcomponent_free(icalcomponent* component);
-
-char* icalcomponent_as_ical_string(icalcomponent* component);
-
-int icalcomponent_is_valid(icalcomponent* component);
-
-icalcomponent_kind icalcomponent_isa(icalcomponent* component);
-
-int icalcomponent_isa_component (void* component);
-
-/* 
- * Working with properties
- */
-
-void icalcomponent_add_property(icalcomponent* component,
-				icalproperty* property);
-
-void icalcomponent_remove_property(icalcomponent* component,
-				   icalproperty* property);
-
-int icalcomponent_count_properties(icalcomponent* component,
-				   icalproperty_kind kind);
-
-/* Iterate through the properties */
-icalproperty* icalcomponent_get_current_property(icalcomponent* component);
-
-icalproperty* icalcomponent_get_first_property(icalcomponent* component,
-					      icalproperty_kind kind);
-icalproperty* icalcomponent_get_next_property(icalcomponent* component,
-					      icalproperty_kind kind);
-
-/* Return a null-terminated array of icalproperties*/
-
-icalproperty** icalcomponent_get_properties(icalcomponent* component,
-					      icalproperty_kind kind);
-
-
-/* 
- * Working with components
- */ 
-
-
-void icalcomponent_add_component(icalcomponent* parent,
-				icalcomponent* child);
-
-void icalcomponent_remove_component(icalcomponent* parent,
-				icalcomponent* child);
-
-int icalcomponent_count_components(icalcomponent* component,
-				   icalcomponent_kind kind);
-
-/* Iterate through components */
-icalcomponent* icalcomponent_get_current_component (icalcomponent* component);
-
-icalcomponent* icalcomponent_get_first_component(icalcomponent* component,
-					      icalcomponent_kind kind);
-icalcomponent* icalcomponent_get_next_component(icalcomponent* component,
-					      icalcomponent_kind kind);
-
-/* Return a null-terminated array of icalproperties*/
-icalproperty** icalcomponent_get_component(icalcomponent* component,
-					      icalproperty_kind kind);
-
-/* Working with embedded error properties */
-
-int icalcomponent_count_errors(icalcomponent* component);
-void icalcomponent_strip_errors(icalcomponent* component);
-
-
-/* Internal operations. You don't see these... */
-icalcomponent* icalcomponent_get_parent(icalcomponent* component);
-void icalcomponent_set_parent(icalcomponent* component, 
-			      icalcomponent* parent);
-
-#endif /* !ICALCOMPONENT_H */
-
-
-
diff --git a/libical/src/libicalss/icalcsdb.h b/libical/src/libicalss/icalcsdb.h
deleted file mode 100644
index 109d6fa73a..0000000000
--- a/libical/src/libicalss/icalcsdb.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalcsdb.h Calendar Server Database
- CREATOR: eric 23 December 1999
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
-======================================================================*/
-
-#ifndef ICALCSDB_H
-#define ICALCSDB_H
-
-#include <libical/ical.h>
-
-typedef void icalcsdb;
-
-icalcsdb* icalcsdb_new(char* path);
-
-void icalcsdb_free(icalcsdb* csdb);
-
-icalerrorenum icalcsdb_create(icalcsdb* db, char* calid);
-
-icalerrorenum icalcsdb_delete(icalcsdb* db, char* calid);
-
-icalerrorenum icalcsdb_move(icalcsdb* db, char* oldcalid, char* newcalid);
-
-icalerrorenum icalcsdb_noop(icalcsdb* db);
-
-char* icalcsdb_generateuid(icalcsdb* db);
-
-icalcomponent* icalcsdb_expand_upn(icalcsdb* db, char* upn);
-icalcomponent* icalcsdb_expand_calid(icalcsdb* db, char* calid);
-
-icalerrorenum icalcsbd_senddata(icalcsdb* db, icalcomponent* comp);
-
-icalset* icalcsdb_get_calendar(icalcsdb* db, char* calid, 
-			       icalcomponent *gauge);
-
-icalset* icalcsdb_get_vcars(icalcsdb* db);
-
-icalset* icalcsdb_get_properties(icalcsdb* db);
-
-icalset* icalcsdb_get_capabilities(icalcsdb* db);
-
-icalset* icalcsdb_get_timezones(icalcsdb* db);
-
-
-#endif /* !ICALCSDB_H */
-
-
-
diff --git a/libical/src/libicalss/icalcstp.c b/libical/src/libicalss/icalcstp.c
deleted file mode 100644
index d1a52fe303..0000000000
--- a/libical/src/libicalss/icalcstp.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -*- Mode: C -*-
-    ======================================================================
-    FILE: icalcstps.c
-    CREATOR: ebusboom 23 Jun 2000
-  
-    $Id$
-    $Locker$
-    
-    (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-    
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of either: 
-    
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-    
-    Or:
-    
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
-    ======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <libical/ical.h>
-#include "icalcstp.h"
-#include "pvl.h" 
-
-#include <sys/types.h> /* For send(), others */
-#include <sys/socket.h>  /* For send(), others. */
-#include <unistd.h> /* For alarm */
-#include <errno.h>
-#include <stdlib.h> /* for malloc */
-#include <string.h>
-
-
-struct command_map {
-	enum icalcstp_command command;
-	char *str;
-} command_map[] = 
-{
-    {ICAL_ABORT_COMMAND,"ABORT"},
-    {ICAL_AUTHENTICATE_COMMAND,"AUTHENTICATE"},
-    {ICAL_CAPABILITY_COMMAND,"CAPABILITY"},
-    {ICAL_CONTINUE_COMMAND,"CONTINUE"},
-    {ICAL_CALIDEXPAND_COMMAND,"CALIDEXPAND"},
-    {ICAL_IDENTIFY_COMMAND,"IDENTIFY"},
-    {ICAL_DISCONNECT_COMMAND,"DISCONNECT"},
-    {ICAL_SENDDATA_COMMAND,"SENDDATA"},
-    {ICAL_STARTTLS_COMMAND,"STARTTLS"},
-    {ICAL_UPNEXPAND_COMMAND,"UPNEXPAND"},
-    {ICAL_UNKNOWN_COMMAND,"UNKNOWN"}
-};
-
-
-icalcstp_command icalcstp_line_command(char* line)
-{
-    int i;
-
-    for(i = 0; command_map[i].command != ICAL_UNKNOWN_COMMAND; i++){
-        size_t l = strlen(command_map[i].str);
-
-        if(strncmp(line, command_map[i].str, l) == 0){
-            return command_map[i].command;
-        }
-    
-    }
-
-    return ICAL_UNKNOWN_COMMAND;
-}
-
-icalrequeststatus icalcstp_line_response_code(char* line)
-{
-    struct icalreqstattype rs; 
-
-    rs = icalreqstattype_from_string(line);
-
-    return rs.code;
-}
-
-int icalcstp_line_is_endofdata(char* line)
-{
-    if(line[0] == '.' && line[1] == '\n'){
-        return 1;
-    }
-
-    return 0;
-
-}
-
-int icalcstp_line_is_mime(char* line)
-{
-}
-
-
-const char* icalcstp_command_to_string(icalcstp_command command){
-
-    int i;
-
-    for(i = 0; command_map[i].command != ICAL_UNKNOWN_COMMAND; i++){
-        size_t l = strlen(command_map[i].str);
-
-        if(command_map[i].command == command){
-            return command_map[i].str;
-        }
-    
-    }
-
-    return command_map[i].str;
-
-}
-
diff --git a/libical/src/libicalss/icalcstp.h b/libical/src/libicalss/icalcstp.h
deleted file mode 100644
index a42f7fd244..0000000000
--- a/libical/src/libicalss/icalcstp.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
-  FILE: icalcstp.h
-  CREATOR: eric 20 April 1999
-  
-  $Id$
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalcstp.h
-
-======================================================================*/
-
-
-#ifndef ICALCSTP_H
-#define ICALCSTP_H
-
-#include <libical/ical.h>
-
-
-/* Connection state, from the state machine in RFC2445 */
-enum cstps_state {
-    NO_STATE,
-    CONNECTED,
-    AUTHENTICATED,
-    IDENTIFIED,
-    DISCONNECTED,
-    RECEIVE
-};
-
-/* CSTP Commands that a client can issue to a server */
-typedef enum icalcstp_command {
-    ICAL_ABORT_COMMAND,
-    ICAL_AUTHENTICATE_COMMAND,
-    ICAL_CAPABILITY_COMMAND,
-    ICAL_CONTINUE_COMMAND,
-    ICAL_CALIDEXPAND_COMMAND,
-    ICAL_IDENTIFY_COMMAND,
-    ICAL_DISCONNECT_COMMAND,
-    ICAL_SENDDATA_COMMAND,
-    ICAL_STARTTLS_COMMAND,
-    ICAL_UPNEXPAND_COMMAND,
-    ICAL_COMPLETE_COMMAND,
-    ICAL_UNKNOWN_COMMAND
-} icalcstp_command;
-
-
-
-/* A statement is a combination of command or response code and a
-   component that the server and client exchage with each other. */
-struct icalcstp_statement {
-    icalcstp_command command;
-    char* str_data; /* If non-NUll use as arguments to command */
-    int int_data; /* If non-NULL use as arguments to command */
-
-    icalrequeststatus code;
-
-    icalcomponent* data;
-};
-
-const char* icalcstp_command_to_string(icalcstp_command command);
-icalcstp_command icalcstp_string_to_command(const char* str);
-
-#endif /* !ICALCSTP_H */
-
-
-
diff --git a/libical/src/libicalss/icalcstpclient.c b/libical/src/libicalss/icalcstpclient.c
deleted file mode 100644
index 2d819c27c1..0000000000
--- a/libical/src/libicalss/icalcstpclient.c
+++ /dev/null
@@ -1,343 +0,0 @@
-/* -*- Mode: C -*-
-    ======================================================================
-    FILE: icalcstps.c
-    CREATOR: ebusboom 23 Jun 2000
-  
-    $Id$
-    $Locker$
-    
-    (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-    
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of either: 
-    
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-    
-    Or:
-    
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
-    ======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <libical/ical.h>
-#include "icalcstp.h"
-#include "icalcstpclient.h"
-#include "pvl.h" 
-
-#include <sys/types.h> /* For send(), others */
-#include <sys/socket.h>  /* For send(), others. */
-#include <unistd.h> /* For alarm */
-#include <errno.h>
-#include <stdlib.h> /* for malloc */
-#include <string.h>
-
-#define EOL "\n"
-
-
-/* Client state machine */
-
-typedef enum icalcstpc_line_type {
-    ICALCSTPC_RESPONSE_CODE_LINE,
-    ICALCSTPC_TERMINATOR_LINE,
-    ICALCSTPC_APPLICATION_DATA_LINE
-} icalcstpc_line_type;
-
-typedef enum icalcstpc_state {
-    ICALCSTPC_SEND_STATE,
-    ICALCSTPC_RESPONSE_CODE_STATE,
-    ICALCSTPC_RESPONSE_DATA_STATE
-} icalcstpc_state;
-
-
-
-struct icalcstpc_impl {
-    int timeout;
-    icalparser *parser;
-    icalcstp_command command;
-    icalcstpc_state state;
-    char* next_output;
-    char* next_input;
-};
-
-icalcstpc* icalcstpc_new()
-{
-    struct icalcstpc_impl *impl;
-
-    impl = malloc(sizeof(struct icalcstpc_impl));
-    
-    if(impl == 0){
-        icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-        return 0;
-    }
-
-    memset(impl,0,sizeof(struct icalcstpc_impl));
-
-    return impl;
-}
-
-void icalcstpc_free(icalcstpc* cstpc)
-{
-    struct icalcstpc_impl *impl = (struct icalcstpc_impl *)cstpc;
-
-    if(impl->next_output != 0){
-        free(impl->next_output);
-    }
-
-    if(impl->next_input != 0){
-        free(impl->next_input);
-    }
-    
-    
-    if(impl->parser != 0){
-        icalparser_free(impl->parser);
-    }
-}
-
-/* Get the next string to send to the server */
-char* icalcstpc_next_output(icalcstpc* cstp, char * line)
-{
-    char* out;
-    struct icalcstpc_impl *impl = (struct icalcstpc_impl *)cstp;
-
-    if(impl->next_output == 0){
-        return 0;
-    }
-    
-    out = impl->next_output;
-
-    impl->next_output = 0;
-
-    icalmemory_add_tmp_buffer(out);
-
-    return out;
-}
-
-/* process the next string sent by the server */ 
-int icalcstpc_next_input(icalcstpc* cstp, char* line)
-{
-    struct icalcstpc_impl *impl = (struct icalcstpc_impl *)cstp;
-    icalcstpc_line_type line_type;
-
-    if(icalcstp_line_is_endofdata(line) || line == 0){
-        return 0;
-    }
-
-    switch (impl->command){
-    case ICAL_ABORT_COMMAND:{
-        break;
-    }
-    case ICAL_AUTHENTICATE_COMMAND:{
-        break;
-    }
-    case ICAL_CAPABILITY_COMMAND:{
-        break;
-    }
-    case ICAL_CONTINUE_COMMAND:{
-        break;
-    }
-    case ICAL_CALIDEXPAND_COMMAND:{
-        break;
-    }
-    case ICAL_IDENTIFY_COMMAND:{
-        break;
-    }
-    case ICAL_DISCONNECT_COMMAND:{
-        break;
-    }
-    case ICAL_SENDDATA_COMMAND:{
-        break;
-    }
-    case ICAL_STARTTLS_COMMAND:{
-        break;
-    }
-    case ICAL_UPNEXPAND_COMMAND:{
-        break;
-    }
-    case ICAL_COMPLETE_COMMAND:{
-        break;
-    }
-    case ICAL_UNKNOWN_COMMAND:{
-        break;
-    }
-    default:
-        break;
-    }
-}
-
-/* After icalcstpc_next_input returns a 0, there are responses
-   ready. use these to get them */
-icalcstpc_response icalcstpc_first_response(icalcstpc* cstp)
-{
-    struct icalcstpc_impl *impl = (struct icalcstpc_impl *)cstp;
-
-}
-
-
-icalcstpc_response icalcstpc_next_response(icalcstpc* cstp)
-{
-    struct icalcstpc_impl *impl = (struct icalcstpc_impl *)cstp;
-}
-
-
-int icalcstpc_set_timeout(icalcstpc* cstp, int sec)
-{
-    struct icalcstpc_impl *impl = (struct icalcstpc_impl *)cstp;
-}
-
-icalerrorenum icalcstpc_abort(icalcstpc* cstp)
-{
-    struct icalcstpc_impl* impl = (struct icalcstpc_impl*)cstp;
-    
-    icalerror_check_arg_re(cstp!=0,"cstp",ICAL_BADARG_ERROR);
-
-    impl->next_output = "ABORT\n";
-
-    return ICAL_NO_ERROR;
-}
-
-icalerrorenum icalcstpclient_setup_output(icalcstpc* cstp, size_t sz)
-{
-   struct icalcstpc_impl *impl = (struct icalcstpc_impl *)cstp;
-
-   if(impl->next_output != 0){
-       icalerror_set_errno(ICAL_USAGE_ERROR);
-       return ICAL_USAGE_ERROR;
-   }
-
-   impl->next_output = malloc(sz);
-
-   if(impl->next_output == 0){
-       icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-       return ICAL_NEWFAILED_ERROR;
-   }
-   
-   return ICAL_NO_ERROR;
-
-}
-
-icalerrorenum icalcstpc_authenticate(icalcstpc* cstp, char* mechanism, 
-                                        char* data, char* f(char*))
-{
-   struct icalcstpc_impl *impl = (struct icalcstpc_impl *)cstp;
-   char* command_str;
-   icalerrorenum error;
-   size_t sz;
-
-   icalerror_check_arg_re(cstp!=0,"cstp",ICAL_BADARG_ERROR);
-   icalerror_check_arg_re(mechanism!=0,"mechanism",ICAL_BADARG_ERROR);
-   icalerror_check_arg_re(data!=0,"data",ICAL_BADARG_ERROR);
-   icalerror_check_arg_re(f!=0,"f",ICAL_BADARG_ERROR);
-
-   impl->command = ICAL_AUTHENTICATE_COMMAND;
-
-   command_str = icalcstp_command_to_string(impl->command);
-
-   sz = strlen(command_str) + strlen(mechanism) + strlen(data) + 4;
-
-   if((error=icalcstpclient_setup_output(cstp,sz)) != ICAL_NO_ERROR){
-       return error;
-   }
-
-   sprintf(impl->next_output,"%s %s %s%s",command_str,mechanism,data,EOL);
-
-   return ICAL_NO_ERROR;
-}
-
-icalerrorenum icalcstpc_capability(icalcstpc* cstp)
-{
-    struct icalcstpc_impl *impl = (struct icalcstpc_impl *)cstp;
-    char* command_str;
-    icalerrorenum error;
-    size_t sz;
-
-    icalerror_check_arg_re(cstp!=0,"cstp",ICAL_BADARG_ERROR);
-    
-    impl->command = ICAL_CAPABILITY_COMMAND;
-    
-    command_str = icalcstp_command_to_string(impl->command);
-
-    sz = strlen(command_str);
-    
-    if((error=icalcstpclient_setup_output(cstp,sz)) != ICAL_NO_ERROR){
-        return error;
-    }
-
-    return ICAL_NO_ERROR;
-}
-
-icalerrorenum icalcstpc_calidexpand(icalcstpc* cstp,char* calid)
-{
-    struct icalcstpc_impl *impl = (struct icalcstpc_impl *)cstp;
-
-    impl->command = ICAL_CALIDEXPAND_COMMAND;
-    return ICAL_NO_ERROR;
-}
-
-icalerrorenum icalcstpc_continue(icalcstpc* cstp, unsigned int time)
-{
-    struct icalcstpc_impl *impl = (struct icalcstpc_impl *)cstp;
-
-    impl->command = ICAL_CONTINUE_COMMAND;
-    return ICAL_NO_ERROR;
-}
-
-icalerrorenum icalcstpc_disconnect(icalcstpc* cstp)
-{
-    struct icalcstpc_impl *impl = (struct icalcstpc_impl *)cstp;
-
-
-    impl->command = ICAL_DISCONNECT_COMMAND;
-
-    return ICAL_NO_ERROR;
-}
-
-icalerrorenum icalcstpc_identify(icalcstpc* cstp, char* id)
-{
-    struct icalcstpc_impl *impl = (struct icalcstpc_impl *)cstp;
-
-
-    impl->command = ICAL_IDENTIFY_COMMAND;
-
-    return ICAL_NO_ERROR;
-}
-
-icalerrorenum icalcstpc_starttls(icalcstpc* cstp, char* command, 
-                                    char* data, char * f(char*))
-{
-    struct icalcstpc_impl *impl = (struct icalcstpc_impl *)cstp;
-
-    impl->command = ICAL_STARTTLS_COMMAND;
-    
-    return ICAL_NO_ERROR;
-}
-
-icalerrorenum icalcstpc_upnexpand(icalcstpc* cstp,char* calid)
-{
-    struct icalcstpc_impl *impl = (struct icalcstpc_impl *)cstp;
-
-
-    impl->command = ICAL_UPNEXPAND_COMMAND;
-
-    return ICAL_NO_ERROR;
-}
-
-icalerrorenum icalcstpc_sendata(icalcstpc* cstp, unsigned int time,
-                                   icalcomponent *comp)
-{
-    struct icalcstpc_impl *impl = (struct icalcstpc_impl *)cstp;
-
-    impl->command = ICAL_SENDDATA_COMMAND;
-    
-    return ICAL_NO_ERROR;
-}
-
-
-
-
diff --git a/libical/src/libicalss/icalcstpclient.h b/libical/src/libicalss/icalcstpclient.h
deleted file mode 100644
index b18f54f594..0000000000
--- a/libical/src/libicalss/icalcstpclient.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
-  FILE: icalcstpclient.h
-  CREATOR: eric 4 Feb 01
-  
-  $Id$
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalcstp.h
-
-======================================================================*/
-
-
-#ifndef ICALCSTPC_H
-#define ICALCSTPC_H
-
-#include <libical/ical.h>
-#include <libicalss/icalcstp.h>
-
-/********************** Client (Sender) Interfaces **************************/
-
-/* How to use: 
-
-   1) Construct a new icalcstpc
-   2) Issue a command by calling one of the command routines. 
-   3) Repeat until both call icalcstpc_next_output and
-   icalcstpc_next_input return 0:
-     3a) Call icalcstpc_next_output. Send string to server. 
-     3b) Get string from server, & give to icalcstp_next_input()
-   4) Iterate with icalcstpc_first_response & icalcstp_next_response to 
-   get the servers responses
-   5) Repeat at #2
-*/
-
-
-typedef void icalcstpc;
-
-/* Response code sent by the server. */
-typedef struct icalcstpc_response {	
-    icalrequeststatus code;
-    char *arg; /* These strings are owned by libical */
-    char *debug_text;
-    char *more_text;
-    void* result;
-} icalcstpc_response;
-
-
-icalcstpc* icalcstpc_new();
-
-void icalcstpc_free(icalcstpc* cstpc);
-
-int icalcstpc_set_timeout(icalcstpc* cstp, int sec);
-
-
-/* Get the next string to send to the server */
-char* icalcstpc_next_output(icalcstpc* cstp, char* line);
-
-/* process the next string from the server */ 
-int icalcstpc_next_input(icalcstpc* cstp, char * line);
-
-/* After icalcstpc_next_input returns a 0, there are responses
-   ready. use these to get them */
-icalcstpc_response icalcstpc_first_response(icalcstpc* cstp);
-icalcstpc_response icalcstpc_next_response(icalcstpc* cstp);
-
-/* Issue a command */
-icalerrorenum icalcstpc_abort(icalcstpc* cstp);
-icalerrorenum icalcstpc_authenticate(icalcstpc* cstp, char* mechanism, 
-                                        char* init_data, char* f(char*) );
-icalerrorenum icalcstpc_capability(icalcstpc* cstp);
-icalerrorenum icalcstpc_calidexpand(icalcstpc* cstp,char* calid);
-icalerrorenum icalcstpc_continue(icalcstpc* cstp, unsigned int time);
-icalerrorenum icalcstpc_disconnect(icalcstpc* cstp);
-icalerrorenum icalcstpc_identify(icalcstpc* cstp, char* id);
-icalerrorenum icalcstpc_starttls(icalcstpc* cstp, char* command, 
-                                    char* init_data, char* f(char*));
-icalerrorenum icalcstpc_senddata(icalcstpc* cstp, unsigned int time,
-				icalcomponent *comp);
-icalerrorenum icalcstpc_upnexpand(icalcstpc* cstp,char* calid);
-icalerrorenum icalcstpc_sendata(icalcstpc* cstp, unsigned int time,
-                                   icalcomponent *comp);
-
-
-#endif /* !ICALCSTPC_H */
-
-
-
diff --git a/libical/src/libicalss/icalcstpserver.c b/libical/src/libicalss/icalcstpserver.c
deleted file mode 100644
index 1685caab3d..0000000000
--- a/libical/src/libicalss/icalcstpserver.c
+++ /dev/null
@@ -1,278 +0,0 @@
-/* -*- Mode: C -*-
-    ======================================================================
-    FILE: icalcstpserver.c
-    CREATOR: ebusboom 13 Feb 01
-  
-    $Id$
-    $Locker$
-    
-    (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-    
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of either: 
-    
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-    
-    Or:
-    
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
-    ======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <libical/ical.h>
-#include "icalcstp.h"
-#include "icalcstpserver.h"
-#include "pvl.h" 
-
-#include <sys/types.h> /* For send(), others */
-#include <sys/socket.h>  /* For send(), others. */
-#include <unistd.h> /* For alarm */
-#include <errno.h>
-#include <stdlib.h> /* for malloc */
-#include <string.h>
-
-
-
-struct icalcstps_impl {
-	int timeout;
-	icalparser *parser;
-	enum cstps_state major_state;
-	struct icalcstps_commandfp commandfp;
-};
-
-
-
-
-/* This state machine is a Mealy-type: actions occur on the
-   transitions, not in the states.
-   
-   Here is the state machine diagram from the CAP draft:
-
-
-        STARTTLS /
-        CAPABILITY
-       +-------+
-       |       |                       +---------------+
-       |   +-----------+ AUTHENTICATE  |               |
-       +-->| Connected |-------------->| Authenticated |
-           +-----------+               |               |
-             |                         +---------------+
-             |                              |
-             |                              |
-             |                              |
-             |                              |       +-----+ STARTTLS /
-             |                              V       |     | CAPABILITY /
-             |                         +---------------+  | IDENTIFY
-             |                         |               |<-+
-             |                         |   Identified  |<----+
-             |                +--------|               |     |
-             |                |        +---------------+     | command
-             |                |             |                | completes
-             V                |DISCONNECT   |                |
-           +--------------+   |             |SENDDATA        |
-           | Disconnected |<--+             |                |
-           +--------------+                 |                | ABORT
-                     A                      |                |
-                     |                      V                |
-                     |     DISCONNECT     +---------------+  |
-                     +--------------------|    Receive    |--+
-                                          |               |<--+
-                                          +---------------+   |
-                                                         |    | CONTINUTE
-                                                         +----+
-
-   In this implmenetation, the transition from CONNECTED to IDENTIFIED
-   is non-standard. The spec specifies that on the ATHENTICATE
-   command, the machine transitions from CONNECTED to AUTHENTICATED,
-   and then immediately goes to IDENTIFIED. This makes AUTHENTICATED a
-   useless state, so I removed it */
-
-struct state_table {
-	enum cstps_state major_state;
-	enum icalcstp_command command;
-	void (*action)();
-	enum cstps_state next_state;
-
-} server_state_table[] = 
-{
-    { CONNECTED, ICAL_CAPABILITY_COMMAND , 0, CONNECTED},
-    { CONNECTED, ICAL_AUTHENTICATE_COMMAND , 0,  IDENTIFIED}, /* Non-standard */
-    { IDENTIFIED, ICAL_STARTTLS_COMMAND, 0, IDENTIFIED},
-    { IDENTIFIED, ICAL_IDENTIFY_COMMAND, 0, IDENTIFIED},
-    { IDENTIFIED, ICAL_CAPABILITY_COMMAND, 0, IDENTIFIED},
-    { IDENTIFIED, ICAL_SENDDATA_COMMAND, 0, RECEIVE},
-    { IDENTIFIED, ICAL_DISCONNECT_COMMAND, 0, DISCONNECTED},
-    { DISCONNECTED, 0, 0, 0},
-    { RECEIVE,  ICAL_DISCONNECT_COMMAND, 0, DISCONNECTED},
-    { RECEIVE,  ICAL_CONTINUE_COMMAND, 0, RECEIVE},
-    { RECEIVE,  ICAL_ABORT_COMMAND , 0, IDENTIFIED},
-    { RECEIVE,  ICAL_COMPLETE_COMMAND , 0, IDENTIFIED}
-};
-
-
-/**********************************************************************/
-
-
-
-icalcstps* icalcstps_new(struct icalcstps_commandfp cfp)
-{
-    struct icalcstps_impl* impl;
-
-    if ( ( impl = (struct icalcstps_impl*)
-	   malloc(sizeof(struct icalcstps_impl))) == 0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-    impl->commandfp = cfp;
-    impl->timeout = 10;
-
-    return (icalcstps*)impl;
-
-}
-
-void icalcstps_free(icalcstps* cstp);
-
-int icalcstps_set_timeout(icalcstps* cstp, int sec) 
-{
-    struct icalcstps_impl *impl = (struct icalcstps_impl *) cstp;
-
-    icalerror_check_arg_rz( (cstp!=0), "cstp");
-
-    impl->timeout = sec;
-
-    return sec;
-}
-
-typedef struct icalcstps_response {	
-	icalrequeststatus code;
-	char caluid[1024];
-	void* result;
-} icalcstps_response;
-
-
-icalerrorenum prep_abort(struct icalcstps_impl* impl, char* data)
-{
-    return ICAL_NO_ERROR;
-}
-icalerrorenum prep_authenticate(struct icalcstps_impl* impl, char* data)
-{    return ICAL_NO_ERROR;
-}
-icalerrorenum prep_capability(struct icalcstps_impl* impl, char* data)
-{    return ICAL_NO_ERROR;
-}
-icalerrorenum prep_calidexpand(struct icalcstps_impl* impl, char* data)
-{
-    return ICAL_NO_ERROR;
-}
-icalerrorenum prep_continue(struct icalcstps_impl* impl, char* data)
-{
-    return ICAL_NO_ERROR;
-}
-icalerrorenum prep_disconnect(struct icalcstps_impl* impl, char* data)
-{
-    return ICAL_NO_ERROR;
-}
-icalerrorenum prep_identify(struct icalcstps_impl* impl, char* data)
-{
-    return ICAL_NO_ERROR;
-}
-icalerrorenum prep_starttls(struct icalcstps_impl* impl, char* data)
-{
-    return ICAL_NO_ERROR;
-}
-icalerrorenum prep_upnexpand(struct icalcstps_impl* impl, char* data)
-{
-    return ICAL_NO_ERROR;
-}
-icalerrorenum prep_sendata(struct icalcstps_impl* impl, char* data)
-{    return ICAL_NO_ERROR;
-}
-
-char* icalcstps_process_incoming(icalcstps* cstp, char* input)
-{
-    struct icalcstps_impl *impl = (struct icalcstps_impl *) cstp;
-    char *i;
-    char *cmd_or_resp;
-    char *data;
-    char *input_cpy;
-    icalerrorenum error;
-
-    icalerror_check_arg_rz(cstp !=0,"cstp");
-    icalerror_check_arg_rz(input !=0,"input");
-
-    if ((input_cpy = (char*)strdup(input)) == 0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-    i = (char*)strstr(" ",input_cpy);
-
-    cmd_or_resp = input_cpy;
-
-    if (i != 0){
-	*i = '\0';
-	data = ++i;
-    } else {
-	data = 0;
-    }
-
-    printf("cmd: %s\n",cmd_or_resp);
-    printf("data: %s\n",data);
-	
-    /* extract the command, look up in the state table, and dispatch
-       to the proper handler */    
-
-    if(strcmp(cmd_or_resp,"ABORT") == 0){
-	error = prep_abort(impl,data);	
-    } else if(strcmp(cmd_or_resp,"AUTHENTICATE") == 0){
-	error = prep_authenticate(impl,data);
-    } else if(strcmp(cmd_or_resp,"CAPABILITY") == 0){
-	error = prep_capability(impl,data);
-    } else if(strcmp(cmd_or_resp,"CALIDEXPAND") == 0){
-	error = prep_calidexpand(impl,data);
-    } else if(strcmp(cmd_or_resp,"CONTINUE") == 0){
-	error = prep_continue(impl,data);
-    } else if(strcmp(cmd_or_resp,"DISCONNECT") == 0){
-	error = prep_disconnect(impl,data);
-    } else if(strcmp(cmd_or_resp,"IDENTIFY") == 0){
-	error = prep_identify(impl,data);
-    } else if(strcmp(cmd_or_resp,"STARTTLS") == 0){
-	error = prep_starttls(impl,data);
-    } else if(strcmp(cmd_or_resp,"UPNEXPAND") == 0){
-	error = prep_upnexpand(impl,data);
-    } else if(strcmp(cmd_or_resp,"SENDDATA") == 0){
-	error = prep_sendata(impl,data);
-    }
-    
-    return 0;
-}
-
-    /* Read data until we get a end of data marker */
-
-
-
-struct icalcstps_server_stubs {
-  icalerrorenum (*abort)(icalcstps* cstp);
-  icalerrorenum (*authenticate)(icalcstps* cstp, char* mechanism, 
-                                    char* data);
-  icalerrorenum (*calidexpand)(icalcstps* cstp, char* calid);
-  icalerrorenum (*capability)(icalcstps* cstp);
-  icalerrorenum (*cont)(icalcstps* cstp, unsigned int time);
-  icalerrorenum (*identify)(icalcstps* cstp, char* id);
-  icalerrorenum (*disconnect)(icalcstps* cstp);
-  icalerrorenum (*sendata)(icalcstps* cstp, unsigned int time, 
-                               icalcomponent *comp);
-  icalerrorenum (*starttls)(icalcstps* cstp, char* command, 
-                                char* data);
-  icalerrorenum (*upnexpand)(icalcstps* cstp, char* upn);
-  icalerrorenum (*unknown)(icalcstps* cstp, char* command, char* data);
-};
-
diff --git a/libical/src/libicalss/icalcstpserver.h b/libical/src/libicalss/icalcstpserver.h
deleted file mode 100644
index c8f0aa0ba1..0000000000
--- a/libical/src/libicalss/icalcstpserver.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
-  FILE: icalcstpserver.h
-  CREATOR: eric 13 Feb 01
-  
-  $Id$
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalcstp.h
-
-======================================================================*/
-
-
-#ifndef ICALCSTPS_H
-#define ICALCSTPS_H
-
-#include <libical/ical.h>
-
-
-/********************** Server (Reciever) Interfaces *************************/
-
-/* On the server side, the caller will recieve data from the incoming
-   socket and pass it to icalcstps_next_input. The caller then takes
-   the return from icalcstps_next_outpu and sends it out through the
-   socket. This gives the caller a point of control. If the cstp code
-   connected to the socket itself, it would be hard for the caller to
-   do anything else after the cstp code was started.
-
-   All of the server and client command routines will generate
-   response codes. On the server side, these responses will be turned
-   into text and sent to the client. On the client side, the reponse
-   is the one sent from the server.
-
-   Since each command can return multiple responses, the responses are
-   stored in the icalcstps object and are accesses by
-   icalcstps_first_response() and icalcstps_next_response()
-
-   How to use: 
-
-   1) Construct a new icalcstps, bound to your code via stubs
-   2) Repeat forever:
-     2a) Get string from client & give to icalcstps_next_input()
-     2b) Repeat until icalcstp_next_output returns 0:
-       2b1) Call icalcstps_next_output. 
-       2b2) Send string to client.
-*/
-
-
-
-typedef void icalcstps;
-
-/* Pointers to the rountines that
-   icalcstps_process_incoming will call when it recognizes a CSTP
-   command in the data. BTW, the CONTINUE command is named 'cont'
-   because 'continue' is a C keyword */
-
-struct icalcstps_commandfp {
-  icalerrorenum (*abort)(icalcstps* cstp);
-  icalerrorenum (*authenticate)(icalcstps* cstp, char* mechanism,
-                                    char* data);
-  icalerrorenum (*calidexpand)(icalcstps* cstp, char* calid);
-  icalerrorenum (*capability)(icalcstps* cstp);
-  icalerrorenum (*cont)(icalcstps* cstp, unsigned int time);
-  icalerrorenum (*identify)(icalcstps* cstp, char* id);
-  icalerrorenum (*disconnect)(icalcstps* cstp);
-  icalerrorenum (*sendata)(icalcstps* cstp, unsigned int time,
-                               icalcomponent *comp);
-  icalerrorenum (*starttls)(icalcstps* cstp, char* command,
-                                char* data);
-  icalerrorenum (*upnexpand)(icalcstps* cstp, char* upn);
-  icalerrorenum (*unknown)(icalcstps* cstp, char* command, char* data);
-};                                                        
-
-
-
-icalcstps* icalcstps_new(struct icalcstps_commandfp stubs);
-
-void icalcstps_free(icalcstps* cstp);
-
-int icalcstps_set_timeout(icalcstps* cstp, int sec);
-
-/* Get the next string to send to the client */
-char* icalcstps_next_output(icalcstps* cstp);
-
-/* process the next string from the client */ 
-int icalcstps_next_input(icalcstps* cstp);
-
-#endif /* ICALCSTPS */
diff --git a/libical/src/libicalss/icaldirset.c b/libical/src/libicalss/icaldirset.c
deleted file mode 100644
index 7e495f9eae..0000000000
--- a/libical/src/libicalss/icaldirset.c
+++ /dev/null
@@ -1,805 +0,0 @@
-/* -*- Mode: C -*-
-    ======================================================================
-    FILE: icaldirset.c
-    CREATOR: eric 28 November 1999
-  
-    $Id$
-    $Locker$
-    
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-    The Original Code is eric. The Initial Developer of the Original
-    Code is Eric Busboom
-
-
-    ======================================================================*/
-
-
-/**
-   @file   icaldirset.c
- 
-   @brief  icaldirset manages a database of ical components and offers
-  interfaces for reading, writting and searching for components.
-
-  icaldirset groups components in to clusters based on their DTSTAMP
-  time -- all components that start in the same month are grouped
-  together in a single file. All files in a sotre are kept in a single
-  directory. 
-
-  The primary interfaces are icaldirset__get_first_component and
-  icaldirset_get_next_component. These routine iterate through all of
-  the components in the store, subject to the current gauge. A gauge
-  is an icalcomponent that is tested against other componets for a
-  match. If a gauge has been set with icaldirset_select,
-  icaldirset_first and icaldirset_next will only return componentes
-  that match the gauge.
-
-  The Store generated UIDs for all objects that are stored if they do
-  not already have a UID. The UID is the name of the cluster (month &
-  year as MMYYYY) plus a unique serial number. The serial number is
-  stored as a property of the cluster.
-
-*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-
-#include <libical/ical.h>
-#include "icaldirset.h"
-#include "icaldirset.h"
-#include "icalfileset.h"
-#include "icalfilesetimpl.h"
-#include "icalcluster.h"
-#include "icalgauge.h"
-
-#include <limits.h> /* For PATH_MAX */
-#ifndef WIN32
-#include <dirent.h> /* for opendir() */
-#include <unistd.h> /* for stat, getpid */
-#include <sys/utsname.h> /* for uname */
-#else
-#include <io.h>
-#include <process.h>
-#endif
-#include <errno.h>
-#include <sys/types.h> /* for opendir() */
-#include <sys/stat.h> /* for stat */
-#include <time.h> /* for clock() */
-#include <stdlib.h> /* for rand(), srand() */
-#include <string.h> /* for strdup */
-#include "icaldirsetimpl.h"
-
-
-#ifdef WIN32
-#define snprintf	_snprintf
-#define strcasecmp	stricmp
-
-#define _S_ISTYPE(mode, mask)  (((mode) & _S_IFMT) == (mask))
-
-#define S_ISDIR(mode)    _S_ISTYPE((mode), _S_IFDIR)
-#define S_ISREG(mode)    _S_ISTYPE((mode), _S_IFREG)
-#endif
-
-/** Default options used when NULL is passed to icalset_new() **/
-icaldirset_options icaldirset_options_default = {O_RDWR|O_CREAT};
-
-
-const char* icaldirset_path(icalset* set)
-{
-  icaldirset *dset = (icaldirset*)set;
-
-  return dset->dir;
-}
-
-
-void icaldirset_mark(icalset* set)
-{
-  icaldirset *dset = (icaldirset*)set;
-
-  icalcluster_mark(dset->cluster);
-}
-
-
-icalerrorenum icaldirset_commit(icalset* set)
-{
-  icaldirset *dset = (icaldirset*)set;
-  icalset *fileset;
-  icalfileset_options options = icalfileset_options_default;
-
-  options.cluster = dset->cluster;
-
-  fileset = icalset_new(ICAL_FILE_SET, icalcluster_key(dset->cluster), &options);
-
-  fileset->commit(fileset);
-  fileset->free(fileset);
-
-  return ICAL_NO_ERROR;
-}
-
-void icaldirset_lock(const char* dir)
-{
-}
-
-
-void icaldirset_unlock(const char* dir)
-{
-}
-
-/* Load the contents of the store directory into the store's internal directory list*/
-icalerrorenum icaldirset_read_directory(icaldirset *dset)
-{
-    char *str;
-#ifndef WIN32
-    struct dirent *de;
-    DIR* dp;
- 
-    dp = opendir(dset->dir);
-   
-    if (dp == 0) {
-	icalerror_set_errno(ICAL_FILE_ERROR);
-	return ICAL_FILE_ERROR;
-    }
-
-    /* clear contents of directory list */
-    while((str = pvl_pop(dset->directory))){
-	free(str);
-    }
-    
-    /* load all of the cluster names in the directory list */
-    for(de = readdir(dp);
-	de != 0;
-	de = readdir(dp)){
-
-	/* Remove known directory names  '.' and '..'*/
-	if (strcmp(de->d_name,".") == 0 ||
-	    strcmp(de->d_name,"..") == 0 ){
-	    continue;
-	}
-
-	pvl_push(dset->directory, (void*)strdup(de->d_name));	
-    }
-
-    closedir(dp);
-#else
-	struct _finddata_t c_file;
-	long hFile;
-	
-	/* Find first .c file in current directory */
-    if( (hFile = _findfirst( "*", &c_file )) == -1L ) {
-		icalerror_set_errno(ICAL_FILE_ERROR);
-		return ICAL_FILE_ERROR;
-    } else {
-      while((str = pvl_pop(dset->directory))){
-			free(str);
-		}
-		
-		/* load all of the cluster names in the directory list */
-      do {
-			/* Remove known directory names  '.' and '..'*/
-			if (strcmp(c_file.name,".") == 0 ||
-				strcmp(c_file.name,"..") == 0 ){
-				continue;
-			}
-			
-	pvl_push(dset->directory, (void*)strdup(c_file.name));
-		}
-		while ( _findnext( hFile, &c_file ) == 0 );
-			
-		_findclose( hFile );
-	}
-
-#endif
-
-    return ICAL_NO_ERROR;
-}
-
-
-icalset* icaldirset_init(icalset* set, const char* dir, void* options_in)
-{
-  icaldirset *dset = (icaldirset*)set;
-  icaldirset_options *options = options_in;
-    struct stat sbuf;
-
-    icalerror_check_arg_rz( (dir!=0), "dir");
-  icalerror_check_arg_rz( (set!=0), "set");
-
-    if (stat(dir,&sbuf) != 0){
-	icalerror_set_errno(ICAL_FILE_ERROR);
-	return 0;
-    }
-    
-    /* dir is not the name of a direectory*/
-    if (!S_ISDIR(sbuf.st_mode)){ 
-	icalerror_set_errno(ICAL_USAGE_ERROR);
-	return 0;
-    }	    
-
-    icaldirset_lock(dir);
-
-  dset->dir = (char*)strdup(dir);
-  dset->options = *options;
-  dset->directory = pvl_newlist();
-  dset->directory_iterator = 0;
-  dset->gauge = 0;
-  dset->first_component = 0;
-  dset->cluster = 0;
-
-  return set;
-}
-
-icalset* icaldirset_new(const char* dir)
-{
-  return icalset_new(ICAL_DIR_SET, dir, &icaldirset_options_default);
-}
-
-    
-icalset* icaldirset_new_reader(const char* dir)
-{
-  icaldirset_options reader_options = icaldirset_options_default;
-
-  reader_options.flags = O_RDONLY;
-
-  return icalset_new(ICAL_DIR_SET, dir, &reader_options);
-}
-
-    
-icalset* icaldirset_new_writer(const char* dir)
-{
-  icaldirset_options writer_options = icaldirset_options_default;
-
-  writer_options.flags = O_RDWR|O_CREAT;
-
-  return icalset_new(ICAL_DIR_SET, dir, &writer_options);
-}
-
-
-void icaldirset_free(icalset* s)
-{
-  icaldirset *dset = (icaldirset*)s;
-    char* str;
-
-  icaldirset_unlock(dset->dir);
-
-  if(dset->dir !=0){
-    free(dset->dir);
-    dset->dir = 0;
-    }
-
-  if(dset->gauge !=0){
-    icalgauge_free(dset->gauge);
-    dset->gauge = 0;
-    }
-
-  if(dset->cluster !=0){
-    icalcluster_free(dset->cluster);
-    }
-
-  while(dset->directory !=0 &&  (str=pvl_pop(dset->directory)) != 0){
-	free(str);
-    }
-
-  if(dset->directory != 0){
-    pvl_free(dset->directory);
-    dset->directory = 0;
-    }
-
-  dset->directory_iterator = 0;
-  dset->first_component = 0;
-}
-
-
-/* icaldirset_next_uid_number updates a serial number in the Store
-   directory in a file called SEQUENCE */
-
-int icaldirset_next_uid_number(icaldirset* dset)
-{
-    char sequence = 0;
-    char temp[128];
-    char filename[ICAL_PATH_MAX];
-    char *r;
-    FILE *f;
-    struct stat sbuf;
-
-    icalerror_check_arg_rz( (dset!=0), "dset");
-
-    sprintf(filename,"%s/%s",dset->dir,"SEQUENCE");
-
-    /* Create the file if it does not exist.*/
-    if (stat(filename,&sbuf) == -1 || !S_ISREG(sbuf.st_mode)){
-
-	f = fopen(filename,"w");
-	if (f != 0){
-	    fprintf(f,"0");
-	    fclose(f);
-	} else {
-	    icalerror_warn("Can't create SEQUENCE file in icaldirset_next_uid_number");
-	    return 0;
-	}
-    }
-    
-    if ( (f = fopen(filename,"r+")) != 0){
-
-	rewind(f);
-	r = fgets(temp,128,f);
-
-	if (r == 0){
-	    sequence = 1;
-	} else {
-	    sequence = atoi(temp)+1;
-	}
-
-	rewind(f);
-
-	fprintf(f,"%d",sequence);
-
-	fclose(f);
-
-	return sequence;
-	
-    } else {
-	icalerror_warn("Can't create SEQUENCE file in icaldirset_next_uid_number");
-	return 0;
-    }
-}
-
-icalerrorenum icaldirset_next_cluster(icaldirset* dset)
-{
-    char path[ICAL_PATH_MAX];
-
-    if (dset->directory_iterator == 0){
-	icalerror_set_errno(ICAL_INTERNAL_ERROR);
-	return ICAL_INTERNAL_ERROR;
-    }	    
-    dset->directory_iterator = pvl_next(dset->directory_iterator);
-
-    if (dset->directory_iterator == 0){
-	/* There are no more clusters */
-	if(dset->cluster != 0){
-	    icalcluster_free(dset->cluster);
-	    dset->cluster = 0;
-	}
-	return ICAL_NO_ERROR;
-    }
-	    
-    sprintf(path,"%s/%s", dset->dir,(char*)pvl_data(dset->directory_iterator));
-
-    icalcluster_free(dset->cluster);
-    dset->cluster = icalfileset_produce_icalcluster(path);
-
-    return icalerrno;
-}
-
-static void icaldirset_add_uid(icalcomponent* comp)
-{
-    char uidstring[ICAL_PATH_MAX];
-    icalproperty *uid;
-#ifndef WIN32
-    struct utsname unamebuf;
-#endif
-
-    icalerror_check_arg_rv( (comp!=0), "comp");
-
-    uid = icalcomponent_get_first_property(comp,ICAL_UID_PROPERTY);
-    
-    if (uid == 0) {
-	
-#ifndef WIN32
-	uname(&unamebuf);
-	
-	sprintf(uidstring,"%d-%s",(int)getpid(),unamebuf.nodename);
-#else
-	sprintf(uidstring,"%d-%s",(int)getpid(),"WINDOWS");  /* FIX: There must be an easy get the system name */
-#endif
-	
-	uid = icalproperty_new_uid(uidstring);
-	icalcomponent_add_property(comp,uid);
-    } else {
-	strcpy(uidstring,icalproperty_get_uid(uid));
-    }
-}
-
-
-/**
-  This assumes that the top level component is a VCALENDAR, and there
-   is an inner component of type VEVENT, VTODO or VJOURNAL. The inner
-  component must have a DSTAMP property 
-*/
-
-icalerrorenum icaldirset_add_component(icalset* set, icalcomponent* comp)
-{
-    char clustername[ICAL_PATH_MAX];
-    icalproperty *dt = 0;
-    icalvalue *v;
-    struct icaltimetype tm;
-    icalerrorenum error = ICAL_NO_ERROR;
-    icalcomponent *inner;
-    icaldirset *dset = (icaldirset*) set;
-
-    icalerror_check_arg_rz( (dset!=0), "dset");
-    icalerror_check_arg_rz( (comp!=0), "comp");
-
-    icaldirset_add_uid(comp);
-
-    /* Determine which cluster this object belongs in. This is a HACK */
-
-    for(inner = icalcomponent_get_first_component(comp,ICAL_ANY_COMPONENT);
-	inner != 0;
-	inner = icalcomponent_get_next_component(comp,ICAL_ANY_COMPONENT)){
-  
-	dt = icalcomponent_get_first_property(inner,ICAL_DTSTAMP_PROPERTY);
- 	
-      if (dt != 0)
-	    break; 
-	}	
-
-    if (dt == 0) {
-	for(inner = icalcomponent_get_first_component(comp,ICAL_ANY_COMPONENT);
-	    inner != 0;
-	    inner = icalcomponent_get_next_component(comp,ICAL_ANY_COMPONENT)){
-	    
-	    dt = icalcomponent_get_first_property(inner,ICAL_DTSTART_PROPERTY);
-	    
-	  if (dt != 0)
-		break; 
-	    }	
-	}
-
-    if (dt == 0){
-	icalerror_warn("The component does not have a DTSTAMP or DTSTART property, so it cannot be added to the store");
-	icalerror_set_errno(ICAL_BADARG_ERROR);
-	return ICAL_BADARG_ERROR;
-    }
-
-    v = icalproperty_get_value(dt);
-    tm = icalvalue_get_datetime(v);
-
-    snprintf(clustername,ICAL_PATH_MAX,"%s/%04d%02d",dset->dir, tm.year, tm.month);
-
-    /* Load the cluster and insert the object */
-    if(dset->cluster != 0 && 
-       strcmp(clustername,icalcluster_key(dset->cluster)) != 0 ){
-      icalcluster_free(dset->cluster);
-      dset->cluster = 0;
-    }
-
-    if (dset->cluster == 0){
-      dset->cluster = icalfileset_produce_icalcluster(clustername);
-
-      if (dset->cluster == 0){
-	    error = icalerrno;
-	}
-    }
-    
-    if (error != ICAL_NO_ERROR){
-	icalerror_set_errno(error);
-	return error;
-    }
-
-    /* Add the component to the cluster */
-    icalcluster_add_component(dset->cluster,comp);
-    
-    /* icalcluster_mark(impl->cluster); */
-
-    return ICAL_NO_ERROR;    
-}
-
-/**
-   Remove a component in the current cluster. HACK. This routine is a
-   "friend" of icalfileset, and breaks its encapsulation. It was
-   either do it this way, or add several layers of interfaces that had
-   no other use.  
- */
-
-icalerrorenum icaldirset_remove_component(icalset* set, icalcomponent* comp)
-{
-    icaldirset *dset = (icaldirset*)set;
-    icalcomponent *filecomp = icalcluster_get_component(dset->cluster);
-
-    icalcompiter i;
-    int found = 0;
-
-    icalerror_check_arg_re((set!=0),"set",ICAL_BADARG_ERROR);
-    icalerror_check_arg_re((comp!=0),"comp",ICAL_BADARG_ERROR);
-    icalerror_check_arg_re((dset->cluster!=0),"Cluster pointer",ICAL_USAGE_ERROR);
-
-    for(i = icalcomponent_begin_component(filecomp,ICAL_ANY_COMPONENT);
-	icalcompiter_deref(&i)!= 0; icalcompiter_next(&i)){
-	
-	icalcomponent *this = icalcompiter_deref(&i);
-
-	if (this == comp){
-	    found = 1;
-	    break;
-	}
-    }
-
-    if (found != 1){
-	icalerror_warn("icaldirset_remove_component: component is not part of current cluster");
-	icalerror_set_errno(ICAL_USAGE_ERROR);
-	return ICAL_USAGE_ERROR;
-    }
-
-    icalcluster_remove_component(dset->cluster,comp);
-
-    /* icalcluster_mark(impl->cluster); */
-
-    /* If the removal emptied the fileset, get the next fileset */
-    if( icalcluster_count_components(dset->cluster,ICAL_ANY_COMPONENT)==0){
-      icalerrorenum error = icaldirset_next_cluster(dset);
-
-      if(dset->cluster != 0 && error == ICAL_NO_ERROR){
-	icalcluster_get_first_component(dset->cluster);
-	} else {
-	    /* HACK. Not strictly correct for impl->cluster==0 */
-	    return error;
-	}
-    } else {
-	/* Do nothing */
-    }
-
-    return ICAL_NO_ERROR;
-}
-
-
-
-int icaldirset_count_components(icalset* store,
-			       icalcomponent_kind kind)
-{
-    /* HACK, not implemented */
-    assert(0);
-
-    return 0;
-}
-
-
-icalcomponent* icaldirset_fetch_match(icalset* set, icalcomponent *c)
-{
-    fprintf(stderr," icaldirset_fetch_match is not implemented\n");
-    assert(0);
-    return 0;
-}
-
-
-icalcomponent* icaldirset_fetch(icalset* set, const char* uid)
-{
-    icaldirset *dset = (icaldirset*)set;
-    icalgauge *gauge;
-    icalgauge *old_gauge;
-    icalcomponent *c;
-    char sql[256];
-
-    icalerror_check_arg_rz( (set!=0), "set");
-    icalerror_check_arg_rz( (uid!=0), "uid");
-
-    snprintf(sql, 256, "SELECT * FROM VEVENT WHERE UID = \"%s\"", uid);
-    
-    gauge = icalgauge_new_from_sql(sql, 0);
-
-    old_gauge = dset->gauge;
-    dset->gauge = gauge;
-
-    c= icaldirset_get_first_component(set);
-
-    dset->gauge = old_gauge;
-
-    icalgauge_free(gauge);
-
-    return c;
-}
-
-
-int icaldirset_has_uid(icalset* set, const char* uid)
-{
-    icalcomponent *c;
-
-    icalerror_check_arg_rz( (set!=0), "set");
-    icalerror_check_arg_rz( (uid!=0), "uid");
-    
-    /* HACK. This is a temporary implementation. _has_uid should use a
-       database, and _fetch should use _has_uid, not the other way
-       around */
-    c = icaldirset_fetch(set,uid);
-
-    return c!=0;
-
-}
-
-
-icalerrorenum icaldirset_select(icalset* set, icalgauge* gauge)
-{
-  icaldirset *dset = (icaldirset*)set;
-
-  icalerror_check_arg_re( (set!=0), "set",ICAL_BADARG_ERROR);
-    icalerror_check_arg_re( (gauge!=0), "gauge",ICAL_BADARG_ERROR);
-
-  dset->gauge = gauge;
-
-    return ICAL_NO_ERROR;
-}
-
-
-icalerrorenum icaldirset_modify(icalset* set, 
-				icalcomponent *old,
-			       icalcomponent *new)
-{
-    assert(0);
-    return ICAL_NO_ERROR; /* HACK, not implemented */
-
-}
-
-
-void icaldirset_clear(icalset* set)
-{
-
-    assert(0);
-    return;
-    /* HACK, not implemented */
-}
-
-icalcomponent* icaldirset_get_current_component(icalset* set)
-{
-  icaldirset *dset = (icaldirset*)set;
-
-  if (dset->cluster == 0){
-    icaldirset_get_first_component(set);
-    }
-  if(dset->cluster == 0){
-	return 0;
-    }
-
-  return icalcluster_get_current_component(dset->cluster);
-}
-
-
-icalcomponent* icaldirset_get_first_component(icalset* set)
-{
-  icaldirset *dset = (icaldirset*)set;
-
-    icalerrorenum error;
-    char path[ICAL_PATH_MAX];
-
-  error = icaldirset_read_directory(dset);
-
-    if (error != ICAL_NO_ERROR){
-	icalerror_set_errno(error);
-	return 0;
-    }
-
-  dset->directory_iterator = pvl_head(dset->directory);
-    
-  if (dset->directory_iterator == 0){
-	icalerror_set_errno(error);
-	return 0;
-    }
-    
-  snprintf(path,ICAL_PATH_MAX,"%s/%s",
-	   dset->dir,
-	   (char*)pvl_data(dset->directory_iterator));
-
-    /* If the next cluster we need is different than the current cluster, 
-       delete the current one and get a new one */
-
-  if(dset->cluster != 0 && strcmp(path,icalcluster_key(dset->cluster)) != 0 ){
-    icalcluster_free(dset->cluster);
-    dset->cluster = 0;
-    }
-    
-  if (dset->cluster == 0){
-    dset->cluster = icalfileset_produce_icalcluster(path);
-
-    if (dset->cluster == 0){
-	    error = icalerrno;
-	}
-    } 
-
-    if (error != ICAL_NO_ERROR){
-	icalerror_set_errno(error);
-	return 0;
-    }
-
-  dset->first_component = 1;
-
-  return icaldirset_get_next_component(set);
-}
-
-
-icalcomponent* icaldirset_get_next_component(icalset* set)
-{
-  icaldirset *dset = (icaldirset*)set;
-    icalcomponent *c;
-    icalerrorenum error;
-
-  icalerror_check_arg_rz( (set!=0), "set");
-
-
-  if(dset->cluster == 0){
-	icalerror_warn("icaldirset_get_next_component called with a NULL cluster (Caller must call icaldirset_get_first_component first");
-	icalerror_set_errno(ICAL_USAGE_ERROR);
-	return 0;
-
-    }
-
-    /* Set the component iterator for the following for loop */
-  if (dset->first_component == 1){
-    icalcluster_get_first_component(dset->cluster);
-    dset->first_component = 0;
-    } else {
-    icalcluster_get_next_component(dset->cluster);
-    }
-
-    while(1){
-	/* Iterate through all of the objects in the cluster*/
-    for( c = icalcluster_get_current_component(dset->cluster);
-	     c != 0;
-	 c = icalcluster_get_next_component(dset->cluster)){
-	    
-	    /* If there is a gauge defined and the component does not
-	       pass the gauge, skip the rest of the loop */
-
-      if (dset->gauge != 0 && icalgauge_compare(dset->gauge,c) == 0){
-		continue;
-	    }
-
-	    /* Either there is no gauge, or the component passed the
-	       gauge, so return it*/
-
-	    return c;
-	}
-
-	/* Fell through the loop, so the component we want is not
-	   in this cluster. Load a new cluster and try again.*/
-
-    error = icaldirset_next_cluster(dset);
-
-    if(dset->cluster == 0 || error != ICAL_NO_ERROR){
-	    /* No more clusters */
-	    return 0;
-	} else {
-      c = icalcluster_get_first_component(dset->cluster);
-
-	    return c;
-	}
-	
-    }
-
-    return 0; /* Should never get here */
-}
-
-icalsetiter icaldirset_begin_component(icalset* set, icalcomponent_kind kind, icalgauge* gauge)
-{
-    icalsetiter itr = icalsetiter_null;
-    icaldirset *fset = (icaldirset*) set;
-
-    icalerror_check_arg_re((fset!=0), "set", icalsetiter_null);
-
-    itr.iter.kind = kind;
-    itr.gauge = gauge;
-
-    /* TO BE IMPLEMENTED */
-    return icalsetiter_null;
-}
-
-icalcomponent* icaldirsetiter_to_next(icalset* set, icalsetiter* i)
-{
-    /* TO BE IMPLEMENTED */
-    return NULL;
-}
-
-icalcomponent* icaldirsetiter_to_prior(icalset* set, icalsetiter* i)
-{
-    /* TO BE IMPLEMENTED */
-    return NULL;
-}
diff --git a/libical/src/libicalss/icaldirset.h b/libical/src/libicalss/icaldirset.h
deleted file mode 100644
index 3a90af2ffa..0000000000
--- a/libical/src/libicalss/icaldirset.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icaldirset.h
- CREATOR: eric 28 November 1999
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
-======================================================================*/
-
-#ifndef ICALDIRSET_H
-#define ICALDIRSET_H
-
-#include <libical/ical.h>
-#include <libicalss/icalset.h>
-#include <libicalss/icalcluster.h>
-#include <libicalss/icalgauge.h>
-
-/* icaldirset Routines for storing, fetching, and searching for ical
- * objects in a database */
-
-typedef struct icaldirset_impl icaldirset;
-
-icalset* icaldirset_new(const char* path);
-
-icalset* icaldirset_new_reader(const char* path);
-icalset* icaldirset_new_writer(const char* path);
-
-
-icalset* icaldirset_init(icalset* set, const char *dsn, void *options);
-void icaldirset_free(icalset* set);
-
-const char* icaldirset_path(icalset* set);
-
-/* Mark the cluster as changed, so it will be written to disk when it
-   is freed. Commit writes to disk immediately*/
-void icaldirset_mark(icalset* set);
-icalerrorenum icaldirset_commit(icalset* set);
-
-icalerrorenum icaldirset_add_component(icalset* store, icalcomponent* comp);
-icalerrorenum icaldirset_remove_component(icalset* store, icalcomponent* comp);
-
-int icaldirset_count_components(icalset* store,
-			       icalcomponent_kind kind);
-
-/* Restrict the component returned by icaldirset_first, _next to those
-   that pass the gauge. _clear removes the gauge. */
-icalerrorenum icaldirset_select(icalset* store, icalgauge* gauge);
-void icaldirset_clear(icalset* store);
-
-/* Get a component by uid */
-icalcomponent* icaldirset_fetch(icalset* store, const char* uid);
-int icaldirset_has_uid(icalset* store, const char* uid);
-icalcomponent* icaldirset_fetch_match(icalset* set, icalcomponent *c);
-
-/* Modify components according to the MODIFY method of CAP. Works on
-   the currently selected components. */
-icalerrorenum icaldirset_modify(icalset* store, icalcomponent *oldc,
-			       icalcomponent *newc);
-
-/* Iterate through the components. If a gauge has been defined, these
-   will skip over components that do not pass the gauge */
-
-icalcomponent* icaldirset_get_current_component(icalset* store);
-icalcomponent* icaldirset_get_first_component(icalset* store);
-icalcomponent* icaldirset_get_next_component(icalset* store);
-
-/* External iterator for thread safety */
-icalsetiter icaldirset_begin_component(icalset* set, icalcomponent_kind kind, icalgauge* gauge);
-icalcomponent* icaldirsetiter_to_next(icalset* set, icalsetiter* i);
-icalcomponent* icaldirsetiter_to_prior(icalset* set, icalsetiter* i);
-
-typedef struct icaldirset_options {
-  int flags;			/**< flags corresponding to the open() system call O_RDWR, etc. */
-} icaldirset_options;
-
-#endif /* !ICALDIRSET_H */
-
-
-
diff --git a/libical/src/libicalss/icaldirsetimpl.h b/libical/src/libicalss/icaldirsetimpl.h
deleted file mode 100644
index 442f0ea8f3..0000000000
--- a/libical/src/libicalss/icaldirsetimpl.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icaldirsetimpl.h
-  CREATOR: eric 21 Aug 2000
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
- ======================================================================*/
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <libicalss/icalcluster.h>
-
-/* This definition is in its own file so it can be kept out of the
-   main header file, but used by "friend classes" like icalset*/
-
-struct icaldirset_impl 
-{
-  icalset super;		/**< parent class */
-  char* dir;			/**< directory containing ics files  */
-  icaldirset_options options;	/**< copy of options passed to icalset_new() */
-  icalcluster* cluster;		/**< cluster containing data */
-  icalgauge* gauge;		/**< gauge for filtering out data  */
-  int first_component;		/**< ??? */
-  pvl_list directory;		/**< ??? */
-  pvl_elem directory_iterator;	/**< ??? */
-};
diff --git a/libical/src/libicalss/icalfileset.c b/libical/src/libicalss/icalfileset.c
deleted file mode 100644
index 389cec7587..0000000000
--- a/libical/src/libicalss/icalfileset.c
+++ /dev/null
@@ -1,921 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalfileset.c
-  CREATOR: eric 23 December 1999
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
- ======================================================================*/
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "icalfileset.h"
-#include "icalgauge.h"
-#include <errno.h>
-#include <sys/stat.h> /* for stat */
-#ifndef WIN32
-#include <unistd.h> /* for stat, getpid */
-#else
-#include <io.h>
-#include <share.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h> /* for fcntl */
-#include "icalfilesetimpl.h"
-#include "icalclusterimpl.h"
-
-#ifdef WIN32
-#define snprintf	_snprintf
-#define strcasecmp	stricmp
-
-#define _S_ISTYPE(mode, mask)  (((mode) & _S_IFMT) == (mask))
-
-#define S_ISDIR(mode)    _S_ISTYPE((mode), _S_IFDIR)
-#define S_ISREG(mode)    _S_ISTYPE((mode), _S_IFREG)
-#endif
-
-extern int errno;
-
-/** Default options used when NULL is passed to icalset_new() **/
-icalfileset_options icalfileset_options_default = {O_RDWR|O_CREAT, 0644, 0};
-
-int icalfileset_lock(icalfileset *set);
-int icalfileset_unlock(icalfileset *set);
-icalerrorenum icalfileset_read_file(icalfileset* set, mode_t mode);
-int icalfileset_filesize(icalfileset* set);
-
-icalerrorenum icalfileset_create_cluster(const char *path);
-
-icalset* icalfileset_new(const char* path)
-{
-  return icalset_new(ICAL_FILE_SET, path, &icalfileset_options_default);
-}
-
-icalset* icalfileset_new_reader(const char* path)
-{
-  icalfileset_options reader_options = icalfileset_options_default;
-  reader_options.flags = O_RDONLY;
-
-  return icalset_new(ICAL_FILE_SET, path, &reader_options);
-}
-
-icalset* icalfileset_new_writer(const char* path)
-{
-  icalfileset_options writer_options = icalfileset_options_default;
-  writer_options.flags = O_RDONLY;
-
-  return icalset_new(ICAL_FILE_SET, path, &writer_options);
-}
-
-icalset* icalfileset_init(icalset *set, const char* path, void* options_in)
-{
-  icalfileset_options *options = (options_in) ? options_in : &icalfileset_options_default;
-  icalfileset *fset = (icalfileset*) set;
-  int flags;
-  mode_t mode;
-  off_t cluster_file_size;
-
-  icalerror_clear_errno();
-  icalerror_check_arg_rz( (path!=0), "path");
-  icalerror_check_arg_rz( (fset!=0), "fset");
-
-  fset->path = strdup(path);
-  fset->options = *options;
-
-  flags = options->flags;
-  mode  = options->mode;
-
-  cluster_file_size = icalfileset_filesize(fset);
-  
-  if(cluster_file_size < 0){
-    icalfileset_free(set);
-    return 0;
-  }
-
-#ifndef WIN32
-  fset->fd = open(fset->path, flags, mode);
-#else
-  fset->fd = open(fset->path, flags, mode);
-  /* fset->fd = sopen(fset->path,flags, _SH_DENYWR, _S_IREAD | _S_IWRITE); */
-#endif
-    
-  if (fset->fd < 0){
-    icalerror_set_errno(ICAL_FILE_ERROR);
-    icalfileset_free(set);
-    return 0;
-  }
-
-#ifndef WIN32
-    icalfileset_lock(fset);
-#endif
-    
-    if(cluster_file_size > 0 ){
-	icalerrorenum error;
-	if((error = icalfileset_read_file(fset,mode))!= ICAL_NO_ERROR){
-	  icalfileset_free(set);
-	  return 0;
-	}
-    }
- 
-    if (options->cluster) {
-	fset->cluster = icalcomponent_new_clone(icalcluster_get_component(options->cluster));
-	fset->changed = 1;
-    }
-
-    if (fset->cluster == 0) {
-      fset->cluster = icalcomponent_new(ICAL_XROOT_COMPONENT);
-    }
-
-    return set;
-}
-
-
-icalcluster* icalfileset_produce_icalcluster(const char *path) {
-  icalset *fileset;
-  icalcluster *ret;
-
-  int errstate = icalerror_errors_are_fatal;
-  icalerror_errors_are_fatal = 0;
-    
-  fileset = icalfileset_new_reader(path);
-  
-
-  if (fileset == 0 && icalerrno == ICAL_FILE_ERROR) {
-    /* file does not exist */
-    ret = icalcluster_new(path, NULL);
-  } else {
-    ret = icalcluster_new(path, ((icalfileset*)fileset)->cluster);
-    icalfileset_free(fileset);
-  }
-  
-  icalerror_errors_are_fatal = errstate;
-  icalerror_set_errno(ICAL_NO_ERROR);
-  return ret;
-}
-
-
-
-char* icalfileset_read_from_file(char *s, size_t size, void *d)
-{
-    char* p = s;
-    int fd = (int)d;
-
-    /* Simulate fgets -- read single characters and stop at '\n' */
-
-    for(p=s; p<s+size-1;p++){
-	
-	if(read(fd,p,1) != 1 || *p=='\n'){
-	    p++;
-	    break;
-	} 
-    }
-
-    *p = '\0';
-    
-    if(*s == 0){
-	return 0;
-    } else {
-	return s;
-    }
-
-}
-
-
-icalerrorenum icalfileset_read_file(icalfileset* set,mode_t mode)
-{
-    icalparser *parser;
-  
-    parser = icalparser_new();
-
-    icalparser_set_gen_data(parser,(void*)set->fd);
-    set->cluster = icalparser_parse(parser,icalfileset_read_from_file);
-    icalparser_free(parser);
-
-    if (set->cluster == 0 || icalerrno != ICAL_NO_ERROR){
-	icalerror_set_errno(ICAL_PARSE_ERROR);
-	/*return ICAL_PARSE_ERROR;*/
-    }
-  
-    if (icalcomponent_isa(set->cluster) != ICAL_XROOT_COMPONENT){
-	/* The parser got a single component, so it did not put it in
-	   an XROOT. */
-	icalcomponent *cl = set->cluster;
-	set->cluster = icalcomponent_new(ICAL_XROOT_COMPONENT);
-	icalcomponent_add_component(set->cluster,cl);
-    }
-
-    return ICAL_NO_ERROR;
-}
-
-int icalfileset_filesize(icalfileset* fset)
-{
-    int cluster_file_size;
-    struct stat sbuf;
-    
-    if (stat(fset->path,&sbuf) != 0){
-	
-	/* A file by the given name does not exist, or there was
-	   another error */
-	cluster_file_size = 0;
-	if (errno == ENOENT) {
-	    /* It was because the file does not exist */
-	    return 0;
-	} else {
-	    /* It was because of another error */
-	    icalerror_set_errno(ICAL_FILE_ERROR);
-	    return -1;
-	}
-    } else {
-	/* A file by the given name exists, but is it a regular file? */
-	
-	if (!S_ISREG(sbuf.st_mode)){ 
-	    /* Nope, not a regular file */
-	    icalerror_set_errno(ICAL_FILE_ERROR);
-	    return -1;
-	} else {
-	    /* Lets assume that it is a file of the right type */
-	    return sbuf.st_size;
-	}	
-    }
-
-    /*return -1; not reached*/
-}
-
-void icalfileset_free(icalset* set)
-{
-    icalfileset *fset = (icalfileset*) set;
-
-    icalerror_check_arg_rv((set!=0),"set");
-
-    if (fset->cluster != 0){
-	icalfileset_commit(set);
-	icalcomponent_free(fset->cluster);
-	fset->cluster=0;
-    }
-
-    if (fset->gauge != 0){
-	icalgauge_free(fset->gauge);
-	fset->gauge=0;
-    }
-
-    if(fset->fd > 0){
-	icalfileset_unlock(fset);
-	close(fset->fd);
-	fset->fd = -1;
-    }
-
-    if(fset->path != 0){
-	free(fset->path);
-	fset->path = 0;
-    }
-}
-
-const char* icalfileset_path(icalset* set) {
-    icalerror_check_arg_rz((set!=0),"set");
-
-    return ((icalfileset*)set)->path;
-}
-
-
-int icalfileset_lock(icalfileset *set)
-{
-#ifndef WIN32
-    struct flock lock;
-    int rtrn;
-
-    icalerror_check_arg_rz((set->fd>0),"set->fd");
-    errno = 0;
-    lock.l_type = F_WRLCK;     /* F_RDLCK, F_WRLCK, F_UNLCK */
-    lock.l_start = 0;  /* byte offset relative to l_whence */
-    lock.l_whence = SEEK_SET; /* SEEK_SET, SEEK_CUR, SEEK_END */
-    lock.l_len = 0;       /* #bytes (0 means to EOF) */
-
-    rtrn = fcntl(set->fd, F_SETLKW, &lock);
-
-    return rtrn;
-#else
-	return 0;
-#endif
-}
-
-int icalfileset_unlock(icalfileset *set)
-{
-#ifndef WIN32
-    struct flock lock;
-    icalerror_check_arg_rz((set->fd>0),"set->fd");
-
-    lock.l_type = F_WRLCK;     /* F_RDLCK, F_WRLCK, F_UNLCK */
-    lock.l_start = 0;  /* byte offset relative to l_whence */
-    lock.l_whence = SEEK_SET; /* SEEK_SET, SEEK_CUR, SEEK_END */
-    lock.l_len = 0;       /* #bytes (0 means to EOF) */
-
-    return (fcntl(set->fd, F_UNLCK, &lock)); 
-#else
-	return 0;
-#endif
-}
-
-icalerrorenum icalfileset_commit(icalset* set)
-{
-    char tmp[ICAL_PATH_MAX]; 
-    char *str;
-    icalcomponent *c;
-    off_t write_size=0;
-    icalfileset *fset = (icalfileset*) set;
-
-    icalerror_check_arg_re((fset!=0),"set",ICAL_BADARG_ERROR);  
-    
-    icalerror_check_arg_re((fset->fd>0),"set->fd is invalid",
-			   ICAL_INTERNAL_ERROR) ;
-
-    if (fset->changed == 0 ){
-	return ICAL_NO_ERROR;
-    }
-    
-    if(lseek(fset->fd, 0, SEEK_SET) < 0){
-	icalerror_set_errno(ICAL_FILE_ERROR);
-	return ICAL_FILE_ERROR;
-    }
-    
-    for(c = icalcomponent_get_first_component(fset->cluster,ICAL_ANY_COMPONENT);
-	c != 0;
-	c = icalcomponent_get_next_component(fset->cluster,ICAL_ANY_COMPONENT)){
-	int sz;
-
-	str = icalcomponent_as_ical_string(c);
-    
-	sz=write(fset->fd,str,strlen(str));
-
-	if ( sz != strlen(str)){
-	    perror("write");
-	    icalerror_set_errno(ICAL_FILE_ERROR);
-	    return ICAL_FILE_ERROR;
-	}
-
-	write_size += sz;
-    }
-    
-    fset->changed = 0;    
-
-#ifndef WIN32
-    if(ftruncate(fset->fd,write_size) < 0){
-	return ICAL_FILE_ERROR;
-    }
-#else
-	chsize( fset->fd, tell( fset->fd ) );
-#endif
-    
-    return ICAL_NO_ERROR;
-} 
-
-void icalfileset_mark(icalset* set) {
-    icalerror_check_arg_rv((set!=0),"set");
-
-    ((icalfileset*)set)->changed = 1;
-}
-
-icalcomponent* icalfileset_get_component(icalset* set){
-    icalfileset *fset = (icalfileset*) set;
-    icalerror_check_arg_rz((set!=0),"set");
-
-    return fset->cluster;
-}
-
-
-/* manipulate the components in the set */
-
-icalerrorenum icalfileset_add_component(icalset *set,
-					icalcomponent* child)
-{
-    icalfileset *fset = (icalfileset*) set;
-
-    icalerror_check_arg_re((set!=0),"set", ICAL_BADARG_ERROR);
-    icalerror_check_arg_re((child!=0),"child",ICAL_BADARG_ERROR);
-
-    icalcomponent_add_component(fset->cluster,child);
-
-    icalfileset_mark(set);
-
-    return ICAL_NO_ERROR;
-}
-
-icalerrorenum icalfileset_remove_component(icalset *set,
-					   icalcomponent* child)
-{
-    icalfileset *fset = (icalfileset*) set;
-
-    icalerror_check_arg_re((set!=0),"set",ICAL_BADARG_ERROR);
-    icalerror_check_arg_re((child!=0),"child",ICAL_BADARG_ERROR);
-
-    icalcomponent_remove_component(fset->cluster,child);
-
-    icalfileset_mark(set);
-
-    return ICAL_NO_ERROR;
-}
-
-int icalfileset_count_components(icalset *set,
-				 icalcomponent_kind kind)
-{
-    icalfileset *fset = (icalfileset*) set;
-
-    if (set == 0){
-	icalerror_set_errno(ICAL_BADARG_ERROR);
-	return -1;
-    }
-
-    return icalcomponent_count_components(fset->cluster,kind);
-}
-
-icalerrorenum icalfileset_select(icalset* set, icalgauge* gauge)
-{
-    icalfileset *fset = (icalfileset*) set;
-
-    icalerror_check_arg_re(gauge!=0,"gauge",ICAL_BADARG_ERROR);
-
-    fset->gauge = gauge;
-
-    return ICAL_NO_ERROR;
-}
-
-void icalfileset_clear(icalset* set)
-{
-    icalfileset *fset = (icalfileset*) set;
-
-    icalerror_check_arg_rv(set!=0,"set");
-
-    fset->gauge = 0;
-}
-
-icalcomponent* icalfileset_fetch(icalset* set,const char* uid)
-{
-    icalfileset *fset = (icalfileset*) set;
-    icalcompiter i;    
-
-    icalerror_check_arg_rz(set!=0,"set");
-    
-    for(i = icalcomponent_begin_component(fset->cluster,ICAL_ANY_COMPONENT);
-	icalcompiter_deref(&i)!= 0; icalcompiter_next(&i)){
-	
-		icalcomponent *this = icalcompiter_deref(&i);
-		icalcomponent *inner;
-		icalproperty *p;
-		const char *this_uid;
-
-		for(inner = icalcomponent_get_first_component(this,ICAL_ANY_COMPONENT);
-			inner != 0;
-			inner = icalcomponent_get_next_component(this,ICAL_ANY_COMPONENT)){
-
-			p = icalcomponent_get_first_property(inner,ICAL_UID_PROPERTY);
-			if ( p )
-			{
-				this_uid = icalproperty_get_uid(p);
-
-				if(this_uid==0){
-				icalerror_warn("icalfileset_fetch found a component with no UID");
-				continue;
-				}
-
-				if (strcmp(uid,this_uid)==0){
-					return this;
-				}
-			}
-		}
-	}
-
-    return 0;
-}
-
-int icalfileset_has_uid(icalset* set,const char* uid)
-{
-    assert(0); /* HACK, not implemented */
-    return 0;
-}
-
-/******* support routines for icalfileset_fetch_match *********/
-
-struct icalfileset_id{
-    char* uid;
-    char* recurrence_id;
-    int sequence;
-};
-
-void icalfileset_id_free(struct icalfileset_id *id)
-{
-    if(id->recurrence_id != 0){
-	free(id->recurrence_id);
-    }
-
-    if(id->uid != 0){
-	free(id->uid);
-    }
-}
-
-
-struct icalfileset_id icalfileset_get_id(icalcomponent* comp)
-{
-    icalcomponent *inner;
-    struct icalfileset_id id;
-    icalproperty *p;
-
-    inner = icalcomponent_get_first_real_component(comp);
-    
-    p = icalcomponent_get_first_property(inner, ICAL_UID_PROPERTY);
-
-    assert(p!= 0);
-
-    id.uid = strdup(icalproperty_get_uid(p));
-
-    p = icalcomponent_get_first_property(inner, ICAL_SEQUENCE_PROPERTY);
-
-    if(p == 0) {
-	id.sequence = 0;
-    } else { 
-	id.sequence = icalproperty_get_sequence(p);
-    }
-
-    p = icalcomponent_get_first_property(inner, ICAL_RECURRENCEID_PROPERTY);
-
-    if (p == 0){
-	id.recurrence_id = 0;
-    } else {
-	icalvalue *v;
-	v = icalproperty_get_value(p);
-	id.recurrence_id = strdup(icalvalue_as_ical_string(v));
-
-	assert(id.recurrence_id != 0);
-    }
-
-    return id;
-}
-
-
-/* Find the component that is related to the given
-   component. Currently, it just matches based on UID and
-   RECURRENCE-ID */
-icalcomponent* icalfileset_fetch_match(icalset* set, icalcomponent *comp)
-{
-    icalfileset *fset = (icalfileset*) set;
-    icalcompiter i;    
-
-    struct icalfileset_id comp_id, match_id;
-    
-    comp_id = icalfileset_get_id(comp);
-
-    for(i = icalcomponent_begin_component(fset->cluster,ICAL_ANY_COMPONENT);
-	icalcompiter_deref(&i)!= 0; icalcompiter_next(&i)){
-	
-	icalcomponent *match = icalcompiter_deref(&i);
-
-	match_id = icalfileset_get_id(match);
-
-	if(strcmp(comp_id.uid, match_id.uid) == 0 &&
-	   ( comp_id.recurrence_id ==0 || 
-	     strcmp(comp_id.recurrence_id, match_id.recurrence_id) ==0 )){
-
-	    /* HACK. What to do with SEQUENCE? */
-
-	    icalfileset_id_free(&match_id);
-	    icalfileset_id_free(&comp_id);
-	    return match;
-	    
-	}
-	
-	icalfileset_id_free(&match_id);
-    }
-
-    icalfileset_id_free(&comp_id);
-    return 0;
-
-}
-
-
-icalerrorenum icalfileset_modify(icalset* set, icalcomponent *old,
-				 icalcomponent *new)
-{
-    icalfileset *fset = (icalfileset*) set;
-
-    assert(0); /* HACK, not implemented */
-    return ICAL_NO_ERROR;
-}
-
-
-/* Iterate through components */
-icalcomponent* icalfileset_get_current_component (icalset* set)
-{
-    icalfileset *fset = (icalfileset*) set;
-
-    icalerror_check_arg_rz((set!=0),"set");
-
-    return icalcomponent_get_current_component(fset->cluster);
-}
-
-
-icalcomponent* icalfileset_get_first_component(icalset* set)
-{
-    icalcomponent *c=0;
-    icalfileset *fset = (icalfileset*) set;
-
-    icalerror_check_arg_rz((set!=0),"set");
-
-    do {
-	if (c == 0){
-	    c = icalcomponent_get_first_component(fset->cluster,
-						  ICAL_ANY_COMPONENT);
-	} else {
-	    c = icalcomponent_get_next_component(fset->cluster,
-						 ICAL_ANY_COMPONENT);
-	}
-
-	if(c != 0 && (fset->gauge == 0 ||
-		      icalgauge_compare(fset->gauge, c) == 1)){
-	    return c;
-	}
-
-    } while(c != 0);
-
-
-    return 0;
-}
-
-icalcomponent* icalfileset_get_next_component(icalset* set)
-{
-    icalfileset *fset = (icalfileset*) set;
-    icalcomponent *c;
-
-    icalerror_check_arg_rz((set!=0),"set");
-    
-    do {
-	c = icalcomponent_get_next_component(fset->cluster,
-					     ICAL_ANY_COMPONENT);
-
-	if(c != 0 && (fset->gauge == 0 ||
-		      icalgauge_compare(fset->gauge,c) == 1)){
-	    return c;
-	}
-	
-    } while(c != 0);
-    
-    
-    return 0;
-}
-/*
-icalsetiter icalfileset_begin_component(icalset* set, icalcomponent_kind kind, icalgauge* gauge)
-{
-    icalsetiter itr = icalsetiter_null;
-    icalcomponent* comp = NULL;
-    icalcompiter citr;
-    icalfileset *fset = (icalfileset*) set;
-
-    icalerror_check_arg_re((set!=0), "set", icalsetiter_null);
-
-    itr.gauge = gauge;
-
-    citr = icalcomponent_begin_component(fset->cluster, kind);
-    comp = icalcompiter_deref(&citr);
-
-    while (comp != 0) {
-	comp = icalcompiter_deref(&citr);
-	if (gauge == 0 || icalgauge_compare(itr.gauge, comp) == 1) {
-	    itr.iter = citr;
-	    return itr;
-	}
-	comp =  icalcompiter_next(&citr);
-    }
-
-    return icalsetiter_null;
-}
-*/
-
-icalsetiter icalfileset_begin_component(icalset* set, icalcomponent_kind kind, icalgauge* gauge)
-{
-    icalsetiter itr = icalsetiter_null;
-    icalcomponent* comp = NULL;
-    icalcompiter citr;
-    icalfileset *fset = (icalfileset*) set;
-    struct icaltimetype start, next;
-    icalproperty *dtstart, *rrule, *prop, *due;
-    struct icalrecurrencetype recur;
-    int g = 0;
-
-    icalerror_check_arg_re((set!=0), "set", icalsetiter_null);
-
-    itr.gauge = gauge;
-
-    citr = icalcomponent_begin_component(fset->cluster, kind);
-    comp = icalcompiter_deref(&citr);
-
-    if (gauge == 0) {
-        itr.iter = citr;
-        return itr;
-    }
-
-    while (comp != 0) {
-
-        /* check if it is a recurring component and with guage expand, if so
-           we need to add recurrence-id property to the given component */
-        rrule = icalcomponent_get_first_property(comp, ICAL_RRULE_PROPERTY);
-        g = icalgauge_get_expand(gauge);
-
-        if (rrule != 0
-            && g == 1) {
-
-            recur = icalproperty_get_rrule(rrule);
-            if (icalcomponent_isa(comp) == ICAL_VEVENT_COMPONENT) {
-                dtstart = icalcomponent_get_first_property(comp, ICAL_DTSTART_PROPERTY);
-                if (dtstart)
-                    start = icalproperty_get_dtstart(dtstart);
-            } else if (icalcomponent_isa(comp) == ICAL_VTODO_COMPONENT) {
-                    due = icalcomponent_get_first_property(comp, ICAL_DUE_PROPERTY);
-                    if (due)
-                        start = icalproperty_get_due(due);
-            }
-
-            if (itr.last_component == NULL) {
-                itr.ritr = icalrecur_iterator_new(recur, start);
-                next = icalrecur_iterator_next(itr.ritr);
-                itr.last_component = comp;
-            }
-            else {
-                next = icalrecur_iterator_next(itr.ritr);
-                if (icaltime_is_null_time(next)){
-                    itr.last_component = NULL;
-                    icalrecur_iterator_free(itr.ritr);
-                    itr.ritr = NULL;
-                    return icalsetiter_null;
-                } else {
-                    itr.last_component = comp;
-                }
-            }
-
-            /* add recurrence-id to the component
-               if there is a recurrence-id already, remove it, then add the new one */
-            if (prop = icalcomponent_get_first_property(comp, ICAL_RECURRENCEID_PROPERTY))
-                icalcomponent_remove_property(comp, prop);
-            icalcomponent_add_property(comp, icalproperty_new_recurrenceid(next));
-
-        }
-
-        if (gauge == 0 || icalgauge_compare(itr.gauge, comp) == 1) {
-            /* matches and returns */
-            itr.iter = citr;
-            return itr;
-        }
-
-        /* if there is no previous component pending, then get the next component */
-        if (itr.last_component == NULL)
-            comp =  icalcompiter_next(&citr);
-    }
-
-    return icalsetiter_null;
-}
-icalcomponent* icalfileset_form_a_matched_recurrence_component(icalsetiter* itr)
-{
-    icalcomponent* comp = NULL;
-    struct icaltimetype start, next;
-    icalproperty *dtstart, *rrule, *prop, *due;
-    struct icalrecurrencetype recur;
-
-    comp = itr->last_component;
-
-    if (comp == NULL || itr->gauge == NULL) {
-        return NULL;
-    }
-
-    rrule = icalcomponent_get_first_property(comp, ICAL_RRULE_PROPERTY);
-
-    recur = icalproperty_get_rrule(rrule);
-
-    if (icalcomponent_isa(comp) == ICAL_VEVENT_COMPONENT) {
-        dtstart = icalcomponent_get_first_property(comp, ICAL_DTSTART_PROPERTY);
-        if (dtstart)
-            start = icalproperty_get_dtstart(dtstart);
-    } else if (icalcomponent_isa(comp) == ICAL_VTODO_COMPONENT) {
-        due = icalcomponent_get_first_property(comp, ICAL_DUE_PROPERTY);
-        if (due)
-            start = icalproperty_get_due(due);
-    }
-
-    if (itr->ritr == NULL) {
-        itr->ritr = icalrecur_iterator_new(recur, start);
-        next = icalrecur_iterator_next(itr->ritr);
-        itr->last_component = comp;
-    } else {
-        next = icalrecur_iterator_next(itr->ritr);
-        if (icaltime_is_null_time(next)){
-            /* no more recurrence, returns */
-            itr->last_component = NULL;
-            icalrecur_iterator_free(itr->ritr);
-            itr->ritr = NULL;
-            return NULL;
-        } else {
-            itr->last_component = comp;
-        }
-    }
-
-    /* add recurrence-id to the component
-     * if there is a recurrence-id already, remove it, then add the new one */
-    if (prop = icalcomponent_get_first_property(comp, ICAL_RECURRENCEID_PROPERTY))
-        icalcomponent_remove_property(comp, prop);
-        icalcomponent_add_property(comp, icalproperty_new_recurrenceid(next));
-
-     if (itr->gauge == 0 || icalgauge_compare(itr->gauge, comp) == 1) {
-         /* matches and returns */
-         return comp;
-     }
-     /* not matched */
-     return NULL;
-
-}
-icalcomponent* icalfilesetiter_to_next(icalset* set, icalsetiter* i)
-{
-
-    icalcomponent* c = NULL;
-    icalfileset *fset = (icalfileset*) set;
-    struct icaltimetype start, next;
-    icalproperty *dtstart, *rrule, *prop, *due;
-    struct icalrecurrencetype recur;
-    int g = 0;
-
-
-    do {
-        c = icalcompiter_next(&(i->iter));
-
-        if (c == 0) continue;
-        if (i->gauge == 0) return c;
-
-
-        rrule = icalcomponent_get_first_property(c, ICAL_RRULE_PROPERTY);
-        g = icalgauge_get_expand(i->gauge);
-
-        /* a recurring component with expand query */
-        if (rrule != 0
-            && g == 1) {
-
-            recur = icalproperty_get_rrule(rrule);
-
-            if (icalcomponent_isa(c) == ICAL_VEVENT_COMPONENT) {
-                dtstart = icalcomponent_get_first_property(c, ICAL_DTSTART_PROPERTY);
-                if (dtstart)
-                    start = icalproperty_get_dtstart(dtstart);
-            } else if (icalcomponent_isa(c) == ICAL_VTODO_COMPONENT) {
-                due = icalcomponent_get_first_property(c, ICAL_DUE_PROPERTY);
-                if (due)
-                    start = icalproperty_get_due(due);
-            }
-
-            if (i->ritr == NULL) {
-                i->ritr = icalrecur_iterator_new(recur, start);
-                next = icalrecur_iterator_next(i->ritr);
-                i->last_component = c;
-            } else {
-                next = icalrecur_iterator_next(i->ritr);
-                if (icaltime_is_null_time(next)) {
-                    /* no more recurrence, returns */
-                    i->last_component = NULL;
-                    icalrecur_iterator_free(i->ritr);
-                    i->ritr = NULL;
-                    return NULL;
-                } else {
-                    i->last_component = c;
-                }
-            }
-        }
-
-        /* add recurrence-id to the component
-         * if there is a recurrence-id already, remove it, then add the new one */
-        if (prop = icalcomponent_get_first_property(c, ICAL_RECURRENCEID_PROPERTY))
-            icalcomponent_remove_property(c, prop);
-        icalcomponent_add_property(c, icalproperty_new_recurrenceid(next));
-
-        if(c != 0 && (i->gauge == 0 ||
-                        icalgauge_compare(i->gauge, c) == 1)){
-            return c;
-        }
-    } while (c != 0);
-
-    return 0;
-
-}
diff --git a/libical/src/libicalss/icalfileset.h b/libical/src/libicalss/icalfileset.h
deleted file mode 100644
index a24574b7a9..0000000000
--- a/libical/src/libicalss/icalfileset.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalfileset.h
- CREATOR: eric 23 December 1999
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
-======================================================================*/
-
-#ifndef ICALFILESET_H
-#define ICALFILESET_H
-
-#include <libical/ical.h>
-#include <libicalss/icalset.h>
-#include <libicalss/icalcluster.h>
-#include <libicalss/icalgauge.h>
-#include <sys/types.h> /* For open() flags and mode */
-#include <sys/stat.h> /* For open() flags and mode */
-#include <fcntl.h> /* For open() flags and mode */
-
-#ifdef WIN32
-#define mode_t int
-#endif
-
-typedef struct icalfileset_impl icalfileset;
-
-icalset* icalfileset_new(const char* path);
-icalset* icalfileset_new_reader(const char* path);
-icalset* icalfileset_new_writer(const char* path);
-
-icalset* icalfileset_init(icalset *set, const char *dsn, void* options);
-
-icalfileset* icalfileset_new_from_cluster(const char* path, icalcluster *cluster);
-
-icalcluster* icalfileset_produce_icalcluster(const char *path);
-
-void icalfileset_free(icalset* cluster);
-
-const char* icalfileset_path(icalset* cluster);
-
-/* Mark the cluster as changed, so it will be written to disk when it
-   is freed. Commit writes to disk immediately. */
-void icalfileset_mark(icalset* set);
-icalerrorenum icalfileset_commit(icalset* set); 
-
-icalerrorenum icalfileset_add_component(icalset* set,
-					icalcomponent* child);
-
-icalerrorenum icalfileset_remove_component(icalset* set,
-					   icalcomponent* child);
-
-int icalfileset_count_components(icalset* set,
-				 icalcomponent_kind kind);
-
-/**
- * Restrict the component returned by icalfileset_first, _next to those
- * that pass the gauge. _clear removes the gauge 
- */
-icalerrorenum icalfileset_select(icalset* set, icalgauge* gauge);
-
-/** clear the gauge **/
-void icalfileset_clear(icalset* set);
-
-/** Get and search for a component by uid **/
-icalcomponent* icalfileset_fetch(icalset* set, const char* uid);
-int icalfileset_has_uid(icalset* set, const char* uid);
-icalcomponent* icalfileset_fetch_match(icalset* set, icalcomponent *c);
-
-
-/**
- *  Modify components according to the MODIFY method of CAP. Works on the
- *  currently selected components. 
- */
-icalerrorenum icalfileset_modify(icalset* set, 
-				 icalcomponent *oldcomp,
-			       icalcomponent *newcomp);
-
-/* Iterate through components. If a gauge has been defined, these
-   will skip over components that do not pass the gauge */
-
-icalcomponent* icalfileset_get_current_component (icalset* cluster);
-icalcomponent* icalfileset_get_first_component(icalset* cluster);
-icalcomponent* icalfileset_get_next_component(icalset* cluster);
-
-/* External iterator for thread safety */
-icalsetiter icalfileset_begin_component(icalset* set, icalcomponent_kind kind, icalgauge* gauge);
-icalcomponent * icalfilesetiter_to_next(icalset* set, icalsetiter *iter);
-icalcomponent* icalfileset_form_a_matched_recurrence_component(icalsetiter* itr);
-
-/** Return a reference to the internal component. You probably should
-   not be using this. */
-
-icalcomponent* icalfileset_get_component(icalset* cluster);
-
-/** 
- * @brief options for opening an icalfileset.
- *
- * These options should be passed to the icalset_new() function
- */
-
-typedef struct icalfileset_options {
-  int          flags;		/**< flags for open() O_RDONLY, etc  */
-  mode_t       mode;		/**< file mode */
-  icalcluster  *cluster;	/**< use this cluster to initialize data */
-} icalfileset_options;
-
-extern icalfileset_options icalfileset_options_default;
-
-#endif /* !ICALFILESET_H */
-
-
-
diff --git a/libical/src/libicalss/icalfilesetimpl.h b/libical/src/libicalss/icalfilesetimpl.h
deleted file mode 100644
index 6f7cf00c1a..0000000000
--- a/libical/src/libicalss/icalfilesetimpl.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalfilesetimpl.h
-  CREATOR: eric 23 December 1999
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
- ======================================================================*/
-
-#ifndef ICALFILESETIMPL_H
-#define ICALFILESETIMPL_H
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <libicalss/icalgauge.h>
-
-/* This definition is in its own file so it can be kept out of the
-   main header file, but used by "friend classes" like icaldirset*/
-
-#define ICALFILESET_ID "fset"
-
-struct icalfileset_impl {
-  icalset super;		/**< parent class */
-  char *path;			/**< pathname of file */
-  icalfileset_options options;  /**< copy of options passed to icalset_new() */
-
-  icalcomponent* cluster;	/**< cluster containing data */
-  icalgauge* gauge;		/**< gauge for filtering out data */
-  int changed;			/**< boolean flag, 1 if data has changed */
-  int fd;			/**< file descriptor */
-};
-
-#endif
diff --git a/libical/src/libicalss/icalgauge.c b/libical/src/libicalss/icalgauge.c
deleted file mode 100644
index a4b97a9f1d..0000000000
--- a/libical/src/libicalss/icalgauge.c
+++ /dev/null
@@ -1,525 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalgauge.c
- CREATOR: eric 23 December 1999
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
-======================================================================*/
-
-#include <libical/ical.h>
-#include "icalgauge.h"
-#include "icalgaugeimpl.h"
-#include <stdlib.h>
-
-#include "icalssyacc.h"
-
-int ssparse(void);
-
-extern char *input_buffer;
-extern char *input_buffer_p;
-
-struct icalgauge_impl *icalss_yy_gauge;
-
-icalgauge* icalgauge_new_from_sql(char* sql, int expand)
-{
-    struct icalgauge_impl *impl;
-    int r;
-    
-    if ( ( impl = (struct icalgauge_impl*)
-	   malloc(sizeof(struct icalgauge_impl))) == 0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-    impl->select = pvl_newlist();
-    impl->from = pvl_newlist();
-    impl->where = pvl_newlist();
-    impl->expand = expand;
-
-    icalss_yy_gauge = impl;
-    input_buffer = input_buffer_p = sql;
-
-    r = ssparse();
-
-	if (r == 0) {
-	    return impl;
-	}
-	else {
-		 icalgauge_free(impl);
-	 	 return NULL;
-	}
-}
-
-int icalgauge_get_expand(icalgauge* gauge)
-{
-return (gauge->expand);
-
-}
-
-void icalgauge_free(icalgauge* gauge)
-{
-      struct icalgauge_where *w;
-
-      assert(gauge->select != 0);
-      assert(gauge->where != 0);
-      assert(gauge->from != 0);
-
-      if(gauge->select){
-	  while( (w=pvl_pop(gauge->select)) != 0){
-	      if(w->value != 0){
-		  free(w->value);
-	      }
-	      free(w);
-	  }
-	  pvl_free(gauge->select);
-	  gauge->select = 0;
-      }
-
-      if(gauge->where){
-	  while( (w=pvl_pop(gauge->where)) != 0){
-	      
-	      if(w->value != 0){
-		  free(w->value);
-	      }
-	      free(w);
-	  }
-	  pvl_free(gauge->where);
-	  gauge->where = 0;
-      }
-
-      if(gauge->from){
-	  pvl_free(gauge->from);
-	  gauge->from = 0;
-      }
-
-	  free(gauge);
-      
-}
-
-
-/** Convert a VQUERY component into a gauge */
-icalcomponent* icalgauge_make_gauge(icalcomponent* query);
-
-/**
-   icaldirset_test compares a component against a gauge, and returns
-   true if the component passes the test 
-
-   The gauge is a VCALENDAR component that specifies how to test the
-   target components. The gauge holds a collection of VEVENT, VTODO or
-   VJOURNAL sub-components. Each of the sub-components has a
-   collection of properties that are compared to corresponding
-   properties in the target component, according to the
-   X-LIC-COMPARETYPE parameters to the gauge's properties.
-
-   When a gauge has several sub-components, the results of testing the
-   target against each of them is ORed together - the target
-   component will pass if it matches any of the sub-components in the
-   gauge. However, the results of matching the properties in a
-   sub-component are ANDed -- the target must match every property in
-   a gauge sub-component to match the sub-component.
-
-   Here is an example:
-
-   BEGIN:XROOT
-   DTSTART;X-LIC-COMPARETYPE=LESS:19981025T020000
-   ORGANIZER;X-LIC-COMPARETYPE=EQUAL:mrbig@host.com 
-   END:XROOT
-   BEGIN:XROOT
-   LOCATION;X-LIC-COMPARETYPE=EQUAL:McNary's Pub
-   END:XROOT
-
-   This gauge has two sub-components; one which will match a VEVENT
-   based on start time, and organizer, and another that matches based
-   on LOCATION. A target component will pass the test if it matched
-   either of the sub-components.
-   
-  */
-
-
-int icalgauge_compare_recurse(icalcomponent* comp, icalcomponent* gauge)
-{
-    int pass = 1,localpass = 0;
-    icalproperty *p;
-    icalcomponent *child,*subgauge; 
-    icalcomponent_kind gaugekind, compkind;
-
-    icalerror_check_arg_rz( (comp!=0), "comp");
-    icalerror_check_arg_rz( (gauge!=0), "gauge");
-
-    gaugekind = icalcomponent_isa(gauge);
-    compkind = icalcomponent_isa(comp);
-
-    if( ! (gaugekind == compkind || gaugekind == ICAL_ANY_COMPONENT) ){
-	return 0;
-    }   
-
-    /* Test properties. For each property in the gauge, search through
-       the component for a similar property. If one is found, compare
-       the two properties value with the comparison specified in the
-       gauge with the X-LIC-COMPARETYPE parameter */
-    
-    for(p = icalcomponent_get_first_property(gauge,ICAL_ANY_PROPERTY);
-	p != 0;
-	p = icalcomponent_get_next_property(gauge,ICAL_ANY_PROPERTY)){
-	
-	icalproperty* targetprop; 
-	icalparameter* compareparam;
-	icalparameter_xliccomparetype compare;
-	int rel; /* The relationship between the gauge and target values.*/
-	
-	/* Extract the comparison type from the gauge. If there is no
-	   comparison type, assume that it is "EQUAL" */
-	
-	compareparam = icalproperty_get_first_parameter(
-	    p,
-	    ICAL_XLICCOMPARETYPE_PARAMETER);
-	
-	if (compareparam!=0){
-	    compare = icalparameter_get_xliccomparetype(compareparam);
-	} else {
-	    compare = ICAL_XLICCOMPARETYPE_EQUAL;
-	}
-	
-	/* Find a property in the component that has the same type
-	   as the gauge property. HACK -- multiples of a single
-	   property type in the gauge will match only the first
-	   instance in the component */
-	
-	targetprop = icalcomponent_get_first_property(comp,
-						      icalproperty_isa(p));
-	
-	if(targetprop != 0){
-	
-	    /* Compare the values of the gauge property and the target
-	       property */
-	    
-	    rel = icalvalue_compare(icalproperty_get_value(p),
-				    icalproperty_get_value(targetprop));
-	    
-	    /* Now see if the comparison is equavalent to the comparison
-	       specified in the gauge */
-	    
-	    if (rel == compare){ 
-		localpass++; 
-	    } else if (compare == ICAL_XLICCOMPARETYPE_LESSEQUAL && 
-		       ( rel == ICAL_XLICCOMPARETYPE_LESS ||
-			 rel == ICAL_XLICCOMPARETYPE_EQUAL)) {
-		localpass++;
-	    } else if (compare == ICAL_XLICCOMPARETYPE_GREATEREQUAL && 
-		       ( rel == ICAL_XLICCOMPARETYPE_GREATER ||
-			 rel == ICAL_XLICCOMPARETYPE_EQUAL)) {
-		localpass++;
-	    } else if (compare == ICAL_XLICCOMPARETYPE_NOTEQUAL && 
-		       ( rel == ICAL_XLICCOMPARETYPE_GREATER ||
-			 rel == ICAL_XLICCOMPARETYPE_LESS)) {
-		localpass++;
-	    } else {
-		localpass = 0;
-	    }
-	    
-	    pass = pass && (localpass>0);
-	}
-    }
-    
-    /* Test subcomponents. Look for a child component that has a
-       counterpart in the gauge. If one is found, recursively call
-       icaldirset_test */
-    
-    for(subgauge = icalcomponent_get_first_component(gauge,ICAL_ANY_COMPONENT);
-	subgauge != 0;
-	subgauge = icalcomponent_get_next_component(gauge,ICAL_ANY_COMPONENT)){
-	
-	gaugekind = icalcomponent_isa(subgauge);
-
-	if (gaugekind == ICAL_ANY_COMPONENT){
-	    child = icalcomponent_get_first_component(comp,ICAL_ANY_COMPONENT);
-	} else {
-	    child = icalcomponent_get_first_component(comp,gaugekind);
-	}
-	
-	if(child !=0){
-	    localpass = icalgauge_compare_recurse(child,subgauge);
-	    pass = pass && localpass;
-	} else {
-	    pass = 0;
-	}
-    }
-    
-    return pass;   
-}
-
-
-int icalgauge_compare(icalgauge* gauge,icalcomponent* comp)
-{
-
-    icalcomponent *inner; 
-    int local_pass = 0;
-    int last_clause = 1, this_clause = 1;
-    pvl_elem e;
-    icalcomponent_kind kind;
-    icalproperty *rrule;
-    int compare_recur = 0;
-
-
-    icalerror_check_arg_rz( (comp!=0), "comp");
-    icalerror_check_arg_rz( (gauge!=0), "gauge");
-    
-    if (gauge == 0 || comp == 0) return 0;
- 
-    inner = icalcomponent_get_first_real_component(comp);
-
-    if(inner == 0){
-	/* Wally Yau: our component is not always wrapped with
-	 * a <VCALENDAR>. It's not an error. 
-	 * icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	 * return 0; */
-	kind = icalcomponent_isa(comp);
-	if(kind == ICAL_VEVENT_COMPONENT ||
-	    kind == ICAL_VTODO_COMPONENT ||
-	    kind == ICAL_VJOURNAL_COMPONENT ||
-	    kind == ICAL_VQUERY_COMPONENT ||
-	    kind == ICAL_VAGENDA_COMPONENT){
-		inner = comp;
-	    }
-	else {
-	    icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	    return 0;
-	}
-        inner = comp;
-    }
-
-    /* Check that this component is one of the FROM types */
-    local_pass = 0;
-    for(e = pvl_head(gauge->from);e!=0;e=pvl_next(e)){
-	icalcomponent_kind k = (icalcomponent_kind)pvl_data(e);
-
-	if(k == icalcomponent_isa(inner)){
-	    local_pass=1;
-	}
-    }
-    
-    if(local_pass == 0){
-	return 0;
-    }
-
-    
-    /**** Check each where clause against the component ****/
-    for(e = pvl_head(gauge->where);e!=0;e=pvl_next(e)){
-	struct icalgauge_where *w = pvl_data(e);
-	icalcomponent *sub_comp;
-	icalvalue *v;
-	icalproperty *prop;
-	icalvalue_kind vk;
-
-	if(w->prop == ICAL_NO_PROPERTY || w->value == 0){
-	    icalerror_set_errno(ICAL_INTERNAL_ERROR);
-	    return 0;
-	}
-
-	/* First, create a value from the gauge */
-	vk = icalenum_property_kind_to_value_kind(w->prop);
-
-	if(vk == ICAL_NO_VALUE){
-            icalerror_set_errno(ICAL_INTERNAL_ERROR);
-	    return 0;
-	}
-
-        if (w->compare == ICALGAUGECOMPARE_ISNULL || w->compare == ICALGAUGECOMPARE_ISNOTNULL)
-	    v = icalvalue_new(vk);
-        else
-	  v = icalvalue_new_from_string(vk,w->value);
-
-	if (v == 0){
-	    /* Keep error set by icalvalue_from-string*/
-	    return 0;
-	}
-	    
-	/* Now find the corresponding property in the component,
-	   descending into a sub-component if necessary */
-
-	if(w->comp == ICAL_NO_COMPONENT){
-	    sub_comp = inner;
-	} else {
-	    sub_comp = icalcomponent_get_first_component(inner,w->comp);
-	    if(sub_comp == 0){
-		return 0;
-	    }
-	}	   
-
-        /* check if it is a recurring */
-        rrule = icalcomponent_get_first_property(sub_comp,ICAL_RRULE_PROPERTY);
-
-        if (gauge->expand
-            && rrule) {
-
-            if (w->prop == ICAL_DTSTART_PROPERTY || 
-                w->prop == ICAL_DTEND_PROPERTY || 
-                w->prop == ICAL_DUE_PROPERTY){
-	        /** needs to use recurrence-id to do comparison */
-                compare_recur = 1;
-            } 
-
-       }
-
-
-	this_clause = 0;
-	local_pass = (w->compare == ICALGAUGECOMPARE_ISNULL) ? 1 : 0;
-
-	for(prop = icalcomponent_get_first_property(sub_comp,w->prop);
-	    prop != 0;
-	    prop = icalcomponent_get_next_property(sub_comp,w->prop)){
-	    icalvalue* prop_value;
-	    icalgaugecompare relation;
-
-            if (w->compare == ICALGAUGECOMPARE_ISNULL) {
-                local_pass = 0;
-                break;
-            }
-
-            if (w->compare == ICALGAUGECOMPARE_ISNOTNULL) {
-                local_pass = 1;
-                break;
-            }
-
-            if (compare_recur) {
-                icalproperty *p = icalcomponent_get_first_property(sub_comp, ICAL_RECURRENCEID_PROPERTY);   
-                prop_value = icalproperty_get_value(p);
-            }
-            else /* prop value from this component */
-	    prop_value = icalproperty_get_value(prop);
-
-	    relation = (icalgaugecompare)icalvalue_compare(prop_value,v);
-	    
-	    if (relation  == w->compare){ 
-		local_pass++; 
-	    } else if (w->compare == ICALGAUGECOMPARE_LESSEQUAL && 
-		       ( relation  == ICALGAUGECOMPARE_LESS ||
-			 relation  == ICALGAUGECOMPARE_EQUAL)) {
-		local_pass++;
-	    } else if (w->compare == ICALGAUGECOMPARE_GREATEREQUAL && 
-		       ( relation  == ICALGAUGECOMPARE_GREATER ||
-			 relation  == ICALGAUGECOMPARE_EQUAL)) {
-		local_pass++;
-	    } else if (w->compare == ICALGAUGECOMPARE_NOTEQUAL && 
-		       ( relation  == ICALGAUGECOMPARE_GREATER ||
-			 relation  == ICALGAUGECOMPARE_LESS)) {
-		local_pass++;
-	    } else {
-		local_pass = 0;
-	    }
-	}
-    
-    
-	this_clause = local_pass > 0 ? 1 : 0;
-
-
-	/* Now look at the logic operator for this clause to see how
-           the value should be merge with the previous clause */
-
-	if(w->logic == ICALGAUGELOGIC_AND){
-	    last_clause = this_clause && last_clause;
-	} else if(w->logic == ICALGAUGELOGIC_OR) {
-	    last_clause = this_clause || last_clause;
-	} else {
-	    last_clause = this_clause;
-	}
-
-	icalvalue_free(v);
-
-    }/**** check next one in where clause ****/
-
-    return last_clause;
-
-}
-    
-/** @brief Debug
- * Print gauge information to stdout.
- */
-
-void icalgauge_dump(icalgauge* gauge)
-{
-
-    pvl_elem p;
-  
-    printf("--- Select ---\n");
-    for(p = pvl_head(gauge->select);p!=0;p=pvl_next(p)){
-	struct icalgauge_where *w = pvl_data(p);
-
-	if(w->comp != ICAL_NO_COMPONENT){
-	    printf("%s ",icalenum_component_kind_to_string(w->comp));
-	}
-
-	if(w->prop != ICAL_NO_PROPERTY){
-	    printf("%s ",icalenum_property_kind_to_string(w->prop));
-	}
-	
-	if (w->compare != ICALGAUGECOMPARE_NONE){
-	    printf("%d ",w->compare);
-	}
-
-
-	if (w->value!=0){
-	    printf("%s",w->value);
-	}
-
-
-	printf("\n");
-    }
-
-    printf("--- From ---\n");
-    for(p = pvl_head(gauge->from);p!=0;p=pvl_next(p)){
-	icalcomponent_kind k = (icalcomponent_kind)pvl_data(p);
-
-	printf("%s\n",icalenum_component_kind_to_string(k));
-    }
-
-    printf("--- Where ---\n");
-    for(p = pvl_head(gauge->where);p!=0;p=pvl_next(p)){
-	struct icalgauge_where *w = pvl_data(p);
-
-	if(w->logic != ICALGAUGELOGIC_NONE){
-	    printf("%d ",w->logic);
-	}
-	
-	if(w->comp != ICAL_NO_COMPONENT){
-	    printf("%s ",icalenum_component_kind_to_string(w->comp));
-	}
-
-	if(w->prop != ICAL_NO_PROPERTY){
-	    printf("%s ",icalenum_property_kind_to_string(w->prop));
-	}
-	
-	if (w->compare != ICALGAUGECOMPARE_NONE){
-	    printf("%d ",w->compare);
-	}
-
-
-	if (w->value!=0){
-	    printf("%s",w->value);
-	}
-
-
-	printf("\n");
-    }
-}
-
diff --git a/libical/src/libicalss/icalgauge.h b/libical/src/libicalss/icalgauge.h
deleted file mode 100644
index 1064b5f41f..0000000000
--- a/libical/src/libicalss/icalgauge.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalgauge.h
- CREATOR: eric 23 December 1999
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
-======================================================================*/
-
-#ifndef ICALGAUGE_H
-#define ICALGAUGE_H
-
-#include <libical/icalcomponent.h>
-
-/** @file icalgauge.h
- *  @brief Routines implementing a filter for ical components
- */
-
-typedef struct icalgauge_impl icalgauge;
-
-icalgauge* icalgauge_new_from_sql(char* sql, int expand);
-
-int icalgauge_get_expand(icalgauge* gauge);
-
-void icalgauge_free(icalgauge* gauge);
-
-char* icalgauge_as_sql(icalcomponent* gauge);
-
-void icalgauge_dump(icalgauge* gauge);
-
-
-/** @brief Return true if comp matches the gauge.
- *
- * The component must be in
- * cannonical form -- a VCALENDAR with one VEVENT, VTODO or VJOURNAL
- * sub component 
- */
-int icalgauge_compare(icalgauge* g, icalcomponent* comp);
-
-/** Clone the component, but only return the properties 
- *  specified in the gauge */
-icalcomponent* icalgauge_new_clone(icalgauge* g, icalcomponent* comp);
-
-#endif /* ICALGAUGE_H*/
diff --git a/libical/src/libicalss/icalgaugeimpl.h b/libical/src/libicalss/icalgaugeimpl.h
deleted file mode 100644
index 4bf13524c4..0000000000
--- a/libical/src/libicalss/icalgaugeimpl.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalgaugeimpl.h
- CREATOR: eric 09 Aug 2000
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-======================================================================*/
-
-#include <libical/ical.h>
-
-typedef enum icalgaugecompare {
-    ICALGAUGECOMPARE_EQUAL=ICAL_XLICCOMPARETYPE_EQUAL,
-    ICALGAUGECOMPARE_LESS=ICAL_XLICCOMPARETYPE_LESS,
-    ICALGAUGECOMPARE_LESSEQUAL=ICAL_XLICCOMPARETYPE_LESSEQUAL,
-    ICALGAUGECOMPARE_GREATER=ICAL_XLICCOMPARETYPE_GREATER,
-    ICALGAUGECOMPARE_GREATEREQUAL=ICAL_XLICCOMPARETYPE_GREATEREQUAL,
-    ICALGAUGECOMPARE_NOTEQUAL=ICAL_XLICCOMPARETYPE_NOTEQUAL,
-    ICALGAUGECOMPARE_REGEX=ICAL_XLICCOMPARETYPE_REGEX,
-    ICALGAUGECOMPARE_ISNULL=ICAL_XLICCOMPARETYPE_ISNULL,
-    ICALGAUGECOMPARE_ISNOTNULL=ICAL_XLICCOMPARETYPE_ISNOTNULL,
-    ICALGAUGECOMPARE_NONE=0
-} icalgaugecompare;
-
-typedef enum icalgaugelogic {
-    ICALGAUGELOGIC_NONE,
-    ICALGAUGELOGIC_AND,
-    ICALGAUGELOGIC_OR
-} icalgaugelogic;
-    
-
-struct icalgauge_where {
-	icalgaugelogic logic;
-	icalcomponent_kind comp;
-	icalproperty_kind prop;
-	icalgaugecompare compare;
-	char* value;
-};
-
-struct icalgauge_impl
-{
-	pvl_list select; /**< Of icalgaugecompare, using only prop and comp fields*/
-	pvl_list from;   /**< List of component_kinds, as integers */
-	pvl_list where;  /**< List of icalgaugecompare */
-        int      expand;
-};
-
-
diff --git a/libical/src/libicalss/icalmessage.c b/libical/src/libicalss/icalmessage.c
deleted file mode 100644
index 7a64ac5de1..0000000000
--- a/libical/src/libicalss/icalmessage.c
+++ /dev/null
@@ -1,378 +0,0 @@
-/* -*- Mode: C -*-
-    ======================================================================
-    FILE: icalmessage.c
-    CREATOR: ebusboom 07 Nov 2000
-  
-    $Id$
-    $Locker$
-    
-    (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-    
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of either: 
-    
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-    
-    Or:
-    
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
-    ======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "icalmessage.h"
-#include <libical/icalenums.h>
-#include <ctype.h>  /* for tolower()*/
-#include <string.h> /* for strstr */
-#include <stdlib.h> /* for free(), malloc() */
-icalcomponent* icalmessage_get_inner(icalcomponent* comp)
-{
-    if (icalcomponent_isa(comp) == ICAL_VCALENDAR_COMPONENT){
-	return icalcomponent_get_first_real_component(comp);
-    } else {
-	return comp;
-    }
-}
-
-static char* lowercase(const char* str)
-{
-    char* p = 0;
-    char* n = icalmemory_strdup(str);
-
-    if(str ==0){
-	return 0;
-    }
-
-    for(p = n; *p!=0; p++){
-	*p = tolower(*p);
-    }
-
-    return n;
-}
-
-icalproperty* icalmessage_find_attendee(icalcomponent* comp, const char* user)
-{
-    icalcomponent *inner = icalmessage_get_inner(comp);
-    icalproperty *p,*attendee = 0;
-    char* luser = lowercase(user);
-
-    for(p = icalcomponent_get_first_property(inner, ICAL_ATTENDEE_PROPERTY);
-	p != 0;
-	p = icalcomponent_get_next_property(inner, ICAL_ATTENDEE_PROPERTY)
-	){
-
-	char* lattendee;
-
-	lattendee = lowercase(icalproperty_get_attendee(p));
-
-	if (strstr(lattendee,user) != 0){
-	    attendee = p;
-	    break;
-	}
-
-	free(lattendee);
-
-    }
-    
-    free(luser);
-
-    return attendee;
-
-}
-
-void icalmessage_copy_properties(icalcomponent* to, icalcomponent* from, 
-		icalproperty_kind kind)
-{
-    icalcomponent *to_inner = icalmessage_get_inner(to);
-    icalcomponent *from_inner = icalmessage_get_inner(from);
-
-    if (to_inner == 0 && from_inner == 0){
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	return;
-    }
-
-    if(!icalcomponent_get_first_property(from_inner,kind)){
-	return;
-    }
-
-    icalcomponent_add_property(to_inner,
-	       icalproperty_new_clone(
-		   icalcomponent_get_first_property(
-		       from_inner,
-		       kind)
-		   )
-	);
-}
-
-icalcomponent *icalmessage_new_reply_base(icalcomponent* c,
-					    const char* user,
-					    const char* msg)
-{
-    icalproperty *attendee;
-    char tmp[45];
-
-    icalcomponent *reply = icalcomponent_vanew(
-	ICAL_VCALENDAR_COMPONENT,
-	icalproperty_new_method(ICAL_METHOD_REPLY),
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    icalproperty_new_dtstamp(icaltime_from_timet(time(0),0)),
-	    0),
-	0);
-
-    icalcomponent *inner = icalmessage_get_inner(reply);
-
-    icalerror_check_arg_rz(c,"c");
-
-    icalmessage_copy_properties(reply,c,ICAL_UID_PROPERTY);
-    icalmessage_copy_properties(reply,c,ICAL_ORGANIZER_PROPERTY);
-    icalmessage_copy_properties(reply,c,ICAL_RECURRENCEID_PROPERTY);
-    icalmessage_copy_properties(reply,c,ICAL_SUMMARY_PROPERTY);
-    icalmessage_copy_properties(reply,c,ICAL_SEQUENCE_PROPERTY);
-
-    icalcomponent_set_dtstamp(reply,icaltime_from_timet(time(0),0));
-
-    if(msg != 0){
-	icalcomponent_add_property(inner,icalproperty_new_comment(msg));
-    }
-
-    /* Copy this user's attendee property */
-
-    attendee = icalmessage_find_attendee(c,user);
-
-    if (attendee == 0){
-	icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-	icalcomponent_free(reply);
-	return 0;
-    }
-
-    icalcomponent_add_property(inner,icalproperty_new_clone(attendee));
-
-    /* Add PRODID and VERSION */
-
-    icalcomponent_add_property(reply,icalproperty_new_version("2.0"));
-    
-#ifndef WIN32    
-    sprintf(tmp,
-           "-//SoftwareStudio//NONSGML %s %s //EN",PACKAGE,VERSION);
-#else
-    sprintf(tmp,
-           "-//SoftwareStudio//NONSGML %s %s //EN",ICAL_PACKAGE,ICAL_VERSION);
-#endif
-    icalcomponent_add_property(reply,icalproperty_new_prodid(tmp));
-
-    return reply;
-
-}
-
-icalcomponent* icalmessage_new_accept_reply(icalcomponent* c,
-					    const char* user,
-					    const char* msg)
-{
-
-    icalcomponent *reply;
-    icalproperty *attendee;
-    icalcomponent *inner;
-
-    icalerror_check_arg_rz(c,"c");
-    
-    reply = icalmessage_new_reply_base(c,user,msg);
-
-    if(reply == 0){
-	return 0;
-    }
-
-    inner  = icalmessage_get_inner(reply);
-
-    attendee = icalcomponent_get_first_property(inner,
-						ICAL_ATTENDEE_PROPERTY);
-
-    icalproperty_set_parameter(attendee,
-	       icalparameter_new_partstat(ICAL_PARTSTAT_ACCEPTED));
-
-    return reply;
-}
-
-icalcomponent* icalmessage_new_decline_reply(icalcomponent* c,
-					    const char* user,
-					    const char* msg)
-{
-    icalcomponent *reply;
-    icalproperty *attendee;
-    icalcomponent *inner;
-
-    icalerror_check_arg_rz(c,"c");
-    
-    reply = icalmessage_new_reply_base(c,user,msg);
-    inner = icalmessage_get_inner(reply);
-    if(reply == 0){
-	return 0;
-    }
-
-    attendee = icalcomponent_get_first_property(inner,
-						ICAL_ATTENDEE_PROPERTY);
-
-    icalproperty_set_parameter(attendee,
-	       icalparameter_new_partstat(ICAL_PARTSTAT_DECLINED));
-
-    return reply;
-}
-
-/* New is modified version of old */
-icalcomponent* icalmessage_new_counterpropose_reply(icalcomponent* oldc,
-						    icalcomponent* newc,
-						    const char* user,
-						    const char* msg)
-{
-    icalcomponent *reply;
-
-    icalerror_check_arg_rz(oldc,"oldc");
-    icalerror_check_arg_rz(newc,"newc");
-    
-    reply = icalmessage_new_reply_base(newc,user,msg);
-
-    icalcomponent_set_method(reply,ICAL_METHOD_COUNTER);
-
-    return reply;
-
-}
-
-
-icalcomponent* icalmessage_new_delegate_reply(icalcomponent* c,
-					      const char* user,
-					      const char* delegatee,
-					      const char* msg)
-{
-
-    icalcomponent *reply;
-    icalproperty *attendee;
-    icalcomponent *inner;
-
-    icalerror_check_arg_rz(c,"c");
-
-    reply =  icalmessage_new_reply_base(c,user,msg);
-    inner = icalmessage_get_inner(reply);
-    if(reply == 0){
-	return 0;
-    }
-
-    attendee = icalcomponent_get_first_property(inner,
-						ICAL_ATTENDEE_PROPERTY);
-
-    icalproperty_set_parameter(attendee,
-	       icalparameter_new_partstat(ICAL_PARTSTAT_DELEGATED));
-
-    icalproperty_set_parameter(attendee,
-	       icalparameter_new_delegatedto(delegatee));
-
-    return reply;
-
-}
-
-icalcomponent* icalmessage_new_delegate_request(icalcomponent* c,
-					      const char* user,
-					      const char* delegatee,
-					      const char* msg)
-{
-
-    icalcomponent *reply;
-    icalproperty *attendee;
-    icalcomponent *inner;
-
-    icalerror_check_arg_rz(c,"c");
-
-    reply =  icalmessage_new_reply_base(c,user,msg);
-    inner = icalmessage_get_inner(reply);
-
-    if(reply == 0){
-	return 0;
-    }
-
-    icalcomponent_set_method(reply,ICAL_METHOD_REQUEST);
-
-    attendee = icalcomponent_get_first_property(inner,
-						ICAL_ATTENDEE_PROPERTY);
-
-    icalproperty_set_parameter(attendee,
-	       icalparameter_new_partstat(ICAL_PARTSTAT_DELEGATED));
-
-    icalproperty_set_parameter(attendee,
-	       icalparameter_new_delegatedto(delegatee));
-
-    icalcomponent_add_property(
-	inner,
-	icalproperty_vanew_attendee(
-	    delegatee,
-	    icalparameter_new_delegatedfrom(
-		icalproperty_get_attendee(attendee)
-		),
-	    0
-	    )
-	);
-	     
-
-    return reply;
-
-}
-
-
-icalcomponent* icalmessage_new_cancel_event(icalcomponent* c,
-					    const char* user,
-					    const char* msg);
-icalcomponent* icalmessage_new_cancel_instance(icalcomponent* c,
-					    const char* user,
-					    const char* msg);
-icalcomponent* icalmessage_new_cancel_all(icalcomponent* c,
-					    const char* user,
-					    const char* msg);
-
-
-
-icalcomponent* icalmessage_new_error_reply(icalcomponent* c,
-					   const char* user,
-					   const char* msg,
-					   const char* debug,
-					   icalrequeststatus code)
-{
-    icalcomponent *reply;
-    icalcomponent *inner, *cinner;
-    struct icalreqstattype rs;
-
-    icalerror_check_arg_rz(c,"c");
-    
-    reply = icalmessage_new_reply_base(c,user,msg);
-    inner = icalmessage_get_inner(reply);
-    cinner = icalmessage_get_inner(c);
-    if(reply == 0){
-	return 0;
-    }
-
-    if( code != ICAL_UNKNOWN_STATUS){
-	rs.code = code;
-	rs.debug = debug;
-	
-	icalcomponent_add_property(inner, 
-				   icalproperty_new_requeststatus(rs));
-    } else { /*  code == ICAL_UNKNOWN_STATUS */ 
-
-	/* Copy all of the request status properties */
-	icalproperty *p;
-	for(p = icalcomponent_get_first_property(cinner,
-						 ICAL_REQUESTSTATUS_PROPERTY);
-	    p != 0;
-	    p = icalcomponent_get_next_property(cinner,
-						ICAL_REQUESTSTATUS_PROPERTY)){
-
-	    
-	    icalcomponent_add_property(inner,icalproperty_new_clone(p));
-	}
-    }
-
-    return reply;
-}
diff --git a/libical/src/libicalss/icalmessage.h b/libical/src/libicalss/icalmessage.h
deleted file mode 100644
index 102e467f32..0000000000
--- a/libical/src/libicalss/icalmessage.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalmessage.h
- CREATOR: eric 07 Nov 2000
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
- =========================================================================*/
-
-#include <libical/ical.h>
-
-#ifndef ICALMESSAGE_H
-#define ICALMESSAGE_H
-
-
-icalcomponent* icalmessage_new_accept_reply(icalcomponent* c, 
-					    const char* user,
-					    const char* msg);
-
-icalcomponent* icalmessage_new_decline_reply(icalcomponent* c,
-					    const char* user,
-					    const char* msg);
-
-/* New is modified version of old */
-icalcomponent* icalmessage_new_counterpropose_reply(icalcomponent* oldc,
-						    icalcomponent* newc,
-						    const char* user,
-						    const char* msg);
-
-
-icalcomponent* icalmessage_new_delegate_reply(icalcomponent* c,
-					      const char* user,
-					      const char* delegatee,
-					      const char* msg);
-
-
-icalcomponent* icalmessage_new_cancel_event(icalcomponent* c,
-					    const char* user,
-					    const char* msg);
-icalcomponent* icalmessage_new_cancel_instance(icalcomponent* c,
-					    const char* user,
-					    const char* msg);
-icalcomponent* icalmessage_new_cancel_all(icalcomponent* c,
-					    const char* user,
-					    const char* msg);
-
-
-icalcomponent* icalmessage_new_error_reply(icalcomponent* c,
-					   const char* user,
-					   const char* msg,
-					   const char* debug,
-					   icalrequeststatus rs);
-
-
-#endif /* ICALMESSAGE_H*/
diff --git a/libical/src/libicalss/icalset.c b/libical/src/libicalss/icalset.c
deleted file mode 100644
index 682a404a1e..0000000000
--- a/libical/src/libicalss/icalset.c
+++ /dev/null
@@ -1,493 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalset.c
- CREATOR: eric 17 Jul 2000
-
-
- Icalset is the "base class" for representations of a collection of
- iCal components. Derived classes (actually delegates) include:
- 
-    icalfileset   Store components in a single file
-    icaldirset    Store components in multiple files in a directory
-    icalheapset   Store components on the heap
-    icalmysqlset  Store components in a mysql database. 
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
-======================================================================*/
-
-#include <libical/ical.h>
-#include "icalset.h"
-#include "icalfileset.h"
-#include "icalfilesetimpl.h"
-#include "icaldirset.h"
-#include "icaldirsetimpl.h"
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-#ifdef WITH_BDB4
-#include "icalbdbset.h"
-#include "icalbdbsetimpl.h"
-#endif
-
-/* #define _DLOPEN_TEST */
-#ifdef _DLOPEN_TEST
-#include <sys/types.h>
-#include <dlfcn.h>
-#include <dirent.h>
-#endif
-
-static icalset icalset_dirset_init = {
-    ICAL_DIR_SET,
-    sizeof(icaldirset),
-    NULL,
-    icaldirset_init,
-    icaldirset_free,
-    icaldirset_path,
-    icaldirset_mark,
-    icaldirset_commit,
-    icaldirset_add_component,
-    icaldirset_remove_component,
-    icaldirset_count_components,
-    icaldirset_select,
-    icaldirset_clear,
-    icaldirset_fetch,
-    icaldirset_fetch_match,
-    icaldirset_has_uid,
-    icaldirset_modify,
-    icaldirset_get_current_component,
-    icaldirset_get_first_component,
-    icaldirset_get_next_component,
-    icaldirset_begin_component,
-    icaldirsetiter_to_next,
-    icaldirsetiter_to_prior
-};
-
-
-static icalset icalset_fileset_init = {
-    ICAL_FILE_SET,
-    sizeof(icalfileset),
-    NULL,
-    icalfileset_init,
-    icalfileset_free,
-    icalfileset_path,
-    icalfileset_mark,
-    icalfileset_commit,
-    icalfileset_add_component,
-    icalfileset_remove_component,
-    icalfileset_count_components,
-    icalfileset_select,
-    icalfileset_clear,
-    icalfileset_fetch,
-    icalfileset_fetch_match,
-    icalfileset_has_uid,
-    icalfileset_modify,
-    icalfileset_get_current_component,
-    icalfileset_get_first_component,
-    icalfileset_get_next_component,
-    icalfileset_begin_component,
-    icalfilesetiter_to_next,
-    NULL
-};
-
-#ifdef WITH_BDB4
-static icalset icalset_bdbset_init = {
-    ICAL_BDB_SET,
-    sizeof(icalbdbset),
-    NULL,
-    icalbdbset_init,
-    icalbdbset_free,
-    icalbdbset_path,
-    icalbdbset_mark,
-    icalbdbset_commit,
-    icalbdbset_add_component,
-    icalbdbset_remove_component,
-    icalbdbset_count_components,
-    icalbdbset_select,
-    icalbdbset_clear,
-    icalbdbset_fetch,
-    icalbdbset_fetch_match,
-    icalbdbset_has_uid,
-    icalbdbset_modify,
-    icalbdbset_get_current_component,
-    icalbdbset_get_first_component,
-    icalbdbset_get_next_component,
-    icalbdbset_begin_component,
-    icalbdbsetiter_to_next,
-    NULL 
-};
-#endif
-
-#ifdef _DLOPEN_TEST
-static int	icalset_init_done = 0;
-static pvl_list icalset_kinds = 0;
-
-typedef icalset *(*fptr)(void);
-
-/**
- * Try to load the file and register any icalset found within.
- */
-static int load(const char *file) {
-
-        void           *modh;
-        fptr            inith;
-	icalset	       *icalset_init_ptr;
-
-        if ((modh = dlopen(file, RTLD_NOW)) == 0) {
-                perror("dlopen");
-                return 0;
-        }
-
-        if ((inith = (fptr)dlsym(modh, "InitModule")) == 0) {
-                perror("dlsym");
-                return 0;
-        }
-
-        while ((icalset_init_ptr = ((inith)())) != 0) {
-		pvl_push(icalset_kinds, &icalset_init_ptr);
-        }
-
-        return 1;
-}
-
-/**
- * Look in the given directory for files called mod_*.o and try to
- * load them.
- */
-int icalset_loaddir(const char *path) {
-        DIR             *d;
-        struct dirent   *dp;
-        char            buf[PATH_MAX],
-                       *bufptr;
-        int             tot = 0;
-
-        strcpy(buf, path);
-        bufptr = buf + strlen(buf);
-
-        if (*(bufptr-1) != '/')
-                *bufptr++ = '/';
-
-        if ((d = opendir(path)) == 0) {
-                perror("opendir");
-                return 0;
-        }
-
-        while ((dp = readdir(d)) != 0) {
-                if (strncmp(dp->d_name, "mod_", 4)) continue;
-
-                strcpy(bufptr, dp->d_name);
-
-                load(buf);
-                tot++;
-        }
-        (void)closedir(d);
-
-        return 1;
-}
-
-int icalset_register_class(icalset *set);
-
-static void icalset_init(void) {
-    assert(icalset_kinds == 0);
-    icalset_kinds = pvl_newlist();
-
-    pvl_push(icalset_kinds, &icalset_fileset_init);
-    pvl_push(icalset_kinds, &icalset_dirset_init);
-#ifdef WITH_BDB4
-    pvl_push(icalset_kinds, &icalset_bdb4set_init);
-#endif
-
-#ifdef EXT_PATH
-    icalset_loaddir(EXT_PATH);
-#endif
-
-    icalset_init_done++;
-}
-
-int icalset_register_class(icalset *set) {
-
-    if (!icalset_init_done)
-	icalset_init();
-
-    pvl_push(icalset_kinds, set);
-    return 1;
-}
-
-#endif
-
-icalset* icalset_new(icalset_kind kind, const char* dsn, void* options) {
-  icalset *data = NULL;
-  icalset *ret = NULL;
-
-#ifdef _DLOPEN_TEST
-    pvl_elem	e;
-    icalset    *impl;
-
-    if (!icalset_init_done)
-	icalset_init();
-
-    for(e = pvl_head(icalset_kinds); e!=0; e = pvl_next(e)) {
-	impl = (icalset*)pvl_data(e);
-	if (impl->kind == kind)
-	    break;
-    }
-    if (e == 0) {
-	icalerror_set_errno(ICAL_UNIMPLEMENTED_ERROR);
-	return(NULL);
-    }
-
-    data = (icalset*)malloc(impl->size);
-    if (data == 0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	errno = ENOMEM;
-	return 0;
-    }
-
-    /* The first member of the derived class must be an icalset. */
-    memset(data,0,impl->size);
-    /* *data = *impl; */
-    memcpy(data, impl, sizeof(icalset));
-
-    data->dsn     = strdup(dsn);
-#else
-  switch(kind) {
-  case ICAL_FILE_SET:
-    data = (icalset*) malloc(sizeof(icalfileset));
-    if (data == 0) {
-      	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	errno = ENOMEM;
-	return 0;
-    }
-    memset(data,0,sizeof(icalfileset));
-    *data = icalset_fileset_init;
-    break;
-  case ICAL_DIR_SET:
-    data = (icalset*) malloc(sizeof(icaldirset));
-    if (data == 0) {
-      	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	errno = ENOMEM;
-	return 0;
-    }
-    memset(data,0,sizeof(icaldirset));
-    *data = icalset_dirset_init;
-    break;
-#ifdef WITH_BDB4
-  case ICAL_BDB_SET:
-    data = (icalset*) malloc(sizeof(icalbdbset));
-    if (data == 0) {
-      	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	errno = ENOMEM;
-	return 0;
-    }
-    memset(data,0,sizeof(icalbdbset));
-    *data = icalset_bdbset_init;
-    break;
-#endif
-    
-  default:
-    icalerror_set_errno(ICAL_UNIMPLEMENTED_ERROR);
-    /** unimplemented **/
-    return(NULL);
-  }
-
-  if ( data == 0) {
-    icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-    return 0;
-  }
-  data->kind    = kind;
-  data->dsn     = strdup(dsn);
-#endif
-
-  /** call the implementation specific initializer **/
-  if ((ret = data->init(data, dsn, options)) == NULL)
-    icalset_free(data);
-
-  return ret;
-}
-
-icalset* icalset_new_file(const char* path)
-{
-  return icalset_new(ICAL_FILE_SET, path, NULL);
-}
-
-icalset* icalset_new_file_writer(const char* path)
-{
-  return icalfileset_new_writer(path);
-}
-
-icalset* icalset_new_file_reader(const char* path)
-{
-  return icalfileset_new_reader(path);
-}
-
-
-icalset* icalset_new_dir(const char* path)
-{
-  return icalset_new(ICAL_DIR_SET, path, NULL);
-}
-
-icalset* icalset_new_dir_writer(const char* path)
-{
-  return icaldirset_new_writer(path);
-}
-
-icalset* icalset_new_dir_reader(const char* path)
-{
-  return icaldirset_new_reader(path);
-}
-
-
-
-/* Functions for built-in methods */
-
-/**
- *  free memory associated with this icalset
- *  automatically calls the implementation specific free routine
- */
-
-void icalset_free(icalset* set)
-{
-  if (set->free)
-    set->free(set);
-
-  if (set->dsn)
-    free(set->dsn);
-
-  free(set);
-}
-
-
-const char* icalset_path(icalset* set) {
-    return set->path(set);
-}
-
-void icalset_mark(icalset* set) {
-    set->mark(set);
-}
-
-icalerrorenum icalset_commit(icalset* set) {
-    return set->commit(set);
-}
-
-icalerrorenum icalset_add_component(icalset* set, icalcomponent* comp) {
-    return set->add_component(set,comp);
-}
-
-icalerrorenum icalset_remove_component(icalset* set, icalcomponent* comp) {
-    return set->remove_component(set,comp);
-}
-
-int icalset_count_components(icalset* set,icalcomponent_kind kind) {
-    return set->count_components(set,kind);
-}
-
-icalerrorenum icalset_select(icalset* set, icalgauge* gauge) {
-    return set->select(set, gauge);
-}
-
-void icalset_clear(icalset* set) {
-    set->clear(set);
-}
-
-icalcomponent* icalset_fetch(icalset* set, const char* uid) {
-    return set->fetch(set, uid);
-}
-
-icalcomponent* icalset_fetch_match(icalset* set, icalcomponent *comp) {
-    return set->fetch_match(set, comp);
-}
-
-int icalset_has_uid(icalset* set, const char* uid) {
-    return set->has_uid(set, uid);
-}
-
-icalerrorenum icalset_modify(icalset* set, icalcomponent *old,
-			       icalcomponent *new) {
-    return set->modify(set, old, new);
-}
-
-icalcomponent* icalset_get_current_component(icalset* set) {
-    return set->get_current_component(set);
-}
-
-icalcomponent* icalset_get_first_component(icalset* set) {
-    return set->get_first_component(set);
-}
-
-icalcomponent* icalset_get_next_component(icalset* set) {
-    return set->get_next_component(set);
-}
-
-icalsetiter icalsetiter_null = {{ICAL_NO_COMPONENT, 0}, 0};
-
-icalsetiter icalset_begin_component(icalset* set,
-                                 icalcomponent_kind kind, icalgauge* gauge) {
-    return set->icalset_begin_component(set, kind, gauge);
-}
-
-icalcomponent* icalsetiter_next(icalsetiter* itr) {
-
-    icalcomponent* c = 0;
-    icalerror_check_arg_rz( (itr != NULL), "i");
-
-    do  {
-	c = icalcompiter_next(&(itr->iter));
-	if(c != 0 && (itr->gauge == 0 ||
-			icalgauge_compare(itr->gauge, c) == 1)){
-	    return c;
-	}
-    } while (c != 0);
-
-    return 0;
-}
-
-icalcomponent* icalsetiter_prior(icalsetiter* i) {
-
-    icalcomponent* c = 0;
-    icalerror_check_arg_rz( (i != NULL), "i" );
-
-    do  {
-	c = icalcompiter_prior(&(i->iter));
-	if(c != 0 && (i->gauge == 0 ||
-			icalgauge_compare(i->gauge, c) == 1)){
-	    return c;
-	}
-    } while (c != 0);
-
-    return 0;
-}
-
-icalcomponent* icalsetiter_deref(icalsetiter* i) {
-    icalerror_check_arg_rz( (i != NULL), "i" );
-    return (icalcompiter_deref(&(i->iter)));
-}
-
-/* for subclasses that use multiple clusters that require specialized cluster traversal */
-icalcomponent* icalsetiter_to_next(icalset* set, icalsetiter* i)
-{
-    return set->icalsetiter_to_next(set, i);
-}
-
-icalcomponent* icalsetiter_to_prior(icalset* set, icalsetiter* i)
-{
-    return set->icalsetiter_to_prior(set, i);
-}
diff --git a/libical/src/libicalss/icalset.h b/libical/src/libicalss/icalset.h
deleted file mode 100644
index dd550e2690..0000000000
--- a/libical/src/libicalss/icalset.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/* -*- Mode: C -*- */
-/**
- @file icalset.h
- @author eric 28 November 1999
-
- Icalset is the "base class" for representations of a collection of
- iCal components. Derived classes (actually delegatees) include:
- 
-    icalfileset   Store components in a single file
-    icaldirset    Store components in multiple files in a directory
-    icalbdbset    Store components in a Berkeley DB File
-    icalheapset   Store components on the heap
-    icalmysqlset  Store components in a mysql database. 
-**/
-
-/*
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
-======================================================================*/
-
-#ifndef ICALSET_H
-#define ICALSET_H
-
-#include <limits.h> /* For PATH_MAX */
-#include <libical/ical.h>
-#include <libicalss/icalgauge.h>
-
-#ifdef PATH_MAX
-#define ICAL_PATH_MAX PATH_MAX
-#else
-#define ICAL_PATH_MAX 1024
-#endif
-
-
-typedef struct icalset_impl icalset;
-
-typedef enum icalset_kind {
-    ICAL_FILE_SET,
-    ICAL_DIR_SET,
-    ICAL_BDB_SET
-} icalset_kind;
-
-typedef struct icalsetiter
-{
-	icalcompiter iter;    /* icalcomponent_kind, pvl_elem iter */
-	icalgauge* gauge;
-        icalrecur_iterator* ritr; /*the last iterator*/
-        icalcomponent* last_component; /*the pending recurring component to be processed  */
-	const char* tzid; /* the calendar's timezone id */
-} icalsetiter;
-
-struct icalset_impl {
-        icalset_kind kind;
-	int size;
-        char *dsn;
-        icalset* (*init)(icalset* set, const char *dsn, void *options);
-	void (*free)(icalset* set);
-	const char* (*path)(icalset* set);
-	void (*mark)(icalset* set);
-	icalerrorenum (*commit)(icalset* set); 
-	icalerrorenum (*add_component)(icalset* set, icalcomponent* comp);
-	icalerrorenum (*remove_component)(icalset* set, icalcomponent* comp);
-	int (*count_components)(icalset* set,
-			     icalcomponent_kind kind);
-	icalerrorenum (*select)(icalset* set, icalgauge* gauge);
-	void (*clear)(icalset* set);
-	icalcomponent* (*fetch)(icalset* set, const char* uid);
-	icalcomponent* (*fetch_match)(icalset* set, icalcomponent *comp);
-	int (*has_uid)(icalset* set, const char* uid);
-	icalerrorenum (*modify)(icalset* set, icalcomponent *old,
-				     icalcomponent *newc);
-	icalcomponent* (*get_current_component)(icalset* set);	
-	icalcomponent* (*get_first_component)(icalset* set);
-	icalcomponent* (*get_next_component)(icalset* set);
-	icalsetiter (*icalset_begin_component)(icalset* set,
-					 icalcomponent_kind kind, icalgauge* gauge);
-	icalcomponent* (*icalsetiter_to_next)(icalset* set, icalsetiter* i);
-	icalcomponent* (*icalsetiter_to_prior)(icalset* set, icalsetiter* i);
-};
-
-/** @brief Register a new derived class */
-int icalset_register_class(icalset *set);
-
-
-/** @brief Generic icalset constructor
- *  
- *  @param kind     The type of icalset to create
- *  @param dsn      Data Source Name - usually a pathname or DB handle
- *  @param options  Any implementation specific options
- *
- *  @return         A valid icalset reference or NULL if error.
- * 
- *  This creates any of the icalset types available.
- */
-
-icalset* icalset_new(icalset_kind kind, const char* dsn, void* options);
-
-icalset* icalset_new_file(const char* path);
-icalset* icalset_new_file_reader(const char* path);
-icalset* icalset_new_file_writer(const char* path);
-
-icalset* icalset_new_dir(const char* path);
-icalset* icalset_new_file_reader(const char* path);
-icalset* icalset_new_file_writer(const char* path);
-
-void icalset_free(icalset* set);
-
-const char* icalset_path(icalset* set);
-
-/** Mark the cluster as changed, so it will be written to disk when it
-    is freed. **/
-void icalset_mark(icalset* set);
-
-/** Write changes to disk immediately */
-icalerrorenum icalset_commit(icalset* set); 
-
-icalerrorenum icalset_add_component(icalset* set, icalcomponent* comp);
-icalerrorenum icalset_remove_component(icalset* set, icalcomponent* comp);
-
-int icalset_count_components(icalset* set,
-			     icalcomponent_kind kind);
-
-/** Restrict the component returned by icalset_first, _next to those
-    that pass the gauge. */
-icalerrorenum icalset_select(icalset* set, icalgauge* gauge);
-
-/** Clears the gauge defined by icalset_select() */
-void icalset_clear_select(icalset* set);
-
-/** Get a component by uid */
-icalcomponent* icalset_fetch(icalset* set, const char* uid);
-
-int icalset_has_uid(icalset* set, const char* uid);
-icalcomponent* icalset_fetch_match(icalset* set, icalcomponent *c);
-
-/** Modify components according to the MODIFY method of CAP. Works on
-   the currently selected components. */
-icalerrorenum icalset_modify(icalset* set, icalcomponent *oldc,
-			       icalcomponent *newc);
-
-/** Iterate through the components. If a guage has been defined, these
-   will skip over components that do not pass the gauge */
-
-icalcomponent* icalset_get_current_component(icalset* set);
-icalcomponent* icalset_get_first_component(icalset* set);
-icalcomponent* icalset_get_next_component(icalset* set);
-
-/** External Iterator with gauge - for thread safety */
-extern icalsetiter icalsetiter_null;
-
-icalsetiter icalset_begin_component(icalset* set,
-				 icalcomponent_kind kind, icalgauge* gauge);
-
-/** Default _next, _prior, _deref for subclasses that use single cluster */
-icalcomponent* icalsetiter_next(icalsetiter* i);
-icalcomponent* icalsetiter_prior(icalsetiter* i);
-icalcomponent* icalsetiter_deref(icalsetiter* i);
-
-/** for subclasses that use multiple clusters that require specialized cluster traversal */
-icalcomponent* icalsetiter_to_next(icalset* set, icalsetiter* i);
-icalcomponent* icalsetiter_to_prior(icalset* set, icalsetiter* i);
-
-#endif /* !ICALSET_H */
-
-
-
diff --git a/libical/src/libicalss/icalspanlist.c b/libical/src/libicalss/icalspanlist.c
deleted file mode 100644
index 6c366fa5ba..0000000000
--- a/libical/src/libicalss/icalspanlist.c
+++ /dev/null
@@ -1,567 +0,0 @@
-/* -*- Mode: C -*-
-    ======================================================================
-    FILE: icalspanlist.c
-    CREATOR: ebusboom 23 aug 2000
-  
-    $Id$
-    $Locker$
-    
-    (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-    
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of either: 
-    
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-    
-    Or:
-    
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
-    ======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <libical/ical.h>
-#include "icalspanlist.h"
-
-#include <stdlib.h> /* for free and malloc */
-#include <string.h>
-
-struct icalspanlist_impl {
-  pvl_list spans;		/**< list of icaltime_span data **/
-  struct icaltimetype start;    /**< start time of span **/
-  struct icaltimetype end;	/**< end time of span **/
-};
-
-/** @brief Internal comparison function for two spans
- *
- *  @param  a   a spanlist.
- *  @param  b   another spanlist.
- *
- *  @return     -1, 0, 1 depending on the comparison of the start times.
- *
- * Used to insert spans into the tree in sorted order.
- */
-
-static int compare_span(void* a, void* b)
-{
-    struct icaltime_span *span_a = (struct icaltime_span *)a ;
-    struct icaltime_span *span_b = (struct icaltime_span *)b ;
-    
-    if(span_a->start == span_b->start){
-	return 0;
-    } else if(span_a->start < span_b->start){
-	return -1;
-    }  else { /*if(span_a->start > span->b.start)*/
-	return 1;
-    }
-}
-
-
-/** @brief callback function for collecting spanlists of a
- *         series of events.
- *
- *  @param   comp  A valid icalcomponent.
- *  @param   span  The span to insert into data.
- *  @param   data  The actual spanlist to insert into
- *
- *  This callback is used by icalcomponent_foreach_recurrence()
- *  to build up a spanlist.
- */
-
-static void icalspanlist_new_callback(icalcomponent *comp,
-					    struct icaltime_span *span,
-					    void *data)
-{
-  icaltime_span *s;
-  icalspanlist *sl = (icalspanlist*) data;
-
-  if (span->is_busy == 0)
-    return;
-
-  if ((s=(icaltime_span *) malloc(sizeof(icaltime_span))) == 0) {
-    icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-    return;
-  }
-
-  /** copy span data into allocated memory.. **/
-  *s = *span;
-  pvl_insert_ordered(sl->spans, compare_span, (void*)s);
-}
-					    
-
-
-/** @brief Make a free list from a set of VEVENT components.
- *
- *  @param set    A valid icalset containing VEVENTS
- *  @param start  The free list starts at this date/time
- *  @param end    The free list ends at this date/time
- *
- *  @return        A spanlist corresponding to the VEVENTS
- *
- * Given a set of components,  a start time and an end time
- * return a spanlist that contains the free/busy times.
- */
-
-icalspanlist* icalspanlist_new(icalset *set, 
-			       struct icaltimetype start,
-			       struct icaltimetype end)
-{
-    struct icaltime_span range;
-    pvl_elem itr;
-    icalcomponent *c,*inner;
-    icalcomponent_kind kind, inner_kind;
-    icalspanlist *sl; 
-    struct icaltime_span *freetime;
-
-    if ( ( sl = (struct icalspanlist_impl*)
-	   malloc(sizeof(struct icalspanlist_impl))) == 0) {
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return 0;
-    }
-
-    sl->spans =  pvl_newlist();
-    sl->start =  start;
-    sl->end   =  end;
-
-    range.start = icaltime_as_timet(start);
-    range.end = icaltime_as_timet(end);
-
-    /* Get a list of spans of busy time from the events in the set
-       and order the spans based on the start time */
-
-   for(c = icalset_get_first_component(set);
-	c != 0;
-	c = icalset_get_next_component(set)){
-
-       kind  = icalcomponent_isa(c);
-       inner = icalcomponent_get_inner(c);
-
-       if(!inner){
-	   continue;
-       }
-
-       inner_kind = icalcomponent_isa(inner);
-
-       if( kind != ICAL_VEVENT_COMPONENT &&
-	   inner_kind != ICAL_VEVENT_COMPONENT){
-	   continue;
-       }
-       
-       icalerror_clear_errno();
-       
-       icalcomponent_foreach_recurrence(c, start, end, 
-					icalspanlist_new_callback, 
-					(void*)sl);
-       
-   }
-    
-    /* Now Fill in the free time spans. loop through the spans. if the
-       start of the range is not within the span, create a free entry
-       that runs from the start of the range to the start of the
-       span. */
-
-     for( itr = pvl_head(sl->spans);
-	 itr != 0;
-	 itr = pvl_next(itr))
-    {
-	struct icaltime_span *s = (struct icaltime_span*)pvl_data(itr);
-
-	if ((freetime=(struct icaltime_span *)
-	     malloc(sizeof(struct icaltime_span))) == 0){
-	    icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	    return 0;
-	    }
-
-	if(range.start < s->start){
-	    freetime->start = range.start; 
-	    freetime->end = s->start;
-	    
-	    freetime->is_busy = 0;
-
-
-	    pvl_insert_ordered(sl->spans,compare_span,(void*)freetime);
-	} else {
-	    free(freetime);
-	}
-	
-	range.start = s->end;
-    }
-     
-     /* If the end of the range is null, then assume that everything
-        after the last item in the calendar is open and add a span
-        that indicates this */
-
-     if( icaltime_is_null_time(end)){
-	 struct icaltime_span* last_span;
-
-	 last_span = (struct icaltime_span*)pvl_data(pvl_tail(sl->spans));
-
-	 if (last_span != 0){
-
-	     if ((freetime=(struct icaltime_span *)
-		  malloc(sizeof(struct icaltime_span))) == 0){
-		 icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-		 return 0;
-	     }	
-	
-	     freetime->is_busy = 0;
-	     freetime->start = last_span->end;
-	     freetime->end = freetime->start;
-	     pvl_insert_ordered(sl->spans,compare_span,(void*)freetime);
-	 }
-     }
-
-
-     return sl;
-}
-
-/** @brief Destructor.
- *  @param s A valid icalspanlist
- *
- *  Free memory associated with the spanlist
- */
-
-void icalspanlist_free(icalspanlist* s)
-{
-    struct icaltime_span *span;
-
-    if (s == NULL)
-      return;
-
-    while( (span=pvl_pop(s->spans)) != 0){
-	free(span);
-    }
-    
-    pvl_free(s->spans);
-    
-    s->spans = 0;
-
-    free(s);
-}
-
-
-/** @brief (Debug) print out spanlist to stdout.
- *  @param sl A valid icalspanlist.
- */
-
-void icalspanlist_dump(icalspanlist* sl){
-     int i = 0;
-     pvl_elem itr;
-
-     for( itr = pvl_head(sl->spans);
-	 itr != 0;
-	 itr = pvl_next(itr))
-    {
-	struct icaltime_span *s = (struct icaltime_span*)pvl_data(itr);
-	
-	printf("#%02d %d start: %s",++i,s->is_busy,ctime(&s->start));
-	printf("      end  : %s",ctime(&s->end));
-
-    }
-}
-
-icalcomponent* icalspanlist_make_free_list(icalspanlist* sl);
-icalcomponent* icalspanlist_make_busy_list(icalspanlist* sl);
-
-
-/** @brief Find next free time span in a spanlist.
- *
- *  @param  sl     The spanlist to search.
- *  @param  t      The time to start looking.
- *
- *  Given a spanlist and a time, find the next period of time
- *  that is free
- */
-
-struct icalperiodtype icalspanlist_next_free_time(icalspanlist* sl,
-						struct icaltimetype t)
-{
-     pvl_elem itr;
-     struct icalperiodtype period;
-     struct icaltime_span *s;
-
-     time_t rangett= icaltime_as_timet(t);
-
-     period.start = icaltime_null_time();
-     period.end = icaltime_null_time();
-
-     itr = pvl_head(sl->spans);
-     s = (struct icaltime_span *)pvl_data(itr);
-
-     if (s == 0){
-	 /* No elements in span */
-	 return period;
-     }
-
-     /* Is the reference time before the first span? If so, assume
-        that the reference time is free */
-     if(rangett <s->start ){
-	 /* End of period is start of first span if span is busy, end
-            of the span if it is free */
-	 period.start =  t;
-
-	 if (s->is_busy == 1){
-	     period.end =  icaltime_from_timet(s->start,0);
-	 } else {
-	     period.end =  icaltime_from_timet(s->end,0);
-	 }
-
-	 return period;
-     }
-
-     /* Otherwise, find the first free span that contains the
-        reference time. */
-     for( itr = pvl_head(sl->spans);
-	 itr != 0;
-	 itr = pvl_next(itr))
-    {
-	s = (struct icaltime_span *)pvl_data(itr);
-
-	if(s->is_busy == 0 && s->start >= rangett && 
-	    ( rangett < s->end || s->end == s->start)){
-
-	    if (rangett < s->start){
-		period.start = icaltime_from_timet(s->start,0);
-	    } else {
-		period.start = icaltime_from_timet(rangett,0);
-	    }
-	    
-	    period.end = icaltime_from_timet(s->end,0);
-
-	    return period;
-	}
-			
-    }
-
-     period.start = icaltime_null_time();
-     period.end = icaltime_null_time();
-
-     return period;
-}
-
-struct icalperiodtype icalspanlist_next_busy_time(icalspanlist* sl,
-						struct icaltimetype t);
-
-
-/** @brief Returns an hour-by-hour array of free/busy times over a
- *         given period.
- *
- *  @param sl        A valid icalspanlist
- *  @param delta_t   The time slice to divide by, in seconds.  Default 3600.
- *  
- *  @return A pointer to an array of integers containing the number of
- *       busy events in each delta_t time period.  The final entry 
- *       contains the value -1.
- *
- *  This calculation is somewhat tricky.  This is due to the fact that
- *  the time range contains the start time, but does not contain the
- *  end time.  To perform a proper calculation we subtract one second
- *  off the end times to get a true containing time.
- * 
- *  Also note that if you supplying a spanlist that does not start or
- *  end on a time boundary divisible by delta_t you may get results
- *  that are not quite what you expect.
- */
-
-int* icalspanlist_as_freebusy_matrix(icalspanlist* sl, int delta_t) {
-  pvl_elem itr;
-  int spanduration_secs;
-  int *matrix;
-  int matrix_slots;
-  time_t sl_start, sl_end;
-
-  icalerror_check_arg_rz( (sl!=0), "spanlist");
-
-  if (!delta_t)
-    delta_t = 3600;
-
-  /** calculate the start and end time as time_t **/
-  sl_start = icaltime_as_timet_with_zone(sl->start, icaltimezone_get_utc_timezone());
-  sl_end   = icaltime_as_timet_with_zone(sl->end, icaltimezone_get_utc_timezone());
-
-
-  /** insure that the time period falls on a time boundary divisable
-      by delta_t */
-
-  sl_start /= delta_t;
-  sl_start *= delta_t;
-
-  sl_end /= delta_t;
-  sl_end *= delta_t;
-
-
-  /** find the duration of this spanlist **/
-  spanduration_secs = sl_end - sl_start;
-
-
-  /** malloc our matrix, add one extra slot for a final -1 **/
-  matrix_slots = spanduration_secs/delta_t + 1;
-
-  matrix = (int*) malloc(sizeof(int) * matrix_slots);
-  if (matrix == NULL) {
-    icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-    return NULL;
-  }
-  memset(matrix, 0, sizeof(int) * matrix_slots);
-  matrix[matrix_slots-1] = -1;
-
-  /* loop through each span and mark the slots in the array */
-
-  for( itr = pvl_head(sl->spans);  itr != 0;  itr = pvl_next(itr)) {
-    struct icaltime_span *s = (struct icaltime_span*)pvl_data(itr);
-    
-    if (s->is_busy == 1) {
-      int offset_start = s->start/delta_t - sl_start/delta_t;
-      int offset_end   = (s->end - 1) /delta_t  - sl_start/delta_t + 1;
-      int i;
-      
-      if (offset_end >= matrix_slots)
-	offset_end = matrix_slots - 1;
-
-      i = offset_start;
-      for (i=offset_start; i < offset_end; i++) {
-	matrix[i]++;
-      }
-    }
-  }
-  return matrix;
-}
-    
-
-/** @brief Return a VFREEBUSY component for the corresponding spanlist
- *
- *   @param sl         A valid icalspanlist, from icalspanlist_new()
- *   @param organizer  The organizer specified as MAILTO:user@domain
- *   @param attendee   The attendee specified as MAILTO:user@domain
- *
- *   @return            A valid icalcomponent or NULL.
- *
- * This function returns a VFREEBUSY component for the given spanlist.
- * The start time is mapped to DTSTART, the end time to DTEND.
- * Each busy span is represented as a separate FREEBUSY entry.
- * An attendee parameter is required, and organizer parameter is
- * optional.
- */
-
-icalcomponent *icalspanlist_as_vfreebusy(icalspanlist* sl,
-					 const char* organizer,
-					 const char* attendee) {
-  icalcomponent *comp;
-  icalproperty *p;
-  struct icaltimetype atime = icaltime_from_timet( time(0),0);
-  pvl_elem itr;
-  icaltimezone *utc_zone;
-  icalparameter *param;
-
-  if (!attendee) {
-    icalerror_set_errno(ICAL_USAGE_ERROR);
-    return 0;
-  }
-
-  utc_zone = icaltimezone_get_utc_timezone ();
-
-  comp = icalcomponent_new_vfreebusy();
-  
-  icalcomponent_add_property(comp, icalproperty_new_dtstart(sl->start));
-  icalcomponent_add_property(comp, icalproperty_new_dtend(sl->end));
-  icalcomponent_add_property(comp, icalproperty_new_dtstamp(atime));
-
-  if (organizer) {
-    icalcomponent_add_property(comp, icalproperty_new_organizer(organizer));
-  }
-  icalcomponent_add_property(comp, icalproperty_new_attendee(attendee));
-
-  /* now add the freebusy sections.. */
-
-  for( itr = pvl_head(sl->spans);  itr != 0;  itr = pvl_next(itr)) {
-    struct icalperiodtype period;
-    struct icaltime_span *s = (struct icaltime_span*)pvl_data(itr);
-
-    if (s->is_busy == 1) {
-
-      period.start = icaltime_from_timet_with_zone (s->start, 0, utc_zone);
-      period.end   = icaltime_from_timet_with_zone (s->end, 0, utc_zone);
-      period.duration = icaldurationtype_null_duration();
-
-
-      p = icalproperty_new_freebusy(period);
-      param = icalparameter_new_fbtype(ICAL_FBTYPE_BUSY);
-      icalproperty_add_parameter(p, param);
-
-      icalcomponent_add_property(comp, p);
-    }
-    
-  }
-
-  return comp;
-}
-
-
-/** @brief Return a spanlist corresponding to the VFREEBUSY portion of
- *         an icalcomponent.
- *
- *   @param   c        A valid icalcomponent.
- *
- *   @return           A valid icalspanlist or NULL if no VFREEBUSY section.
- *
- */
-
-
-icalspanlist *icalspanlist_from_vfreebusy(icalcomponent* comp)
-{
-  icalcomponent *inner;
-  icalproperty  *prop;
-  icalspanlist  *sl;
-
-  icalerror_check_arg_rz((comp != NULL), "comp");
-  
-  inner = icalcomponent_get_inner(comp);
-  if (!inner) return NULL;
-
-  if ( ( sl = (icalspanlist*) malloc(sizeof(icalspanlist))) == 0) {
-    icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-    return 0;
-  }
-  sl->spans =  pvl_newlist();
-
-  /* cycle through each FREEBUSY property, adding to the spanlist */
-  for (prop = icalcomponent_get_first_property(inner, ICAL_FREEBUSY_PROPERTY);
-       prop != NULL;
-       prop = icalcomponent_get_next_property(inner, ICAL_FREEBUSY_PROPERTY)) {
-    icaltime_span *s = (icaltime_span *) malloc(sizeof(icaltime_span));
-    icalparameter *param;
-    struct icalperiodtype period;
-    icalparameter_fbtype fbtype;
-
-    if (s == 0) {
-      icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-      return 0;
-    }
-    
-    param = icalproperty_get_first_parameter(prop, ICAL_FBTYPE_PARAMETER);
-    fbtype = (param) ? icalparameter_get_fbtype(param) : ICAL_FBTYPE_BUSY;
-
-    switch (fbtype) {
-    case ICAL_FBTYPE_FREE:
-    case ICAL_FBTYPE_NONE:
-    case ICAL_FBTYPE_X:
-      s->is_busy = 1;
-    default:
-      s->is_busy = 0;
-    }
-    
-    period = icalproperty_get_freebusy(prop);
-    s->start = icaltime_as_timet_with_zone(period.start, icaltimezone_get_utc_timezone());
-    s->end = icaltime_as_timet_with_zone(period.end, icaltimezone_get_utc_timezone());
-;
-    pvl_insert_ordered(sl->spans, compare_span, (void*)s);
-  }
-  /** @todo calculate start/end limits.. fill in holes? **/
-  return sl;
-}
diff --git a/libical/src/libicalss/icalspanlist.h b/libical/src/libicalss/icalspanlist.h
deleted file mode 100644
index 084cb9afeb..0000000000
--- a/libical/src/libicalss/icalspanlist.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalspanlist.h
- CREATOR: eric 21 Aug 2000
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
- =========================================================================*/
-#ifndef ICALSPANLIST_H
-#define ICALSPANLIST_H
-
-#include <libical/ical.h>
-#include <libicalss/icalset.h>
-
-/** @file icalspanlist.h
- *  @brief Code that supports collections of free/busy spans of time
- */
-
-typedef struct icalspanlist_impl icalspanlist;
-
-
-/** @brief Constructor
- * Make a free list from a set of component. Start and end should be in UTC 
- */
-
-icalspanlist* icalspanlist_new(icalset *set, 
-				struct icaltimetype start,
-				struct icaltimetype end);
-
-/** @brief Destructor
- */
-void icalspanlist_free(icalspanlist* spl);
-
-/* Unimplemented functions */
-icalcomponent* icalspanlist_make_free_list(icalspanlist* sl);
-icalcomponent* icalspanlist_make_busy_list(icalspanlist* sl);
-
-/** Get first next free time after time t. all times are in UTC. */
-struct icalperiodtype icalspanlist_next_free_time(icalspanlist* sl,
-						struct icaltimetype t);
-/** Get first next busy time after time t. all times are in UTC. */
-struct icalperiodtype icalspanlist_next_busy_time(icalspanlist* sl,
-						struct icaltimetype t);
-
-void icalspanlist_dump(icalspanlist* s);
-
-/** @brief Return a valid VFREEBUSY component for this span */
-icalcomponent *icalspanlist_as_vfreebusy(icalspanlist* s_in,
-					 const char* organizer,
-					 const char* attendee);
-
-/** @brief Return an integer matrix of total events per delta_t timespan */
-int *icalspanlist_as_freebusy_matrix(icalspanlist* span, int delta_t);
-
-/** @brief Construct an icalspanlist from a VFREEBUSY component */
-icalspanlist *icalspanlist_from_vfreebusy(icalcomponent* c);
-
-#endif
-				    
-
-
diff --git a/libical/src/libicalss/icalspanlist_cxx.cpp b/libical/src/libicalss/icalspanlist_cxx.cpp
deleted file mode 100644
index 38761af4c6..0000000000
--- a/libical/src/libicalss/icalspanlist_cxx.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-#include "icalspanlist_cxx.h"
-#include <exception>
-
-/** @brief Construct an ICalSpanList from an icalset
-    @param set     The icalset containing the VEVENTS
-    @param start   Designated start of the spanlist
-    @param end     Designated end of the spanlist
-*/
-
-ICalSpanList::ICalSpanList(icalset *set, icaltimetype start, icaltimetype end) throw(icalerrorenum)
-{
-  data = icalspanlist_new(set, start, end);
-  if (!data) throw icalerrno;
-};
-
-
-/** @brief Constructor
-    @param comp  A valid icalcomponent with a VFREEBUSY section
-*/
-
-ICalSpanList::ICalSpanList(icalcomponent *comp) throw(icalerrorenum)
-{
-  data = icalspanlist_from_vfreebusy(comp);
-  if (!data) throw icalerrno;
-}
-
-/** @brief Constructor
-    @param comp  A valid VComponent with a VFREEBUSY section
-*/
-ICalSpanList::ICalSpanList(VComponent &comp) throw(icalerrorenum)
-{
-  data = icalspanlist_from_vfreebusy((icalcomponent*) comp);
-  if (!data) throw icalerrno;
-}
-
-/** Destructor */
-ICalSpanList::~ICalSpanList() {
-  if (data)
-    icalspanlist_free(data);
-}
-
-
-/**
- * @brief Returns a VFREEBUSY component for the object.
- *
- * @see icalspanlist_as_vfreebusy()
- */
-
-VComponent*
-ICalSpanList::get_vfreebusy(const char *organizer, const char *attendee) throw(icalerrorenum)
-{
-  icalcomponent *comp;
-  VComponent    *vcomp;
-
-  comp = icalspanlist_as_vfreebusy(data, organizer, attendee);
-  if (comp == 0) throw icalerrno;
-    
-  vcomp = new VComponent(comp);
-  if (vcomp == 0) throw icalerrno;
-
-  return vcomp;
-}
-
-
-/**
- * @brief Returns a summary of events over delta_t
- *
- * @param delta_t    Number of seconds to divide the spanlist time period
- *                   into.
- *
- * This method calculates the total number of events in each time slot
- * of delta_t seconds.
- *
- * @see icalspanlist_as_freebusy_matrix()
- */
-
-std::vector<int> ICalSpanList::as_vector(int delta_t) throw(icalerrorenum)
-{
-  int *matrix;
-  int i = 0;
-  std::vector<int> event_vec;
-
-  matrix = icalspanlist_as_freebusy_matrix(data, delta_t);
-
-  if (!matrix) throw ICAL_USAGE_ERROR;
-
-  while (matrix[i] != -1) {
-    event_vec.push_back(matrix[i]); // Add item at end of vector
-  }
-  
-  return(event_vec);
-}
diff --git a/libical/src/libicalss/icalspanlist_cxx.h b/libical/src/libicalss/icalspanlist_cxx.h
deleted file mode 100644
index cf81f13003..0000000000
--- a/libical/src/libicalss/icalspanlist_cxx.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++ -*- */
-
-/**
- * @file     icalspanlist_cxx.h
- * @author   Critical Path
- * @brief    C++ class wrapping the icalspanlist data structure
- *
- * This class wraps the icalspanlist routines in libicalss
- *
- * Errors within libicalss are propagated via exceptions of type
- * icalerrorenum.  See icalerror.h for the complete list of exceptions
- * that might be thrown.
- */
-
-#ifndef ICALSPANLIST_CXX_H
-#define ICALSPANLIST_CXX_H
-
-#include <libical/ical.h>
-#include <libicalss/icalss.h>
-#include "vcomponent.h"
-#include <vector>		/* For as_matrix.. */
-
-class ICalSpanList {
- public:
-  /** Construct an ICalSpanList from an icalset */
-  ICalSpanList(icalset *set, icaltimetype start, icaltimetype end) throw(icalerrorenum);
-
-  /** Construct an ICalSpanList from the VFREEBUSY chunk of a icalcomponent */
-  ICalSpanList(icalcomponent *comp) throw(icalerrorenum);
-
-  /** Construct an ICalSpanList from the VFREEBUSY chunk of a vcomponent */
-  ICalSpanList(VComponent &comp) throw(icalerrorenum);
-
-  /** Destructor */
-  ~ICalSpanList();
-
-  /** Return a VFREEBUSY icalcomponent */
-  VComponent* get_vfreebusy(const char *organizer, const char *attendee) throw(icalerrorenum);
-
-  /** Return the base data when casting */
-  operator icalspanlist*()    {return data;}
-
-  /** Return a vector of the number of events over delta t */
-  std::vector<int> as_vector(int delta_t) throw(icalerrorenum);
-
-  /** Dump the spanlist to stdout */
-  void dump()                 {icalspanlist_dump(data);}
-
- private:
-  icalspanlist *data;
-};
-
-#endif
diff --git a/libical/src/libicalss/icalss.h b/libical/src/libicalss/icalss.h
deleted file mode 100644
index f2e543a260..0000000000
--- a/libical/src/libicalss/icalss.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <libicalss/icalgauge.h>
-#include <libicalss/icalcluster.h>
-#include <libicalss/icalfileset.h>
-#include <libicalss/icaldirset.h>
-#include <libicalss/icalcalendar.h>
-#include <libicalss/icalclassify.h>
-#include <libicalss/icalspanlist.h>
-#include <libicalss/icalmessage.h>
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
diff --git a/libical/src/libicalss/icalsslexer.l b/libical/src/libicalss/icalsslexer.l
deleted file mode 100644
index b6bc4dee05..0000000000
--- a/libical/src/libicalss/icalsslexer.l
+++ /dev/null
@@ -1,134 +0,0 @@
-%{
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalsslexer.l
-  CREATOR: eric 8 Aug 2000
-  
-  DESCRIPTION:
-  
-  $Id: icalsslexer.l,v 1.5 2003/10/21 18:28:18 ettore Exp $
-  $Locker:  $
-
-(C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-  ======================================================================*/
-
-#include "icalssyacc.h"
-#include "icalgaugeimpl.h"
-#include "assert.h"
-
-#include <string.h> /* For strdup() */
-
-const char* input_buffer;
-const char* input_buffer_p;
-
-#define min(a,b) ((a) < (b) ? (a) : (b))   
-
-int icalss_input(char* buf, int max_size)
-{
-    int n = min(max_size,strlen(input_buffer_p));
-
-    if (n > 0){
-	memcpy(buf, input_buffer_p, n);
-	input_buffer_p += n;
-	return n;
-    } else {
-	return 0;
-    }
-}
-
-#undef YY_INPUT
-#define YY_INPUT(b,r,ms) ( r= icalss_input(b,ms))
-
-#undef SS_FATAL_ERROR
-#define SS_FATAL_ERROR(msg) sserror(msg)
-
-%}
-
-crlf		\x0D?\x0A
-space		[ ]
-qsafechar	[^\x00-\x1F\"]
-safechar	[^\x00-\x1F\"\:\;\,]
-tsafechar	[\x20-\x21\x23-\x2B\x2D-\x39\x3C-\x5B\x5D-\x7E]
-valuechar	[^\x00-\x08\x10-\x1F]
-xname		X-[a-zA-Z0-9\-]+
-xname2          [a-zA-Z0-9\-\ ]
-paramtext	{safechar}+
-value		{valuechar}+
-quotedstring	\"{qsafechar}+\"
-digit		[0-9]
-
-%array /* Make yytext an array. Slow, but handy. HACK */
-
-%option caseless
-
-%s sql string_value
-
-
-
-%%
-
-%{
-%}
-
-
-SELECT			{ return SELECT; }
-FROM			{ return FROM; }
-WHERE			{ return WHERE; }
-,			{ return COMMA; }
-"="  			{ return EQUALS; }
-"=="  			{ return EQUALS; }
-"!=" 			{ return NOTEQUALS; }
-"<"  			{ return LESS; }
-">"  			{ return GREATER; }
-"<=" 			{ return LESSEQUALS; }
-">=" 			{ return GREATEREQUALS; }
-AND 			{ return AND; }
-OR			{ return OR; }
-IS			{ return IS; }
-NOT			{ return NOT; }
-NULL			{ return SQLNULL; }
-\'                      { return QUOTE; }
-[ \t\n\r]+ ;			
-;			{ return EOL; }
-
-\'[\@\*A-Za-z0-9\-\.\:\ ]+\' {
-	int c = input();
-	unput(c);
-	if(c!='\''){
-		sslval.v_string= icalmemory_tmp_copy(yytext);
-		return STRING;
-	} else {
-		/*ssmore();*/
-	}
-}
-
-[\@\*A-Za-z0-9\-\.]+ {
-        sslval.v_string= icalmemory_tmp_copy(yytext);
-	return STRING; 
-}
-
-
-.			{ return yytext[0]; }
-
-%% 
-
-int yywrap()
-{
-     return 1;
-}
-
diff --git a/libical/src/libicalss/icalssutil.c b/libical/src/libicalss/icalssutil.c
deleted file mode 100644
index 8db141d41d..0000000000
--- a/libical/src/libicalss/icalssutil.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C -*-
-    ======================================================================
-    FILE: icalssutil.c
-    CREATOR: ebusboom 23 aug 2000
-  
-    $Id$
-    $Locker$
-    
-    (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-    
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of either: 
-    
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-    
-    Or:
-    
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
-    ======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-
diff --git a/libical/src/libicalss/icalssutil.h b/libical/src/libicalss/icalssutil.h
deleted file mode 100644
index 22be0202b1..0000000000
--- a/libical/src/libicalss/icalssutil.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C -*- */
-/*======================================================================
- FILE: icalssutil.h
- CREATOR: eric 21 Aug 2000
-
-
- $Id$
- $Locker$
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-
- =========================================================================*/
-
-#include <libical/ical.h>
-
diff --git a/libical/src/libicalss/icalssyacc.h b/libical/src/libicalss/icalssyacc.h
deleted file mode 100644
index 192f4f76b5..0000000000
--- a/libical/src/libicalss/icalssyacc.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef BISON_Y_TAB_H
-# define BISON_Y_TAB_H
-
-#ifndef YYSTYPE
-typedef union {
-	char* v_string;
-} yystype;
-# define YYSTYPE yystype
-# define YYSTYPE_IS_TRIVIAL 1
-#endif
-# define	STRING	257
-# define	SELECT	258
-# define	FROM	259
-# define	WHERE	260
-# define	COMMA	261
-# define	QUOTE	262
-# define	EQUALS	263
-# define	NOTEQUALS	264
-# define	LESS	265
-# define	GREATER	266
-# define	LESSEQUALS	267
-# define	GREATEREQUALS	268
-# define	AND	269
-# define	OR	270
-# define	EOL	271
-# define	END	272
-# define	IS	273
-# define	NOT	274
-# define	SQLNULL	275
-
-
-extern YYSTYPE sslval;
-
-#endif /* not BISON_Y_TAB_H */
diff --git a/libical/src/libicalss/icalssyacc.y b/libical/src/libicalss/icalssyacc.y
deleted file mode 100644
index 101adc8383..0000000000
--- a/libical/src/libicalss/icalssyacc.y
+++ /dev/null
@@ -1,249 +0,0 @@
-%{
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icalssyacc.y
-  CREATOR: eric 08 Aug 2000
-  
-  DESCRIPTION:
-  
-  $Id: icalssyacc.y,v 1.4 2003/10/21 18:28:18 ettore Exp $
-  $Locker:  $
-
-(C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-  ======================================================================*/
-/*#define YYDEBUG 1*/
-#include <stdlib.h>
-#include <string.h> /* for strdup() */
-#include <limits.h> /* for SHRT_MAX*/
-#include <libical/ical.h>
-#include "icalgauge.h"
-#include "icalgaugeimpl.h"
-
-extern struct icalgauge_impl *icalss_yy_gauge;
-
-#define YYPARSE_PARAM yy_globals
-#define YYLEX_PARAM yy_globals
-#define YY_EXTRA_TYPE  icalgauge_impl*
-
-
-static void ssyacc_add_where(struct icalgauge_impl* impl, char* prop, 
-			icalgaugecompare compare , char* value);
-static void ssyacc_add_select(struct icalgauge_impl* impl, char* str1);
-static void ssyacc_add_from(struct icalgauge_impl* impl, char* str1);
-static void set_logic(struct icalgauge_impl* impl,icalgaugelogic l);
-void sserror(char *s); /* Don't know why I need this.... */
-
-%}
-
-%union {
-	char* v_string;
-}
-
-
-%token <v_string> STRING
-%token SELECT FROM WHERE COMMA QUOTE EQUALS NOTEQUALS  LESS GREATER LESSEQUALS
-%token GREATEREQUALS AND OR EOL END IS NOT SQLNULL
-
-%%
-
-query_min: SELECT select_list FROM from_list WHERE where_list
-	   | SELECT select_list FROM from_list
-	   | error { 
-                 yyclearin;
-		 YYABORT;
-           }	
-	   ;	
-
-select_list:
-	STRING {ssyacc_add_select(icalss_yy_gauge,$1);}
-	| select_list COMMA STRING {ssyacc_add_select(icalss_yy_gauge,$3);}
-	;
-
-
-from_list:
-	STRING {ssyacc_add_from(icalss_yy_gauge,$1);}
-	| from_list COMMA STRING {ssyacc_add_from(icalss_yy_gauge,$3);}
-	;
-
-where_clause:
-	/* Empty */
-	| STRING EQUALS STRING {ssyacc_add_where(icalss_yy_gauge,$1,ICALGAUGECOMPARE_EQUAL,$3); }
-	| STRING IS SQLNULL {ssyacc_add_where(icalss_yy_gauge,$1,ICALGAUGECOMPARE_ISNULL,""); }
-	| STRING IS NOT SQLNULL {ssyacc_add_where(icalss_yy_gauge,$1,ICALGAUGECOMPARE_ISNOTNULL,""); }
-	| STRING NOTEQUALS STRING {ssyacc_add_where(icalss_yy_gauge,$1,ICALGAUGECOMPARE_NOTEQUAL,$3); }
-	| STRING LESS STRING {ssyacc_add_where(icalss_yy_gauge,$1,ICALGAUGECOMPARE_LESS,$3); }
-	| STRING GREATER STRING {ssyacc_add_where(icalss_yy_gauge,$1,ICALGAUGECOMPARE_GREATER,$3); }
-	| STRING LESSEQUALS STRING {ssyacc_add_where(icalss_yy_gauge,$1,ICALGAUGECOMPARE_LESSEQUAL,$3); }
-	| STRING GREATEREQUALS STRING {ssyacc_add_where(icalss_yy_gauge,$1,ICALGAUGECOMPARE_GREATEREQUAL,$3); }
-	;
-
-where_list:
-	where_clause {set_logic(icalss_yy_gauge,ICALGAUGELOGIC_NONE);}
-	| where_list AND where_clause {set_logic(icalss_yy_gauge,ICALGAUGELOGIC_AND);} 
-	| where_list OR where_clause {set_logic(icalss_yy_gauge,ICALGAUGELOGIC_OR);}
-	;
-
-
-%%
-
-static void ssyacc_add_where(struct icalgauge_impl* impl, char* str1, 
-	icalgaugecompare compare , char* value_str)
-{
-
-    struct icalgauge_where *where;
-    char *compstr, *propstr, *c, *s,*l;
-    
-    if ( (where = malloc(sizeof(struct icalgauge_where))) ==0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return;
-    }
-
-    memset(where,0,sizeof(struct icalgauge_where));
-    where->logic = ICALGAUGELOGIC_NONE;
-    where->compare = ICALGAUGECOMPARE_NONE;
-    where->comp = ICAL_NO_COMPONENT;
-    where->prop = ICAL_NO_PROPERTY;
-
-    /* remove enclosing quotes */
-    s = value_str;
-    if(*s == '\''){
-	s++;
-    }
-    l = s+strlen(s)-1;
-    if(*l == '\''){
-	*l=0;
-    }
-	
-    where->value = strdup(s);
-
-    /* Is there a period in str1 ? If so, the string specified both a
-       component and a property*/
-    if( (c = strrchr(str1,'.')) != 0){
-	compstr = str1;
-	propstr = c+1;
-	*c = '\0';
-    } else {
-	compstr = 0;
-	propstr = str1;
-    }
-
-
-    /* Handle the case where a component was specified */
-    if(compstr != 0){
-	where->comp = icalenum_string_to_component_kind(compstr);
-    } else {
-	where->comp = ICAL_NO_COMPONENT;
-    }
-
-    where->prop = icalenum_string_to_property_kind(propstr);    
-
-    where->compare = compare;
-
-    if(where->value == 0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	free(where->value);
-	return;
-    }
-
-    pvl_push(impl->where,where);
-}
-
-static void set_logic(struct icalgauge_impl* impl,icalgaugelogic l)
-{
-    pvl_elem e = pvl_tail(impl->where);
-    struct icalgauge_where *where = pvl_data(e);
-
-    where->logic = l;
-   
-}
-
-
-
-static void ssyacc_add_select(struct icalgauge_impl* impl, char* str1)
-{
-    char *c, *compstr, *propstr;
-    struct icalgauge_where *where;
-    
-    /* Uses only the prop and comp fields of the where structure */
-    if ( (where = malloc(sizeof(struct icalgauge_where))) ==0){
-	icalerror_set_errno(ICAL_NEWFAILED_ERROR);
-	return;
-    }
-
-    memset(where,0,sizeof(struct icalgauge_where));
-    where->logic = ICALGAUGELOGIC_NONE;
-    where->compare = ICALGAUGECOMPARE_NONE;
-    where->comp = ICAL_NO_COMPONENT;
-    where->prop = ICAL_NO_PROPERTY;
-
-    /* Is there a period in str1 ? If so, the string specified both a
-       component and a property*/
-    if( (c = strrchr(str1,'.')) != 0){
-	compstr = str1;
-	propstr = c+1;
-	*c = '\0';
-    } else {
-	compstr = 0;
-	propstr = str1;
-    }
-
-
-    /* Handle the case where a component was specified */
-    if(compstr != 0){
-	where->comp = icalenum_string_to_component_kind(compstr);
-    } else {
-	where->comp = ICAL_NO_COMPONENT;
-    }
-
-
-    /* If the property was '*', then accept all properties */
-    if(strcmp("*",propstr) == 0) {
-	where->prop = ICAL_ANY_PROPERTY; 	    
-    } else {
-	where->prop = icalenum_string_to_property_kind(propstr);    
-    }
-    
-
-    if(where->prop == ICAL_NO_PROPERTY){
-      free(where);
-      icalerror_set_errno(ICAL_BADARG_ERROR);
-      return;
-    }
-
-    pvl_push(impl->select,where);
-}
-
-static void ssyacc_add_from(struct icalgauge_impl* impl, char* str1)
-{
-    icalcomponent_kind ckind;
-
-    ckind = icalenum_string_to_component_kind(str1);
-
-    if(ckind == ICAL_NO_COMPONENT){
-	assert(0);
-    }
-
-    pvl_push(impl->from,(void*)ckind);
-
-}
-
-
-void sserror(char *s){
-  fprintf(stderr,"Parse error \'%s\'\n", s);
-  icalerror_set_errno(ICAL_MALFORMEDDATA_ERROR);
-}
diff --git a/libical/src/libicalvcal/.cvsignore b/libical/src/libicalvcal/.cvsignore
deleted file mode 100644
index 6e5ca7ed41..0000000000
--- a/libical/src/libicalvcal/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-Makefile
-Makefile.in
-.deps
-.libs
-*.lo
-*.la
diff --git a/libical/src/libicalvcal/Makefile.am b/libical/src/libicalvcal/Makefile.am
deleted file mode 100644
index b57a020049..0000000000
--- a/libical/src/libicalvcal/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-noinst_LTLIBRARIES = libicalvcal-evolution.la
-
-INCLUDES =			\
-	-I$(top_srcdir)		\
-	-I$(top_srcdir)/src
-
-libicalvcal_evolution_la_LDFLAGS = -version-info 0:0:0
-
-if DEV
-libicalvcal_evolution_la_DEVSOURCES = vcc.y
-else
-libicalvcal_evolution_la_DEVSOURCES = vcc.c
-endif
-
-
-libicalvcal_evolution_la_SOURCES =	\
-	icalvcal.h		\
-	icalvcal.c		\
-	port.h			\
-	vcc.h			\
-	vobject.h		\
-	vobject.c		\
-	vcaltmp.h		\
-	vcaltmp.c		\
-	$(libicalvcal_evolution_la_DEVSOURCES)
-
-libicalvcal_evolutionincludedir = $(privincludedir)/libical
-
-libicalvcal_evolutioninclude_HEADERS =	\
-	icalvcal.h		\
-	port.h			\
-	vcc.h			\
-	vobject.h		\
-	vcaltmp.h
-
-EXTRA_DIST =		\
-	README.TXT	\
-	vcaltest.c	\
-	vctest.c
diff --git a/libical/src/libicalvcal/README.TXT b/libical/src/libicalvcal/README.TXT
deleted file mode 100644
index c8ce8b0979..0000000000
--- a/libical/src/libicalvcal/README.TXT
+++ /dev/null
@@ -1,951 +0,0 @@
-NOTE: If you used the earlier APIs released by Versit

-then you will want to look at the document "migrate.doc"

-included with this package. It contains a discussion of

-the differences between the old API and this one.

-

-----------------------------------------------------------------

-

-The vCard/vCalendar C interface is implemented in the set 

-of files as follows:

-

-vcc.y, yacc source, and vcc.c, the yacc output you will use

-implements the core parser

-

-vobject.c implements an API that insulates the caller from

-the parser and changes in the vCard/vCalendar BNF

-

-port.h defines compilation environment dependent stuff

-

-vcc.h and vobject.h are header files for their .c counterparts

-

-vcaltmp.h and vcaltmp.c implement vCalendar "macro" functions

-which you may find useful.

-

-test.c is a standalone test driver that exercises some of

-the features of the APIs provided. Invoke test.exe on a

-VCARD/VCALENDAR input text file and you will see the pretty

-print output of the internal representation (this pretty print

-output should give you a good idea of how the internal 

-representation looks like -- there is one such output in the 

-following too). Also, a file with the .out suffix is generated 

-to show that the internal representation can be written back 

-in the original text format.

-

------------------------------------------------------------------

-			

-			  

-				VObject for VCard/VCalendar

-

-Table of Contents

-=================

-1. VObject

-2. Internal Representations of VCard/VCalendar

-3. Iterating Through VObject's Properties or Values

-4. Pretty Printing a VObject Tree

-5. Building A VObject Representation of A VCard/VCalendar

-6. Converting A VObject Representation Into Its Textual Representation

-7. Miscellaneous Notes On VObject APIs usages

-8. Brief descriptions of each APIs

-9. Additional Programming Notes.

-

-This document is mainly about the VObject and its APIs. The main

-use of a VObject is to represent a VCard or a VCalendar inside

-a program. However, its use is not limited to aforemention as it

-can represent an arbitrary information that makes up of a tree or

-forest of properties/values.

-

-1. VObject

-   =======

-A VObject can have a name (id) and a list of associated properties and

-a value. Each property is itself a VObject.

-

-2. Internal Representations of VCard/VCalendar

-   ===========================================

-A list of VCard or a VCalendar is represented by a list of VObjects.

-The name (id) of the VObjects in the list is either VCCardProp or

-VCCalProp. Each of these VObjects can have a list of properties.

-Since a property is represented as a VObject, each of these properties

-can have a name, a list of properties, and a value.

-

-For example, the input file "vobject.vcf":

-	

-BEGIN:VCARD

-N:Alden;Roland

-FN:Roland H. Alden

-ORG:AT&T;Versit Project Office

-TITLE:Consultant

-EMAIL;WORK;PREF;INTERNET:sf!rincon!ralden@alden.attmail.com

-EMAIL;INTERNET:ralden@sfgate.com

-EMAIL;MCIMail:242-2200

-LABEL;DOM;POSTAL;PARCEL;HOME;WORK;QUOTED-PRINTABLE:Roland H. Alden=0A=

-Suite 2208=0A=

-One Pine Street=0A=

-San Francisco, CA 94111

-LABEL;POSTAL;PARCEL;HOME;WORK;QUOTED-PRINTABLE:Roland H. Alden=0A=

-Suite 2208=0A=

-One Pine Street=0A=

-San Francisco, CA 94111=0A=

-U.S.A.

-TEL;WORK;PREF;MSG:+1 415 296 9106

-TEL;WORK;FAX:+1 415 296 9016

-TEL;MSG;CELL:+1 415 608 5981

-ADR:;Suite 2208;One Pine Street;San Francisco;CA;94111;U.S.A.

-SOUND:ROW-LAND H ALL-DIN

-LOGO;GIF;BASE64:

-    R0lGODdhpgBOAMQAAP///+/v797e3s7Ozr29va2trZycnIyMjHt7e2NjY1JSUkJC

-    QjExMSEhIRAQEO///87v9973/73n95zW71K13jGl1nvG50Kt3iGc1gCMzq3e94zO

-    7xCU1nO952O15wAAACwAAAAApgBOAAAF/yAgjmRpnmiqrmzrvnAsz3Rt33iu73zv

-    /8CgcEj8QTaeywWTyWCUno2kSK0KI5tLc8vtNi+WiHVMlj0mFK96nalsxOW4fPSw

-    cNj4tQc+7xcjGh4WExJTJYUTFkp3eU0eEH6RkpOUlTARhRoWm5ydFpCWoS0QEqAu

-    ARKaHRcVjV0borEoFl0cSre4Sq67FA+yvwAeTU8XHZ7HmxS6u2wVfMCVpAE3pJoW

-    ylrMptDcOqSF4OHg3eQ5pInInb7lcc86mNbLzBXsZbRfUOn6ucyNHvVWJHCpQFDf

-    MWwEEzLqx2YCQCqF3OnItClJNmYcJD7cSAKTuI/gtnEcOQKkyVIk6/+ds5CkFcMM

-    61LiENikwi1jBnNyuvUSjwWZOS5uIZarqNFcNl32XMMB6I06GgoJ+bZp1ZKeDl8E

-    +MC1K1cBIhZ4HUu2LAsCZdOWRQDt20lxIlccSHsgrNq7Xc/ixcsWmNu34WKyYJCW

-    gQjCe9XqTZy2L4pv04gg2sSKSc8OLgTcBSuWsdkVaD2TdXyiQxebFyjo1Gnx6tJm

-    LuaqrdtZtNfFtruSNmF5IKujwIsmJbjwtRqNJhrcNVw79wcRAgogmE4ArIjQzj/s

-    JvHAGCFDQR4UqigPK4sBe62XwO51OwADiMcqUG+iOdcFAL+hW20BfAoEexlwAnu6

-    mZDAXQ1EVh//WfhxJB5gIbHgwFgOTOiVAgOuVQKAfKFg3weGwSBYFZMp4hpDGKyA

-    3lgJKECWgiMQyBVpW+0V4oJjNfhCNkR1IgWEb21QlRK9GdfFCgeOZYBsXgm4noYj

-    GEBhAQHYh0J8XenoQnFGdrkUciJY6FUAK15ogozakcBhliKsyZWHDMZQ0wWC/Aim

-    DB6h01KRr/lXQgFxAqDcWDACgCZpUnrVQJtjwTnWjS6MWAYqqfDnSaEkJOlVXQBo

-    2pWTMUJ53WgAuPncCR9q6VQMAYjZlXWJmknCoSUM2p4BC+SaKwG88hoZlvfFMM4f

-    hQh5TXkv+RklWYtC91mopJIAKFkJlDAW/wF25ShnLbeo5gmQ+1FGkJdrKCuCi2OR

-    BuwHBcwqKgABrMtVAgpem61XkLbAJ7n8uiIpvGVhO4KpH1QLbbpqLheZvQCkGoNL

-    thSzSTg2UGVBBzbtaxwKsYrmgLvRAlCmWgwMAADD66rKAgR3XlGspcdkZYK8ibU7

-    asgEl+XAyB8I7PCqMWiWncGGimpfAgO4ypXSPpOVLwsRCDJxRD2AoyeRRv5kApO5

-    fXwzwvfOKLKtaTWtbQxccmGLTZy8xYlVSvXbhbk0M2YzrYfJJ0K8m+V9NgxpyC04

-    UycI/aiuiH9Y8NftDUwWp1Wm5UABnAUKwwRsPFGBt4Oc9PZvGvNLwf8JOZt8Arpe

-    eY23yDovwIDiBX74NAsPVLDJj3Hh4JEExsKcjrlKf9DsCVx3ZfLqAKBuG1s/A90C

-    z2KjYHjjyPOdG1spz6BBUr+BcUxUb1nDCTa/VZD2Uv+YkLPAKJC9dNEh7628WgqI

-    ybzlaA+ufxMa6bxC6ciLUQLcx5UGIAAsAkDA6wQkOxrcY39yo4cQMNWCAPTKV1R4

-    wPkgaBxzOc8FtMiF1NoGoXBRJjgoPApmPsjCFlbMdzCM4TFy50IXxI2DPcHAv2rY

-    gghsEIeu8CAPW6ABIPYEFkOsAeaMyIz0JfGJUExBBGRIRX0IMYovWCIT1eBELNpA

-    i1vcgta8iANPCIQOghzQABl30J0tXqBla4wjFLFQxZzAUY42CIAd5OYBCuKxB2c4

-    I0b28EcrQKADgmSKB9RYyDhA4BqCxIBqrtjIMTwoFeCjYSU3KZMQAAA7

-

-BEGIN:VCALENDAR

-DCREATED:19960523T100522

-PRODID:-//Alden Roland/Hand Crafted In North Carolina//NONSGML Made By Hand//EN

-VERSION:0.3

-BEGIN:VEVENT

-START:19960523T120000

-END:19960523T130000

-SUBTYPE:PHONE CALL

-SUMMARY:VERSIT PDI PR Teleconference/Interview

-DESCRIPTION:VERSIT PDI PR Teleconference/Interview With Tom Streeter and Alden Roland

-END:VEVENT

-BEGIN:VEVENT

-START:19960523T113000

-END:19960523T115500

-SUBTYPE:LUNCH

-SUMMARY:Eat in the cafeteria today

-END:VEVENT

-END:VCALENDAR

-

-END:VCARD

-

-

-will conceptually be be represented as

-    vcard

-	VCNameProp

-	    VCFamilyNameProp=Alden

-	    VCGivenNameProp=Roland

-	VCFullNameProp=Roland H.Alden

-	....

-	

-note that

-    EMAIL;WORK;PREF;INTERNET:sf!rincon!ralden@alden.attmail.com

-will be represented as:

-	VCEmailAddress=sf!rincon!ralden@alden.attmail.com

-	    VCWork

-	    VCPreferred

-	    VCInternet

-where the lower level properties are properties of the property

-VCEmailAddress.

-

-Groupings are flattened out in the VObject representation such

-that:

-	a.b:blah

-	a.c:blahblah

-are represented as:

-	b=blah

-	    VCGrouping=a

-	c=blahblah

-	    VCGrouping=a

-i.e. one can read the above as:

-	 the property "b" has value "blah" and property "VCGrouping"

-		with the value "a".

-	 the property "c" has value "blahblah" and property "VCGrouping"

-		with the value "a".

-likewise, multi-level groupings are flatten similarly. e.g.

-	a.b.c:blah

-	a.b.e:blahblah

--->

-	c=blah

-	    VCGrouping=b

-		VCGrouping=a

-	e=blahblah

-	    VCGrouping=b

-		VCGrouping=a

-which read:

-	 the property "c" has value "blah" and property "VCGrouping"

-		with the value "b" which has property "VCGrouping"

-		with value "a".

-	 the property "e" has value "blahblah" and property "VCGrouping"

-		with the value "b" which has property "VCGrouping"

-		with value "a".

-

-3. Iterating Through VObject's Properties or Values

-   ================================================

-The following is a skeletal form of iterating through

-all properties of a vobject, o:

-

-    // assume the object of interest, o, is of type VObject

-    VObjectIterator i;

-    initPropIterator(&i,o);

-    while (moreIteration(&i)) {

-	VObject *each = nextVObject(&i);

-	// ... do something with "each" property 

-	}

-

-Use the API vObjectName() to access a VObject's name.

-Use the API vObjectValueType() to determine if a VObject has

-	a value. For VCard/VCalendar application, you

-	should not need this function as practically

-	all values are either of type VCVT_USTRINGZ or

-	VCVT_RAW (i.e set by setVObjectUStringZValue and

-	setVObjectAnyValue APIs respectively), and the

-	value returned by calls to vObjectUStringZValue

-	and vObjectAnyValue are 0 if a VObject has no

-	value. (There is a minor exception where VObject with

-	VCDataSizeProp has value that is set by

-	setVObjectLongValue).

-Use the APIs vObject???Value() to access a VObject's value.

-	where ??? is the expected type.

-Use the APIs setvObject???Value() to set or modify a VObject's value.

-	where ??? is the expected type.

-Use the API isAPropertyOf() to query if a name match the name of

-	a property of a VObject. Since isAPropertyOf() return

-	the matching property, we can use that to retrieve

-	a property and subsequently the value of the property.

-

-4. Pretty Printing a VObject Tree

-   ==============================

-VObject tree can be pretty printed with the printVObject() function.

-The output of pretty printing a VObject representation of the input

-test file "vobject.vcf" is shown below. Note that the indentation

-indicates the tree hirerarchy where the immediate children nodes

-of a parent node is all at the same indentation level and the

-immediate children nodes are the immediate properties of the

-associated parent nodes.  In the following, {N,FN,ORG,TITLE,...}

-are immediate properties of VCARD. {F and G} are properties of N

-with value {"Alden" and "Roland"} respectively; FN has no property

-but has the value "Roland H. Alden"; EMAIL has value and

-the properties WORK, PREF, and INTERNET.

-

-

-VCARD

-    N

-        F="Alden"

-        G="Roland"

-    FN="Roland H. Alden"

-    ORG

-        ORGNAME="AT&T"

-        OUN="Versit Project Office"

-    TITLE="Consultant"

-    EMAIL="sf!rincon!ralden@alden.attmail.com"

-        WORK

-        PREF

-        INTERNET

-    EMAIL="ralden@sfgate.com"

-        INTERNET

-    EMAIL="242-2200"

-        MCIMail

-    LABEL="Roland H. Alden

-            Suite 2208

-            One Pine Street

-            San Francisco, CA 94111"

-        DOM

-        POSTAL

-        PARCEL

-        HOME

-        WORK

-        QP

-    LABEL="Roland H. Alden

-            Suite 2208

-            One Pine Street

-            San Francisco, CA 94111

-            U.S.A."

-        POSTAL

-        PARCEL

-        HOME

-        WORK

-        QP

-    TEL="+1 415 296 9106"

-        WORK

-        PREF

-        MSG

-    TEL="+1 415 296 9016"

-        WORK

-        FAX

-    TEL="+1 415 608 5981"

-        MSG

-        CELL

-    ADR

-        EXT ADD="Suite 2208"

-        STREET="One Pine Street"

-        L="San Francisco"

-        R="CA"

-        PC="94111"

-        C="U.S.A."

-    SOUND="ROW-LAND H ALL-DIN"

-    LOGO=[raw data]

-        GIF

-        BASE64

-        DataSize=1482

-VCALENDAR

-    DCREATED="19960523T100522"

-    PRODID="-//Alden Roland/Hand Crafted In North Carolina//NONSGML Made By Hand//EN"

-    VERSION="0.3"

-    VEVENT

-        START="19960523T120000"

-        END="19960523T130000"

-        SUBTYPE="PHONE CALL"

-        SUMMARY="VERSIT PDI PR Teleconference/Interview"

-        DESCRIPTION="VERSIT PDI PR Teleconference/Interview With Tom Streeter and Alden Roland"

-    VEVENT

-        START="19960523T113000"

-        END="19960523T115500"

-        SUBTYPE="LUNCH"

-        SUMMARY="Eat in the cafeteria today"

-

-5. Building A VObject Representation of A VCard/VCalendar

-   ======================================================

-The parser in vcc.y converts an input file with one or more

-VCard/VCalendar that is in their textual representation

-into their corresponding VObject representation.

-

-VObject representation of a VCard/VCalendar can also be built

-directly with calls to the VObject building APIs. e.g.

-

-	VObject *prop;

-	VObject *vcard = newVObject(VCCardProp);

-	prop = addProp(vcard,VCNameProp);

-		addPropValue(prop,VCFamilyNameProp,"Alden");

-		addPropValue(prop,VCGivenNameProp,"Roland");

-	addPropValue(vcard,VCFullNameProp,"Roland H. Alden");

-	....

-

-6. Converting A VObject Representation Into Its Textual Representation

-   ===================================================================

-The VObject representation can be converted back to its textual

-representation via the call to writeVObject() or writeMemVObject()

-API. e.g.

-   a. to write to a file:

-	// assume vcard is of type VObject

-	FILE *fp = fopen("alden.vcf","w");

-	writeVObject(fp,vcard);

-   a. to write to memory, and let the API allocate the required memory.

-	char* clipboard = writeVObject(0,0,vcard);

-	... do something to clipboard

-	free(clipboard);

-   b. to write to a user allocated buffer:

-	char clipboard[16384];

-	int len = 16384;

-	char *buf  = writeVObject(clipboard,&len,vcard);

-	... buf will be equal to clipboard if the write

-	is successful otherwise 0.

-

-In the case of writing to memory, the memory buffer can be either

-allocated by the API or the user. If the user allocate the

-memory for the buffer, then the length of the buffer needs to be

-communicated to the API via a variable. The variable passed as

-the length argument will be overwritten with the actual size

-of the text output. A 0 return value from writeMemVObject()

-indicates an error which could be caused by overflowing the

-size of the buffer or lack of heap memory.

-

-7. Miscellaneous Notes On VObject APIs usages

-   ==========================================

-a. vcc.h -- contains basic interfaces to the parser:

-    VObject* Parse_MIME(const char *input, unsigned long len);

-    VObject* Parse_MIME_FromFile(FILE *file);

-	-- both of this return a null-terminated list of

-	   VObject that is either a VCARD or VCALENDAR.

-	   To iterate through this list, do

-		VObject *t, *v;

-		v = Parse_Mime_FromFile(fp);

-		while (v) {

-		    // ... do something to v.

-		    t = v;

-		    v = nextVObjectInList(v);

-		    cleanVObject(t);

-		    }

-	    note that call to cleanVObject will release

-	    resource used to represent the VObject.

-

-b. vobject.h -- contains basic interfaces to the VObject APIs.

-	see the header for more details.

-	The structure of VObject is purposely (hiddened) not exposed

-	to the user. Every access has to be done via

-	the APIs. This way, if we need to change the

-	structure or implementation, the client need not

-	recompile as long as the interfaces remain the

-	same.

-

-c. values of a property is determined by the property definition

-	itself. The vobject APIs does not attempt to enforce

-	any of such definition. It is the consumer responsibility

-	to know what value is expected from a property. e.g

-	most properties have unicode string value, so to access

-	the value of these type of properties, you will use

-	the vObjectUStringZValue() to read the value and

-	setVObjectUStringZValue() to set or modify the value.

-	Refer to the VCard and VCalendar specifications for

-	the definition of each property.

-

-d. properties name (id) are case incensitive.

-

-8. Brief descriptions of each APIs

-   ===============================

-   * the predefined properties' names (id) are listed under vobject.h

-	each is of the form VC*Prop. e.g.

-		#define VC7bitProp		"7BIT"

-		#define VCAAlarmProp	"AALARM"

-		....

-

-   * consumer of a VObject can only define pointers to VObject.

-

-   * a variable of type VObjectIterator, say "i", can be used to iterate

-	through a VObject's properties, say "o". The APIs related to

-	VObjectIterator are:

-		void initPropIterator(VObjectIterator *i, VObject *o);

-			-- e.g. usage

-				initPropIterator(&i,o);

-		int moreIteration(VObjectIterator *i);

-			-- e.g. usage

-				while (moreIteration(&i)) { ... }

-		VObject* nextVObject(VObjectIterator *i);

-			-- e.g. usage

-				while (moreIteration(&i)) {

-				    VObject *each = nextVObject(&i);

-				    }

-

-    * VObject can be chained together to form a list. e.g. of such

-	use is in the parser where the return value of the parser is

-	a link list of VObject. A link list of VObject can be

-	built by:

-		void addList(VObject **o, VObject *p);

-	and iterated by

-		VObject* nextVObjectInList(VObject *o);

-			-- next VObjectInList return 0 if the list

-				is exhausted.

-

-    * the following APIs are mainly used to construct a VObject tree:

-	VObject* newVObject(const char *id);

-	    -- used extensively internally by VObject APIs but when

-		used externally, its use is mainly limited to the

-		construction of top level object (e.g. an object

-		with VCCardProp or VCCalendarProp id).

-	

-	void deleteVObject(VObject *p);

-	    -- to deallocate single VObject, for most user, use

-		cleanVObject(VObject *o) instead for freeing all

-		resources associated with the VObject.

-

-	char* dupStr(const char *s, unsigned int size);

-	    -- duplicate a string s. If size is 0, the string is

-		assume to be a null-terminated. 

-

-	void deleteStr(const char *p);

-	    -- used to deallocate a string allocated by dupStr();

-

-	void setVObjectName(VObject *o, const char* id);

-	    -- set the id of VObject o. This function is not

-		normally used by the user. The setting of id

-		is normally done as part of other APIs (e.g.

-		addProp()).

-

-	void setVObjectStringZValue(VObject *o, const char *s);

-	    -- set a string value of a VObject.

-

-	void setVObjectUStringZValue(VObject *o, const wchar_t *s);

-	    -- set a Unicode string value of a VObject.

-

-	void setVObjectIntegerValue(VObject *o, unsigned int i);

-	    -- set an integer value of a VObject.

-

-	void setVObjectLongValue(VObject *o, unsigned long l);

-	    -- set an long integer value of a VObject.

-

-	void setVObjectAnyValue(VObject *o, void *t);

-	    -- set any value of a VObject. The value type is

-		unspecified.

-

-	VObject* setValueWithSize(VObject *prop, void *val, unsigned int size);

-	    -- set a raw data (stream of bytes) value of a VObject

-		whose size is size. The internal VObject representation

-		is

-			this object = val

-			    VCDataSizeProp=size

-		i.e. the value val will be attached to the VObject prop

-		and a property of VCDataSize whose value is size

-		is also added to the object.

-		

-	void setVObjectVObjectValue(VObject *o, VObject *p);

-	    -- set a VObject as the value of another VObject.

-

-	const char* vObjectName(VObject *o);

-	    -- retrieve the VObject's Name (i.e. id).

-

-	const char* vObjectStringZValue(VObject *o);

-	    -- retrieve the VObject's value interpreted as

-		null-terminated string.

-

-	const wchar_t* vObjectUStringZValue(VObject *o);

-	    -- retrieve the VObject's value interpreted as

-		null-terminated unicode string.

-

-	unsigned int vObjectIntegerValue(VObject *o);

-	    -- retrieve the VObject's value interpreted as

-		integer.

-

-	unsigned long vObjectLongValue(VObject *o);

-	    -- retrieve the VObject's value interpreted as

-		long integer.

-

-	void* vObjectAnyValue(VObject *o);

-	    -- retrieve the VObject's value interpreted as

-		any value.

-

-	VObject* vObjectVObjectValue(VObject *o);

-	    -- retrieve the VObject's value interpreted as

-		a VObject.

-

-	VObject* addVObjectProp(VObject *o, VObject *p);

-	    -- add a VObject p as a property of VObject o.

-		(not normally used externally for building a

-		VObject).

-

-	VObject* addProp(VObject *o, const char *id);

-	    -- add a property whose name is id to VObject o.

-

-	VObject* addPropValue(VObject *o, const char *id, const char *v);

-	    -- add a property whose name is id and whose value

-		is a null-terminated string to VObject o.

-

-	VObject* addPropSizedValue(VObject *o, const char *id,

-			const char *v, unsigned int size);

-	    -- add a property whose name is id and whose value

-		is a stream of bytes of size size, to VObject o.

-

-	VObject* addGroup(VObject *o, const char *g);

-	    -- add a group g to VObject o.

-		e.g. if g is a.b.c, you will have

-		    o

-			c

-			   VCGroupingProp=b

-			       VCGroupingProp=a

-		and the object c is returned.

-		

-	VObject* isAPropertyOf(VObject *o, const char *id);

-	     -- query if a property by the name id is in o and

-		return the VObject that represent that property.

-

-	void printVObject(VObject *o);

-	     -- pretty print VObject o to stdout (for debugging use).

-

-	void writeVObject(FILE *fp, VObject *o);

-	     -- convert VObject o to its textual representation and

-		write it to file.

-

-	char* writeMemVObject(char *s, int *len, VObject *o);

-	     -- convert VObject o to its textual representation and

-		write it to memory. If s is 0, then memory required

-		to hold the textual representation will be allocated

-		by this API. If a variable len is passed, len will

-		be overwriten with the byte size of the textual

-		representation. If s is non-zero, then s has to

-		be a user allocated buffer whose size has be passed

-		in len as a variable. Memory allocated by the API

-		has to be freed with call to free. The return value

-		of this API is either the user supplied buffer,

-		the memory allocated by the API, or 0 (in case of

-		failure).

-

-	void cleanStrTbl();

-		-- this function has to be called when all

-		VObject has been destroyed.

-

-	void cleanVObject(VObject *o);

-		-- release all resources used by VObject o.

-

-	wchar_t* fakeUnicode(const char *ps, int *bytes);

-		-- convert char* to wchar_t*.

-

-	extern int uStrLen(const wchar_t *u);

-		-- length of unicode u.

-

-	char *fakeCString(const wchar_t *u);

-		-- convert wchar_t to CString (blindly assumes that

-		this could be done).

-

-9. Additional Programming Notes

-   ============================

-In the following notes, please refers to the listing

-of Example.vcf and its VObject Representation

-(shown at the end of this section).

-

-* Handling the Return Value of the VCard/VCalendar Parser

-    The example input text file contains two root VObjects

-    (a VCalendar and a VCard). The output of the VCard/VCalendar

-    parser is a null-terminated list of VObjects. For this

-    particular input file, the list will have two VObjects.

-    The following shows a template for iterating through the

-    output of the Parser:

-

-	VObject *t, *v;

-	v = Parse_Mime_fromFileName("example.vcf");

-	while (v) {

-	    // currently, v will either be a VCard or a VCalendar

-	    //	do whatever your application need to do to

-	    //  v here ...

-	    t = v;

-	    v = nextVObjectInList(v);

-	    cleanVObject(t);

-	    }

-

-* Iterating Through a VCard/VCalendar VObject

-    From the VObject APIs point of view, a VCard VObject

-    is the same as a VCalendar VObject. However, the application

-    needs to know what are in a VCard or a VCalendar.

-    For example, A VCalendar VObject can have VCDCreatedProp,

-    a VCGEOLocationProp, etc, and one or more VCEventProp and

-    or VCTodoProp. The VCEventProp and VCTodoProp can have

-    many properties of their own, which in turn could have

-    more properties (e.g. VCDAlarmProp can be a VCEventProp

-    VObject's property, and VCRunTimeProp can be a

-    VCDAlarmProp VObject's property. Because a VObject tree

-    can be arbitrarily complex, in general, to process all

-    properties and values of a VObject tree, a recursive walk

-    is desirable. An example recursive VObject tree walk

-    can be found in the vobject.c source lines for printVObject*

-    and writeVObject* APIs. Depending on what the application need

-    to do with a VCard or a VCalendar, a recursive walk

-    of the VObject tree may or may not be desirable. An example

-    template of a non-recursive walk is shown below:

-	

-    void processVCardVCalendar(char *inputFile)

-    {

-	VObject *t, *v;

-	v = Parse_Mime_fromFileName(inputFile);

-	while (v) {

-	    char *n = vObjectName(v);

-	    if (strcmp(n,VCCardProp) == 0) {

-		do_VCard(v);

-		}

-	    else if (strcmp(n,VCCalendarProp) == 0) {

-		do_VCalendar(v);

-		}

-	    else {

-		// don't know how to handle anything else!

-		}

-	    t = v;

-	    v = nextVObjectInList(v);

-	    cleanVObject(t);

-	    }

-    }

-

-    void  do_VCard(VObject *vcard)

-    {

-	VObjectIterator t;

-	initPropIterator(&t,vcard);

-	while (moreIteration(&t)) {

-	    VObject *eachProp = nextVObject(&t);

-	    //	The primarly purpose of this example is to

-	    //  show how to iterate through a VCard VObject,

-	    //	it is not meant to be efficient at all.

-	    char *n = vObjectName(eachProp);

-	    if (strcmp(n,VCNameProp)==0) {

-		do_name(eachProp);

-		}

-	    else if (strcmp(n,VCEmailProp)==0) {

-		do_email(eachProp);

-		}

-	    else if (strcmp(n,VCLabelProp)==0) {

-		do_label(eachProp);

-		}

-	    else if ....

-	    }

-    }

-

-    void  do_VCalendar(VObject *vcal)

-    {

-	VObjectIterator t;

-	initPropIterator(&t,vcard);

-	while (moreIteration(&t)) {

-	    VObject *eachProp = nextVObject(&t);

-	    //	The primarly purpose of this example is to

-	    //  show how to iterate through a VCalendar VObject,

-	    //	it is not meant to be efficient at all.

-	    char *n = vObjectName(eachProp);

-	    if (strcmp(n,VCDCreatedProp)==0) {

-		do_DCreated(eachProp);

-		}

-	    else if (strcmp(n,VCVersionProp)==0) {

-		do_Version(eachProp);

-		}

-	    else if (strcmp(n,VCTodoProp)==0) {

-		do_Todo(eachProp);

-		}

-	    else if (strcmp(n,VCEventProp)==0) {

-		do_Event(eachProp);

-		}

-	    else if ....

-	    }

-    }

-

-    void do_Todo(VObject *vtodo) { ... }

-

-    void do_Event(VObject *vevent) { ... }

-

-    ...

-    

-* Property's Values and Properties

-    The VObject APIs do not attempt to check for the

-    correctness of the values of a property. Nor do they

-    will prevent the user from attaching a non-VCard/VCalendar

-    standard property to a VCard/VCalendar property. Take

-    the example of line [11] of the example, "O.K" is not

-    a valid value of VCStatusProp.  It is up to the application

-    to accept or reject the value of a property.

-    

-* Output of printVObject

-    PrintVObject pretty prints a VObject tree in human

-    readable form. See the listing at the end of the file

-    for an example output of printVObject on the example

-    input file "Example.vcf".

-

-    Note that binary data are not shown in the output of

-    printVObject. Instead, a note is made ([raw data]) to

-    indicate that there exists such a binary data.

-

-* Note on Binary Data

-    When the value of a property is a binary data, it is only

-    useful to know the size of the binary data.

-

-    In the case of the VCard/VCalendar parser, it chooses

-    to represent the size information as a separate property

-    called VCDataSizeProp whose value is the size of the binary

-    data. The APIs sequence to construct the VObject subtree

-    of line [44] of Example.vcf is

-

-	    // VObject *vcard;

-	    VObject *p1 = addProp(vcard,VCLogoProp);

-	    (void) addProp(p1,VCGIFProp);

-	    (void) addProp(p1,VCBASE64Prop);

-	    VObject *p2 = addProp(p1,VCDataSizeProp);

-	    (void) setVObjectLongValue(p2,1482);

-	    setVObjectAnyValue(vcard,...pointer to binary data);

-	

-    Note the presence of VCBase64Prop will cause the

-    writeVObject API to output the binary data as BASE64 text.

-    For VCard/VCalendar application, having the VCBase64Prop

-    property is pratically always neccessary for property with

-    binary data as its value.

-	

-* Note on Quoted-Printable String

-    String value with embedded newline are written out as

-    quoted-prinatable string. It is therefore important

-    to mark a property with a string value that has

-    one or more embedded newlines, with the VCQutedPrintableProp

-    property. e.g.

-			

-	// VObject *root;

-	char *msg="To be\nor\nnot to be";

-	VObject *p = addPropValue(root,VCDescriptionProp,msg);

-	    // the following is how you mark a property with

-	    //	a property. In this case, the marker is

-	    //  VCQuotedPrintableProp

-	    addProp(p,VCQuotedPrintableProp);

-

-* Note on Unicode

-    Although, the current parser takes ASCII text file only,

-    string values are all stored as Unicode in the VObject tree.

-    For now, when using the VObject APIs to construct a

-    VObject tree, one should always convert ASCII string value

-    to a Unicode string value:

-

-	// VObject *root;

-	VObject *p = addProp(root,VCSomeProp);

-	setVObjectUStringZValue(p,fakeUnicode(someASCIIStringZvalue));

-

-    An API is provided to simplify the above process:

-

-	addPropValue(root,VCSomeProp,someASCIIStringZValue);

-

-    Note that someASCIISTringZValue is automatically converted to

-    Unicode by addPropValue API, where as, the former code

-    sequence do an explicit call to fakeUnicode.

-

-    To read back the value, one should use the vObjectUStringZValue

-    API not vObjectStringZValue API. The value returned by the

-    vObjectUStringZValue API is a Unicode string. If the application

-    do not know how to handle Unicode string, it can use the

-    fakeCString API to convert it back to ASCII string (as long

-    as the conversion is meaningful).

-

-    Note that fakeCString return a heap allocated memory. It is

-    important to call deleteStr on fakeCString return value if

-    it is not longer required (or there will be memory leak).

-

-    NOTE: Unfortunately, at the point when this document is written,

-    there is still no consensus on how Unicode is to be handled

-    in the textual representation of VCard/VCalendar. So, there

-    is no version of writeVObject and the parser to output and

-    input Unicode textual representation of VCard/VCalendar.

-   

-

-Example.vcf

------------

-line

-number Input Text (example.vcf)

------- ----------

-1      BEGIN:VCALENDAR

-2      DCREATED:19961102T100522

-3      GEO:0,0

-4      VERSION:1.0

-5      BEGIN:VEVENT

-6      DTSTART:19961103T000000

-7      DTEND:20000101T000000

-8      DESCRIPTION;QUOTED-PRINTABLE:To be =0A=

-9      or =0A=

-10     not to be

-11     STATUS:O.K.

-12     X-ACTION:No action required

-13     DALARM:19961103T114500;5;3;Enjoy

-14     MALARM:19970101T120000;;;johny@nowhere.com;Call Mom.

-15     END:VEVENT

-16

-17     BEGIN:VTODO

-18     DUE:19960614T0173000

-19     DESCRIPTION:Relex.

-20     END:VTODO

-21

-22     END:VCALENDAR

-23

-24     BEGIN:VCARD

-25     N:Alden;Roland

-26     FN:Roland H. Alden

-27     ORG:AT&T;Versit Project Office

-28     TITLE:Consultant

-29     EMAIL;WORK;PREF;INTERNET:ralden@ralden.com

-30     LABEL;DOM;POSTAL;PARCEL;HOME;WORK;QUOTED-PRINTABLE:Roland H. Alden=0A=

-31     Suite 2208=0A=

-32     One Pine Street=0A=

-33     San Francisco, CA 94111

-34     LABEL;POSTAL;PARCEL;HOME;WORK;QUOTED-PRINTABLE:Roland H. Alden=0A=

-35     Suite 2208=0A=

-36     One Pine Street=0A=

-37     San Francisco, CA 94111=0A=

-38     U.S.A.

-39     TEL;WORK;PREF;MSG:+1 415 296 9106

-40     TEL;WORK;FAX:+1 415 296 9016

-41     TEL;MSG;CELL:+1 415 608 5981

-42     ADR:;Suite 2208;One Pine Street;San Francisco;CA;94111;U.S.A.

-43     SOUND:ROW-LAND H ALL-DIN

-44     LOGO;GIF;BASE64:

-45         R0lGODdhpgBOAMQAAP///+/v797e3s7Ozr29va2trZycnIyMjHt7e2NjY1JSUkJC

-    ... 30 lines of BASE64 data not shown here.

-76     END:VCARD

-

-

-VObject Representation of Example.vcf:

--------------------------------------

-line

-in

-text

-file  VObject Tree as Printed by printVObject API

-----  -------------------------------------------

-1     VCALENDAR

-2         DCREATED="19961102T100522"

-3         GEO="0,0"

-4         VERSION="1.0"

-5         VEVENT

-6             DTSTART="19961103T000000"

-7             DTEND="20000101T000000"

-8             DESCRIPTION="To be

-9                     or

-10                    not to be"

-8                 QUOTED-PRINTABLE

-11            STATUS="O.K."

-12            X-ACTION="No action required"

-13            DALARM

-13                RUNTIME="19961103T114500"

-13                SNOOZETIME="5"

-13                REPEATCOUNT="3"

-13                DISPLAYSTRING="Enjoy"

-14            MALARM

-14                RUNTIME="19970101T120000"

-14                EMAIL="johny@nowhere.com"

-14                NOTE="Call Mom"

-17        VTODO

-18            DUE="19960614T0173000"

-19            DESCRIPTION="Relex."

-24    VCARD

-25        N

-25            F="Alden"

-25            G="Roland"

-26        FN="Roland H. Alden"

-27        ORG

-27            ORGNAME="AT&T"

-27            OUN="Versit Project Office"

-28        TITLE="Consultant"

-29        EMAIL="ralden@alden.com"

-29            WORK

-29            PREF

-29            INTERNET

-30        LABEL="Roland H. Alden

-31                Suite 2208

-32                One Pine Street

-33                San Francisco, CA 94111"

-30            DOM

-30            POSTAL

-30            PARCEL

-30            HOME

-30            WORK

-30            QUOTED-PRINTABLE

-34        LABEL="Roland H. Alden

-35                Suite 2208

-36                One Pine Street

-37                San Francisco, CA 94111

-38                U.S.A."

-34            POSTAL

-34            PARCEL

-34            HOME

-34            WORK

-34            QUOTED-PRINTABLE

-39        TEL="+1 415 296 9106"

-39            WORK

-39            PREF

-39            MSG

-40        TEL="+1 415 296 9016"

-40            WORK

-40            FAX

-41        TEL="+1 415 608 5981"

-41            MSG

-41            CELL

-42        ADR

-42            EXT ADD="Suite 2208"

-42            STREET="One Pine Street"

-42            L="San Francisco"

-42            R="CA"

-42            PC="94111"

-42            C="U.S.A."

-43        SOUND="ROW-LAND H ALL-DIN"

-44        LOGO=[raw data]

-44            GIF

-44            BASE64

-44            DATASIZE=1482

-

diff --git a/libical/src/libicalvcal/icalvcal.c b/libical/src/libicalvcal/icalvcal.c
deleted file mode 100644
index 76c87898af..0000000000
--- a/libical/src/libicalvcal/icalvcal.c
+++ /dev/null
@@ -1,1646 +0,0 @@
-/*======================================================================
-  FILE: icalvcal.c
-  CREATOR: eric 25 May 00
-  
-  $Id$
-
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalvcal.c
-
-
-
-  The icalvcal_convert routine calls icalvcal_traverse_objects to do
-  its work.s his routine steps through through all of the properties
-  and components of a VObject. For each name of a property or a
-  component, icalvcal_traverse_objects looks up the name in
-  conversion_table[]. This table indicates wether the name is of a
-  component or a property, lists a routine to handle conversion, and
-  has extra data for the conversion.
-
-  The conversion routine will create new iCal components or properties
-  and add them to the iCal component structure. 
-
-  The most common conversion routine is dc_prop. This routine converts
-  properties for which the text representation of the vCal component
-  is identical the iCal representation.
-
-  ======================================================================*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "icalvcal.h"
-#include <string.h>
-
-#ifdef WIN32
-#define snprintf	_snprintf
-#define strcasecmp	stricmp
-#endif
-
-enum datatype {
-    COMPONENT,
-    PROPERTY,
-    PARAMETER,
-    UNSUPPORTED,
-    IGNORE
-};
-
-/* The indices must match between the strings and the codes. */
-char *weekdays[] = { "SU", "MO", "TU", "WE", "TH", "FR", "SA" }; 
-int weekday_codes[] = {
-  ICAL_SUNDAY_WEEKDAY,
-  ICAL_MONDAY_WEEKDAY,
-  ICAL_TUESDAY_WEEKDAY,
-  ICAL_WEDNESDAY_WEEKDAY,
-  ICAL_THURSDAY_WEEKDAY,
-  ICAL_FRIDAY_WEEKDAY,
-  ICAL_SATURDAY_WEEKDAY
-};
-
-
-struct conversion_table_struct {
-	char* vcalname;
-	enum datatype type;
-	void* (*conversion_func)(int icaltype, VObject *o, icalcomponent *comp,
-				 icalvcal_defaults *defaults);
-	int icaltype;
-};
-
-struct conversion_table_struct conversion_table[];
-void* dc_prop(int icaltype, VObject *object, icalcomponent *comp,
-	      icalvcal_defaults *defaults);
-
-
-
-/* Creates an error property with the given message. */
-static icalproperty* create_parse_error_property (const char *message,
-						  const char *property_name,
-						  const char *property_value)
-{
-    char temp[4096];
-    icalparameter *error_param;
-    icalproperty *error_prop;
-
-    snprintf (temp, 1024, "%s: %s:%s", message, property_name, property_value);
-		
-    error_param = icalparameter_new_xlicerrortype (ICAL_XLICERRORTYPE_VCALPROPPARSEERROR);
-    error_prop = icalproperty_new_xlicerror (temp);
-    icalproperty_add_parameter (error_prop, error_param);
-
-    return error_prop;
-}
-
-
-char* get_string_value (VObject *object, int *free_string)
-{
-    switch (vObjectValueType(object)) {
-	case VCVT_USTRINGZ:
-	  *free_string = 1;
-	  return fakeCString(vObjectUStringZValue(object));
-
-	case VCVT_STRINGZ:
-	  *free_string = 0;
-	  return (char*) vObjectStringZValue(object);
-    }
-
-    *free_string = 0;
-
-    /* We return "" here, to cut down on the risk of crashing. */
-    return "";
-}
-
-
-static void convert_floating_time_to_utc (struct icaltimetype *itt)
-{
-  struct tm tmp_tm = { 0 }, *utc_tm;
-  time_t t;
-
-  /* We assume the floating time is using the current Unix timezone.
-     So we convert to a time_t using mktime(), and then back to a struct tm
-     using gmtime, so it is the UTC time. */
-  tmp_tm.tm_year  = itt->year - 1900;
-  tmp_tm.tm_mon   = itt->month - 1;
-  tmp_tm.tm_mday  = itt->day;
-  tmp_tm.tm_hour  = itt->hour;
-  tmp_tm.tm_min   = itt->minute;
-  tmp_tm.tm_sec   = itt->second;
-  tmp_tm.tm_isdst = -1;
-
-  /* Convert to a time_t. */
-  t = mktime (&tmp_tm);
-
-  /* Now convert back to a struct tm, but with a UTC time. */
-  utc_tm = gmtime (&t);
-
-  /* Now put it back into the icaltime. */
-  itt->year   = utc_tm->tm_year + 1900;
-  itt->month  = utc_tm->tm_mon + 1;
-  itt->day    = utc_tm->tm_mday;
-  itt->hour   = utc_tm->tm_hour;
-  itt->minute = utc_tm->tm_min;
-  itt->second = utc_tm->tm_sec;
-
-  /* Set the is_utc flag. */
-  itt->is_utc = 1;
-}
-
-
-static void icalvcal_traverse_objects(VObject *object,
-				      icalcomponent* last_comp,
-				      icalproperty* last_prop,
-				      icalvcal_defaults *defaults)
-{
-    VObjectIterator iterator;
-    char* name = "[No Name]";
-    icalcomponent* subc = 0;
-    int i;
-    
-    if ( vObjectName(object)== 0){
-	printf("ERROR, object has no name");
-	assert(0);
-	return;
-    }
-
-    name = (char*)vObjectName(object);
-
-    /* Lookup this object in the conversion table */
-    for (i = 0; conversion_table[i].vcalname != 0; i++){
-	if(strcmp(conversion_table[i].vcalname, name) == 0){
-	    break;
-	}
-    }
-    
-    /* Did not find the object. It may be an X-property, or an unknown
-       property */
-    if (conversion_table[i].vcalname == 0){
-
-	/* Handle X properties */
-	if(strncmp(name, "X-",2) == 0){
-	   icalproperty* prop = (icalproperty*)dc_prop(ICAL_X_PROPERTY,object,
-						       last_comp, defaults);
-	   icalproperty_set_x_name(prop,name);
-	   icalcomponent_add_property(last_comp,prop);
-	} else {
-	    assert(0);
-	    return;
-	}
-
-    } else {
-	
-	/* The vCal property is in the table, and it is not an X
-           property, so try to convert it to an iCal component,
-           property or parameter. */
-	
-	switch(conversion_table[i].type){
-	    
-	    
-	    case COMPONENT: {
-		subc = 
-		    (icalcomponent*)(conversion_table[i].conversion_func
-				     (conversion_table[i].icaltype,
-				      object, last_comp, defaults));
-		
-		if (subc) {
-		icalcomponent_add_component(last_comp,subc);
-		}		
-		break;
-	    }
-	    
-	    case PROPERTY: {
-		
-		if (vObjectValueType(object) &&
-		    conversion_table[i].conversion_func != 0 ) {
-		    
-		    icalproperty* prop = 
-			(icalproperty*)(conversion_table[i].conversion_func
-					(conversion_table[i].icaltype,
-					 object, last_comp, defaults));
-		    
-		    if (prop)
-		    icalcomponent_add_property(last_comp,prop);
-
-		    last_prop = prop;
-		    
-		}
-		break;
-	    }
-	    
-	    case PARAMETER: {
-		break;
-	    }
-	    
-	    case UNSUPPORTED: {
-
-		/* If the property is listed as UNSUPPORTED, insert a
-                   X_LIC_ERROR property to note this fact. */
-
-		char temp[1024];
-		char* message = "Unsupported vCal property";
-		icalparameter *error_param;
-		icalproperty *error_prop;
-
-		snprintf(temp,1024,"%s: %s",message,name);
-		
-		error_param = icalparameter_new_xlicerrortype(
-		    ICAL_XLICERRORTYPE_UNKNOWNVCALPROPERROR
-		    );
-
-		error_prop = icalproperty_new_xlicerror(temp);
-		icalproperty_add_parameter(error_prop, error_param);
-
-		icalcomponent_add_property(last_comp,error_prop);
-
-		break;
-	    }
-
-	    case IGNORE: {
-	      /* Do Nothing. */
-	      break;
-	    }
-
-	}
-    }
-
-
-    /* Now, step down into the next vCalproperty */
-
-    initPropIterator(&iterator,object);
-    while (moreIteration(&iterator)) {
-	VObject *eachProp = nextVObject(&iterator);
-
-	/* If 'object' is a component, then the next traversal down
-           should use it as the 'last_comp' */
-
-	if(subc!=0){
-	    icalvcal_traverse_objects(eachProp,subc,last_prop,defaults);
-	
-	} else {
-	    icalvcal_traverse_objects(eachProp,last_comp,last_prop,defaults);
-	}
-    }
-}
-
-icalcomponent* icalvcal_convert_with_defaults (VObject *object,
-					       icalvcal_defaults *defaults)
-{
-   char* name =  (char*)vObjectName(object);
-   icalcomponent* container = icalcomponent_new(ICAL_XROOT_COMPONENT);
-   icalcomponent* root;
-   icalproperty *prop;
-
-   icalerror_check_arg_rz( (object!=0),"Object");
-
-   /* The root object must be a VCALENDAR */
-   if(*name==0 || strcmp(name,VCCalProp) != 0){
-       return 0; /* HACK. Should return an error */
-   }
-
-#if 0
-   /* Just for testing. */
-   printf ("This is the internal VObject representation:\n");
-   printf ("===========================================\n");
-   printVObject(stdout, object);
-   printf ("===========================================\n");
-#endif
-
-   icalvcal_traverse_objects(object,container,0,defaults);
-   
-   /* HACK. I am using the extra 'container' component because I am
-      lazy. I know there is a way to get rid of it, but I did not care
-      to find it. */
-
-   root = icalcomponent_get_first_component(container,ICAL_ANY_COMPONENT);
-
-   icalcomponent_remove_component(container, root);
-   icalcomponent_free(container);
-
-   /* We add a VERSION and PRODID here, to make it a valid iCalendar object,
-      but the application may change them if necessary. */
-   prop = icalproperty_new_prodid ("-//Softwarestudio.org//" PACKAGE
-				   " version " VERSION "//EN");
-   icalcomponent_add_property (root, prop);
-
-   prop = icalproperty_new_version ("2.0");
-   icalcomponent_add_property (root, prop);
-
-   return root;
-
-}
-
-icalcomponent* icalvcal_convert (VObject *object)
-{
-  return icalvcal_convert_with_defaults (object, NULL);
-}
-
-
-/* comp() is useful for most components, but alarm, daylight and
- * timezone are different. In vcal, they are properties, and in ical,
- * they are components. Although because of the way that vcal treats
- * everything as a property, alarm_comp() daylight_comp() and
- * timezone_comp() may not really be necessary, I think it would be
- * easier to use them. */
-
-void* comp(int icaltype, VObject *o, icalcomponent *comp,
-	   icalvcal_defaults *defaults)
-{
-    icalcomponent_kind kind = (icalcomponent_kind)icaltype;
-
-    icalcomponent* c = icalcomponent_new(kind);
-
-    return (void* )c;
-}
-
-/* vCalendar has 4 properties for alarms: AALARM, DALARM, MALARM, PALARM
-   (for audio, display, mail, and procedure alarms).
-
-   AALARM has Run Time, Snooze Time, Repeat Count, Audio Content.
-	It may also have a TYPE parameter specifying the MIME type, e.g.
-      AALARM;TYPE=WAVE;VALUE=URL:19960415T235959; ; ; file:///mmedia/taps.wav
-      AALARM;TYPE=WAVE;VALUE=CONTENT-ID:19960903T060000;PT15M;4;<jsmith.part2.=
-	960901T083000.xyzMail@host1.com>
-
-   DALARM has Run Time, Snooze Time, Repeat Count, Display String.
-      DALARM:19960415T235000;PT5M;2;Your Taxes Are Due !!!
-
-   MALARM has Run Time, Snooze Time, Repeat Count, Email Address, Note.
-      MALARM:19960416T000000;PT1H;24;IRS@us.gov;The Check Is In The Mail!
-
-   PALARM has Run Time, Snooze Time, Repeat Count, Procedure Name.
-      PALARM;VALUE=URL:19960415T235000;PT5M;2;file:///myapps/shockme.exe
-
-   AALARM and PALARM: Check the VALUE is a URL. We won't support CONTENT-ID.
-
-
-   iCalendar uses one component, VALARM, for all of these, and uses an ACTION
-   property of "AUDIO", "DISPLAY", "EMAIL" or "PROCEDURE".
-
-   The Run Time value can be copied into the iCalendar TRIGGER property,
-   except it must be UTC in iCalendar. If it is floating, we'll convert to
-   UTC using the current Unix timezone.
-
-   The Snooze Time becomes DURATION, and the Repeat Count becomes REPEAT.
-
-   For AALARM, the Audio Content becomes the ATTACH property, and the TYPE
-   becomes a FMTTYPE of this property (PCM -> 'audio/basic' (?),
-   WAVE -> 'audio/x-wav', AIFF -> 'audio/x-aiff'), e.g.
-     ATTACH;FMTTYPE=audio/basic:ftp://host.com/pub/sounds/bell-01.aud
-
-   For DALARM, Display String becomes the DESCRIPTION property.
-
-   For MALARM, Email Address becomes an ATTENDEE property, e.g.
-     ATTENDEE:MAILTO:john_doe@host.com
-
-   For PALARM, the Procedure Name becomes an ATTACH property, like AALARM, e.g.
-     ATTACH;FMTTYPE=application/binary:ftp://host.com/novo-procs/felizano.exe
-*/
-
-/* This converts the vCalendar alarm properties into iCalendar properties and
-   adds them to the component. It returns 1 if the alarm is valid, 0 if not. */
-static int get_alarm_properties (icalcomponent *comp, VObject *object,
-				 int icaltype, icalvcal_defaults *defaults)
-{
-    VObjectIterator iterator;
-    icalproperty *trigger_prop = NULL, *duration_prop = NULL;
-    icalproperty *repeat_prop = NULL, *attach_prop = NULL;
-    icalproperty *summary_prop = NULL, *description_prop = NULL;
-    icalproperty *action_prop, *attendee_prop = NULL;
-    icalparameter *fmttype_param = NULL;
-    enum icalproperty_action action;
-    int value_is_url = 0, is_valid_alarm = 1;
-
-    initPropIterator (&iterator, object);
-    while (moreIteration (&iterator)) {
-        VObject *eachProp = nextVObject (&iterator);
-        const char *name =  vObjectName (eachProp);
-	char *s;
-	int free_string;
-
-	s = get_string_value (eachProp, &free_string);
-
-	/* Common properties. */
-	if (!strcmp (name, VCRunTimeProp)) {
-	    if (*s) {
-		struct icaltriggertype t;
-		icalparameter *param;
-
-		/* Convert it to an icaltimetype. */
-		t.time = icaltime_from_string (s);
-
-		/* If it is a floating time, convert it to a UTC time. */
-		if (!t.time.is_utc)
-		    convert_floating_time_to_utc (&t.time);
-
-		/* Create a TRIGGER property. */
-		trigger_prop = icalproperty_new_trigger (t);
-
-		/* vCalendar triggers are always specific DATE-TIME values. */
-		param = icalparameter_new_value (ICAL_VALUE_DATETIME);
-		icalproperty_add_parameter (trigger_prop, param);
-
-		icalcomponent_add_property (comp, trigger_prop);
-	    }
- 
-	} else if (!strcmp (name, VCSnoozeTimeProp)) {
-	    struct icaldurationtype d;
-
-	    /* Parse the duration string.
-	       FIXME: vCalendar also permits 'Y' (Year) and 'M' (Month) here,
-	       which we don't handle at present. Though it is unlikely they
-	       will be used as a snooze time between repeated alarms! */
-	    d = icaldurationtype_from_string (s);
- 
-	    duration_prop = icalproperty_new_duration (d);
-	    icalcomponent_add_property (comp, duration_prop);
-
-	} else if (!strcmp (name, VCRepeatCountProp)) {
-	    /* If it starts with a digit convert it into a REPEAT property. */
-	    if (*s && *s >= '0' && *s <= '9') {
-		repeat_prop = icalproperty_new_repeat (atoi (s));
-		icalcomponent_add_property (comp, repeat_prop);
-	    }
-
-	} else if (!strcmp (name, VCValueProp)) {
-	    /* We just remember if the value is a URL. */
-	    if (!strcmp (s, "URL")) {
-		value_is_url = 1;
-	    }
-
-	/* Audio properties && Procedure properties. */
-	} else if (!strcmp (name, VCAudioContentProp)
-		   || !strcmp (name, VCProcedureNameProp)) {
-	    if (*s && !attach_prop) {
-		icalattach *attach;
-
-		attach = icalattach_new_from_url (s);
-		attach_prop = icalproperty_new_attach (attach);
-		icalcomponent_add_property (comp, attach_prop);
-
-		/* We output a "application/binary" FMTTYPE for Procedure
-		   alarms. */
-		if (!strcmp (name, VCProcedureNameProp) && !fmttype_param)
-		    fmttype_param = icalparameter_new_fmttype ("application/binary");
-	    }
-
-	} else if (!strcmp (name, "TYPE")) {
-	    char *fmttype = NULL;
-
-	    if (!strcmp (s, "PCM"))
-		fmttype = "audio/basic";
-	    else if (!strcmp (s, "AIFF"))
-		fmttype = "audio/x-aiff";
-	    else if (!strcmp (s, "WAVE"))
-		fmttype = "audio/x-wav";
-
-	    if (fmttype)
-		fmttype_param = icalparameter_new_fmttype (fmttype);
-
-	/* Display properties. */
-	} else if (!strcmp (name, VCDisplayStringProp)) {
-	    if (!description_prop) {
-		description_prop = icalproperty_new_description (s);
-		icalcomponent_add_property (comp, description_prop);
-	    }
-
-	/* Mail properties. */
-	} else if (!strcmp (name, VCEmailAddressProp)) {
-	    if (*s && strlen (s) < 1000) {
-	      char buffer[1024];
-
-		/* We need to add 'MAILTO:' before the email address, to make
-		   it valid iCalendar. */
-		sprintf (buffer, "MAILTO:%s", s);
-		attendee_prop = icalproperty_new_attendee (buffer);
-		icalcomponent_add_property (comp, attendee_prop);
-	    }
-
-	} else if (!strcmp (name, VCNoteProp)) {
-	    if (!description_prop) {
-		description_prop = icalproperty_new_description (s);
-		icalcomponent_add_property (comp, description_prop);
-	    }
-
-	    /* We also copy the Note to the SUMMARY property, since that is
-	       required in iCalendar. */
-	    if (!summary_prop) {
-		summary_prop = icalproperty_new_summary (s);
-		icalcomponent_add_property (comp, summary_prop);
- }
-	}
-
-	if (free_string)
-	    deleteStr (s);
-    }
-
-    /* Add the FMTTYPE parameter to the ATTACH property if it exists. */
-    if (fmttype_param) {
-	if (attach_prop) {
-	    icalproperty_add_parameter (attach_prop, fmttype_param);
-	} else {
-	    icalparameter_free (fmttype_param);
-	}
-    }
-
-
-    /* Now check if the alarm is valid, i.e. it has the required properties
-       according to its type. */
-
-    /* All alarms must have a trigger. */
-    if (!trigger_prop)
-	is_valid_alarm = 0;
-
-    /* If there is a Duration but not a Repeat Count, we just remove the
-       Duration so the alarm only occurs once. */
-    if (duration_prop && !repeat_prop) {
-	icalcomponent_remove_property (comp, duration_prop);
-	icalproperty_free (duration_prop);
-	duration_prop = NULL;
-    }
-
-    /* Similarly if we have a Repeat Count but no Duration, we remove it. */
-    if (repeat_prop && !duration_prop) {
-	icalcomponent_remove_property (comp, repeat_prop);
-	icalproperty_free (repeat_prop);
-	repeat_prop = NULL;
-    }
-
-    switch (icaltype) {
-    case ICAL_XAUDIOALARM_COMPONENT:
-	action = ICAL_ACTION_AUDIO;
-
-	/* Audio alarms must have an ATTACH property, which is a URL.
-	   If they don't have one, we use the default alarm URL. */
-	if (!attach_prop || !value_is_url) {
-	    if (defaults && defaults->alarm_audio_url
-		&& defaults->alarm_audio_fmttype) {
-		icalattach *attach;
-
-		if (attach_prop) {
-		    icalcomponent_remove_property (comp, attach_prop);
-		    icalproperty_free (attach_prop);
-		}
-
-		attach = icalattach_new_from_url (defaults->alarm_audio_url);
-		attach_prop = icalproperty_new_attach (attach);
-		icalcomponent_add_property (comp, attach_prop);
-
-		fmttype_param = icalparameter_new_fmttype (defaults->alarm_audio_fmttype);
-		icalproperty_add_parameter (attach_prop, fmttype_param);
-	    } else {
-	        is_valid_alarm = 0;
-	    }
-	}
-	break;
-
-    case ICAL_XDISPLAYALARM_COMPONENT:
-	action = ICAL_ACTION_DISPLAY;
-
-	/* Display alarms must have a DESCRIPTION. */
-	if (!description_prop) {
-	    if (defaults && defaults->alarm_description) {
-		description_prop = icalproperty_new_description (defaults->alarm_description);
-		icalcomponent_add_property (comp, description_prop);
-	    } else {
-		is_valid_alarm = 0;
-	    }
-	}
-	break;
-
-    case ICAL_XEMAILALARM_COMPONENT:
-	action = ICAL_ACTION_EMAIL;
-
-	/* Email alarms must have a SUMMARY, a DESCRIPTION, and an ATTENDEE. */
-	if (!attendee_prop) {
-	    is_valid_alarm = 0;
-	} else if (!summary_prop || !description_prop) {
-	    if (!summary_prop && defaults->alarm_description) {
-		summary_prop = icalproperty_new_summary (defaults->alarm_description);
-		icalcomponent_add_property (comp, summary_prop);
-	    }
-
-	    if (!description_prop && defaults->alarm_description) {
-		description_prop = icalproperty_new_description (defaults->alarm_description);
-		icalcomponent_add_property (comp, description_prop);
-	    }
-
-	    if (!summary_prop || !description_prop)
-		is_valid_alarm = 0;
-	}
-	break;
-
-    case ICAL_XPROCEDUREALARM_COMPONENT:
-	action = ICAL_ACTION_PROCEDURE;
-
-	/* Procedure alarms must have an ATTACH property, which is a URL.
-	   We don't support inline data. */
-	if (!attach_prop) {
-	    is_valid_alarm = 0;
-	} else if (!value_is_url) {
-	    icalattach *attach;
-	    const char *url;
-
-	    attach = icalproperty_get_attach (attach_prop);
-	    url = icalattach_get_url (attach);
-
-	    /* Check for Gnome Calendar, which will just save a pathname. */
-	    if (url && url[0] == '/') {
-		int len;
-		char *new_url;
-		icalattach *new_attach;
-
-		/* Turn it into a proper file: URL. */
-		len = strlen (url) + 12;
-
-		new_url = malloc (len);
-		strcpy (new_url, "file://");
-		strcat (new_url, url);
-
-		new_attach = icalattach_new_from_url (new_url);
-		free (new_url);
-
-		icalproperty_set_attach (attach_prop, new_attach);
-
-	    } else {
-		is_valid_alarm = 0;
-	    }
-	}
-	break;
-
-    default:
-	/* Shouldn't reach here ever. */
-	assert(0);
-	break;
-    }
-
-    action_prop = icalproperty_new_action (action);
-    icalcomponent_add_property (comp, action_prop);
-
-    return is_valid_alarm;
-}
-
-
-void* alarm_comp(int icaltype, VObject *o, icalcomponent *comp,
-		 icalvcal_defaults *defaults)
-{
-    icalcomponent_kind kind = (icalcomponent_kind)icaltype;
-    int is_valid_alarm;
-
-    icalcomponent* c = icalcomponent_new(ICAL_VALARM_COMPONENT);
- 
-    is_valid_alarm = get_alarm_properties (c, o, icaltype, defaults);
-
-    if (is_valid_alarm) {
-    return (void*)c;
-    } else {
-	icalcomponent_free (c);
-	return NULL;
-    }
-}
-
-
-/* These #defines indicate conversion routines that are not defined yet. */
-
-#define parameter 0   
-#define rsvp_parameter 0   
-
-void* transp_prop(int icaltype, VObject *object, icalcomponent *comp,
-		  icalvcal_defaults *defaults)
-{
-    icalproperty *prop = NULL;
-    char *s;
-    int free_string;
-
-    s = get_string_value (object, &free_string);
-
-
-    /* In vCalendar "0" means opaque, "1" means transparent, and >1 is
-       implementation-specific. So we just check for "1" and output
-       TRANSPARENT. For anything else, the default OPAQUE will be used. */
-    if (!strcmp (s, "1")) {
-      prop = icalproperty_new_transp (ICAL_TRANSP_TRANSPARENT);
-    }
-
-    if (free_string)
-	deleteStr (s);
-
-    return (void*)prop;
-}
-
-void* sequence_prop(int icaltype, VObject *object, icalcomponent *comp,
-		    icalvcal_defaults *defaults)
-{
-    icalproperty *prop = NULL;
-    char *s;
-    int free_string, sequence;
-
-    s = get_string_value (object, &free_string);
-
-    /* GnomeCalendar outputs '-1' for this. I have no idea why.
-       So we just check it is a valid +ve integer, and output 0 if it isn't. */
-    sequence = atoi (s);
-    if (sequence < 0)
-      sequence = 0;
-
-    prop = icalproperty_new_sequence (sequence);
-
-    if (free_string)
-	deleteStr (s);
-
-    return (void*)prop;
-}
-
-
-/* This handles properties which have multiple values, which are separated by
-   ';' in vCalendar but ',' in iCalendar. So we just switch those. */
-void* multivalued_prop(int icaltype, VObject *object, icalcomponent *comp,
-		       icalvcal_defaults *defaults)
-{
-    icalproperty_kind kind = (icalproperty_kind)icaltype;
-    icalproperty *prop = NULL;
-    icalvalue *value;
-    icalvalue_kind value_kind;
-    char *s, *tmp_copy, *p;
-    int free_string;
-
-    s = get_string_value (object, &free_string);
-
-    tmp_copy = strdup (s);
-
-    if (free_string)
-	deleteStr (s);
-
-    if (tmp_copy) {
-	prop = icalproperty_new(kind);
-
-	value_kind = icalenum_property_kind_to_value_kind (icalproperty_isa (prop));
-
-	for (p = tmp_copy; *p; p++) {
-	    if (*p == ';')
-		*p = ',';
-	}
-
-	value = icalvalue_new_from_string (value_kind, tmp_copy);
-	icalproperty_set_value (prop, value);
-
-	free (tmp_copy);
-    }
-
-    return (void*)prop;
-}
-
-
-void* status_prop(int icaltype, VObject *object, icalcomponent *comp,
-		  icalvcal_defaults *defaults)
-{
-    icalproperty *prop = NULL;
-    char *s;
-    int free_string;
-    icalcomponent_kind kind;
-
-    kind = icalcomponent_isa (comp);
-
-    s = get_string_value (object, &free_string);
-
-    /* In vCalendar:
-       VEVENT can have: "NEEDS ACTION" (default), "SENT", "TENTATIVE",
-			"CONFIRMED", "DECLINED", "DELEGATED".
-       VTODO can have:  "ACCEPTED", "NEEDS ACTION" (default), "SENT",
-			"DECLINED", "COMPLETED", "DELEGATED".
-       (Those are the only 2 components - there is no VJOURNAL)
-
-       In iCalendar:
-       VEVENT can have: "TENTATIVE", "CONFIRMED", "CANCELLED".
-       VTODO can have:  "NEEDS-ACTION", "COMPLETED", "IN-PROCESS", "CANCELLED".
-
-       So for VEVENT if it is "TENTATIVE" or "CONFIRMED" we keep it, otherwise
-       we skip it.
-
-       For a VTODO if it is "NEEDS ACTION" we convert to "NEEDS-ACTION", if it
-       is "COMPLETED" we keep it, otherwise we skip it.
-    */
-    if (kind == ICAL_VEVENT_COMPONENT) {
-	if (!strcmp (s, "TENTATIVE"))
-	    prop = icalproperty_new_status (ICAL_STATUS_TENTATIVE);
-	else if (!strcmp (s, "CONFIRMED"))
-	    prop = icalproperty_new_status (ICAL_STATUS_CONFIRMED);
-
-    } else if (kind == ICAL_VTODO_COMPONENT) {
-	if (!strcmp (s, "NEEDS ACTION"))
-	    prop = icalproperty_new_status (ICAL_STATUS_NEEDSACTION);
-	else if (!strcmp (s, "COMPLETED"))
-	    prop = icalproperty_new_status (ICAL_STATUS_COMPLETED);
-
-    }
-
-    if (free_string)
-	deleteStr (s);
-
-    return (void*)prop;
-}
-
-
-void* utc_datetime_prop(int icaltype, VObject *object, icalcomponent *comp,
-			icalvcal_defaults *defaults)
-{
-    icalproperty_kind kind = (icalproperty_kind)icaltype;
-    icalproperty *prop; 
-    icalvalue *value;
-    icalvalue_kind value_kind;
-    char *s;
-    int free_string;
-    struct icaltimetype itt;
-
-    prop = icalproperty_new(kind);
-
-    value_kind = icalenum_property_kind_to_value_kind (icalproperty_isa(prop));
-
-    s = get_string_value (object, &free_string);
-
-    /* Convert it to an icaltimetype. */
-    itt = icaltime_from_string (s);
-
-    /* If it is a floating time, convert it to a UTC time. */
-    if (!itt.is_utc)
-      convert_floating_time_to_utc (&itt);
-
-    value = icalvalue_new_datetime (itt);
-    icalproperty_set_value(prop,value);
-
-    if (free_string)
-	deleteStr (s);
-
-    return (void*)prop;
-}
-
-
-/* Parse the interval from the RRULE, returning a pointer to the first char
-   after the interval and any whitespace. s points to the start of the
-   interval. error_message is set if an error occurs. */
-static char* rrule_parse_interval (char *s, struct icalrecurrencetype *recur,
-				   char **error_message)
-{
-  int interval = 0;
-
-  /* It must start with a digit. */
-  if (*s < '0' || *s > '9') {
-    *error_message = "Invalid Interval";
-    return NULL;
-  }
-
-  while (*s >= '0' && *s <= '9')
-    interval = (interval * 10) + (*s++ - '0');
-
-  /* It must be followed by whitespace. I'm not sure if anything else is
-     allowed. */
-  if (*s != ' ' && *s != '\t') {
-    *error_message = "Invalid Interval";
-    return NULL;
-  }
-
-  /* Skip any whitespace. */
-  while (*s == ' ' || *s == '\t')
-    s++;
-
-  recur->interval = interval;
-  return s;
-}
-
-
-/* Parse the duration from the RRULE, either a COUNT, e.g. '#5', or an UNTIL
-   date, e.g. 20020124T000000. error_message is set if an error occurs.
-   If no duration is given, '#2' is assumed. */
-static char* rrule_parse_duration (char *s, struct icalrecurrencetype *recur,
-				   char **error_message)
-{
-    /* If we've already found an error, just return. */
-    if (*error_message)
-	return NULL;
-
-    if (!s || *s == '\0') {
-	/* If we are at the end of the string, assume '#2'. */
-	recur->count = 2;
-
-    } else if (*s == '#') {
-        /* If it starts with a '#' it is the COUNT. Note that in vCalendar
-	   #0 means forever, and setting recur->count to 0 means the same. */
-	int count = 0;
-
-	s++;
-	while (*s >= '0' && *s <= '9')
-	    count = (count * 10) + (*s++ - '0');
-
-	recur->count = count;
-
-    } else if (*s >= '0' && *s <= '9') {
-	/* If it starts with a digit it must be the UNTIL date. */
-	char *e, buffer[20];
-	int len;
-
-	/* Find the end of the date. */
-	e = s;
-	while ((*e >= '0' && *e <= '9') || *e == 'T' || *e == 'Z')
-	    e++;
-
-	/* Check it is a suitable length. */
-	len = e - s;
-	if (len != 8 && len != 15 && len != 16) {
-	    *error_message = "Invalid End Date";
-	    return NULL;
-	}
-
-	/* Copy the date to our buffer and null-terminate it. */
-	strncpy (buffer, s, len);
-	buffer[len] = '\0';
-
-	/* Parse it into the until field. */
-	recur->until = icaltime_from_string (buffer);
-
-	/* In iCalendar UNTIL must be UTC if it is a DATE-TIME. But we
-	   don't really know what timezone the vCalendar times are in. So if
-	   it can be converted to a DATE value, we do that. Otherwise we just
-	   use the current Unix timezone. Should be OK 99% of the time. */
-	if (!recur->until.is_utc) {
-	    if (recur->until.hour == 0 && recur->until.minute == 0
-		&& recur->until.second == 0)
-		recur->until.is_date = 1;
-	    else
-		convert_floating_time_to_utc (&recur->until);
-	}
-
-	s = e;
-
-    } else {
-	*error_message = "Invalid Duration";
-	return NULL;
-    }
-
-
-    /* It must be followed by whitespace or the end of the string.
-       I'm not sure if anything else is allowed. */
-    if (*s != '\0' && *s != ' ' && *s != '\t') {
-	*error_message = "Invalid Duration";
-	return NULL;
-    }
-
-    return s;
-}
-
-
-static char* rrule_parse_weekly_days (char *s,
-				      struct icalrecurrencetype *recur,
-				      char **error_message)
-{
-    int i;
-
-    /* If we've already found an error, just return. */
-    if (*error_message)
-	return NULL;
-
-    for (i = 0; i < ICAL_BY_DAY_SIZE; i++) {
-	char *e;
-	int found_day, day;
-
-	found_day = -1;
-	for (day = 0; day < 7; day++) {
-	    if (!strncmp (weekdays[day], s, 2)) {
-		/* Check the next char is whitespace or the end of string. */
-		e = s + 2;
-		if (*e == ' ' || *e == '\t' || *e == '\0') {
-		    found_day = day;
-	    break;
-	}
-	    }
-	}
-
-	if (found_day == -1)
-	    break;
-	    
-	recur->by_day[i] = weekday_codes[day];
-
-	s = e;
-	/* Skip any whitespace. */
-	while (*s == ' ' || *s == '\t')
-	    s++;
-    }
-
-    /* Terminate the array, if it isn't full. */
-    if (i < ICAL_BY_DAY_SIZE)
-	recur->by_day[i] = ICAL_RECURRENCE_ARRAY_MAX;
-
-    return s;
-}
-
-
-static char* rrule_parse_monthly_days (char *s,
-				       struct icalrecurrencetype *recur,
-				       char **error_message)
-{
-    int i;
-
-    /* If we've already found an error, just return. */
-    if (*error_message)
-	return NULL;
-
-    for (i = 0; i < ICAL_BY_MONTHDAY_SIZE; i++) {
-	char *e;
-	int month_day;
-
-	if (!strncmp (s, "LD", 2)) {
-	    month_day = -1;
-	    e = s + 2;
-	} else {
-	    month_day = strtol (s, &e, 10);
-
-	    /* Check we got a valid day. */
-	    if (month_day < 1 || month_day > 31)
-		break;
-
-	    /* See if it is followed by a '+' or '-'. */
-	    if (*e == '+') {
-		e++;
-	    } else if (*e == '-') {
-		e++;
-		month_day = -month_day;
-	}
-    }
-
-	/* Check the next char is whitespace or the end of the string. */
-	if (*e != ' ' && *e != '\t' && *e != '\0')
-	    break;
-
-	recur->by_month_day[i] = month_day;
-
-	s = e;
-	/* Skip any whitespace. */
-	while (*s == ' ' || *s == '\t')
-	    s++;
-    }
-
-    /* Terminate the array, if it isn't full. */
-    if (i < ICAL_BY_MONTHDAY_SIZE)
-	recur->by_month_day[i] = ICAL_RECURRENCE_ARRAY_MAX;
-
-    return s;
-}
-
-
-static char* rrule_parse_monthly_positions (char *s,
-					    struct icalrecurrencetype *recur,
-					    char **error_message)
-{
-    int occurrences[ICAL_BY_DAY_SIZE];
-    int found_weekdays[7] = { 0 };
-    int i, num_positions, elems, month_position, day;
-    int num_weekdays, only_weekday;
-    char *e;
-
-    /* If we've already found an error, just return. */
-    if (*error_message)
-	return NULL;
-
-    /* First read the month position into our local occurrences array. */
-    for (i = 0; i < ICAL_BY_DAY_SIZE; i++) {
-	int month_position;
-
-	/* Check we got a valid position number. */
-	month_position = *s - '0';
-	if (month_position < 0 || month_position > 5)
-	    break;
-
-	/* See if it is followed by a '+' or '-'. */
-	e = s + 1;
-	if (*e == '+') {
-	    e++;
-	} else if (*e == '-') {
-	    e++;
-	    month_position = -month_position;
-	}
-
-	/* Check the next char is whitespace or the end of the string. */
-	if (*e != ' ' && *e != '\t' && *e != '\0')
-	    break;
-
-	occurrences[i] = month_position;
-
-	s = e;
-	/* Skip any whitespace. */
-	while (*s == ' ' || *s == '\t')
-	    s++;
-    }
-    num_positions = i;
-
-    /* Now read the weekdays in. */
-    for (;;) {
-	char *e;
-	int found_day, day;
-
-	found_day = -1;
-	for (day = 0; day < 7; day++) {
-	    if (!strncmp (weekdays[day], s, 2)) {
-		/* Check the next char is whitespace or the end of string. */
-		e = s + 2;
-		if (*e == ' ' || *e == '\t' || *e == '\0') {
-		    found_day = day;
-		    break;
-		}
-	    }
-	}
-
-	if (found_day == -1)
-	    break;
-	    
-	found_weekdays[found_day] = 1;
-
-	s = e;
-	/* Skip any whitespace. */
-	while (*s == ' ' || *s == '\t')
-	    s++;
-    }
-
-    /* Now merge them together into the recur->by_day array. If there is a
-       single position & weekday we output something like
-       'BYDAY=TU;BYSETPOS=2', so Outlook will understand it. */
-    num_weekdays = 0;
-    for (day = 0; day < 7; day++) {
-	if (found_weekdays[day]) {
-	    num_weekdays++;
-	    only_weekday = day;
-	}
-    }
-    if (num_positions == 1 && num_weekdays == 1) {
-	recur->by_day[0] = weekday_codes[only_weekday];
-	recur->by_day[1] = ICAL_RECURRENCE_ARRAY_MAX;
-
-	recur->by_set_pos[0] = occurrences[0];
-	recur->by_set_pos[1] = ICAL_RECURRENCE_ARRAY_MAX;
-    } else {
-	elems = 0;
-	for (i = 0; i < num_positions; i++) {
-	    month_position = occurrences[i];
-
-	    for (day = 0; day < 7; day++) {
-		if (found_weekdays[day]) {
-		    recur->by_day[elems] = (abs (month_position) * 8 + weekday_codes[day]) * ((month_position < 0) ? -1 : 1);
-		    elems++;
-		    if (elems == ICAL_BY_DAY_SIZE)
-			break;
-		}
-	    }
-
-	    if (elems == ICAL_BY_DAY_SIZE)
-		break;
-	}
-
-	/* Terminate the array, if it isn't full. */
-	if (elems < ICAL_BY_DAY_SIZE)
-	    recur->by_day[elems] = ICAL_RECURRENCE_ARRAY_MAX;
-    }
-
-    return s;
-}
-
-
-static char* rrule_parse_yearly_months (char *s,
-					struct icalrecurrencetype *recur,
-					char **error_message)
-{
-    int i;
-
-    /* If we've already found an error, just return. */
-    if (*error_message)
-	return NULL;
-
-    for (i = 0; i < ICAL_BY_MONTH_SIZE; i++) {
-	char *e;
-	int month;
-
-	month = strtol (s, &e, 10);
-
-	/* Check we got a valid month. */
-	if (month < 1 || month > 12)
-	  break;
-
-	/* Check the next char is whitespace or the end of the string. */
-	if (*e != ' ' && *e != '\t' && *e != '\0')
-	  break;
-
-	recur->by_month[i] = month;
-
-	s = e;
-	/* Skip any whitespace. */
-	while (*s == ' ' || *s == '\t')
-	    s++;
-    }
-
-    /* Terminate the array, if it isn't full. */
-    if (i < ICAL_BY_MONTH_SIZE)
-	recur->by_month[i] = ICAL_RECURRENCE_ARRAY_MAX;
-
-    return s;
-}
-
-
-static char* rrule_parse_yearly_days (char *s,
-				      struct icalrecurrencetype *recur,
-				      char **error_message)
-{
-    int i;
-
-    /* If we've already found an error, just return. */
-    if (*error_message)
-	return NULL;
-
-    for (i = 0; i < ICAL_BY_YEARDAY_SIZE; i++) {
-	char *e;
-	int year_day;
-
-	year_day = strtol (s, &e, 10);
-
-	/* Check we got a valid year_day. */
-	if (year_day < 1 || year_day > 366)
-	  break;
-
-	/* Check the next char is whitespace or the end of the string. */
-	if (*e != ' ' && *e != '\t' && *e != '\0')
-	  break;
-
-	recur->by_year_day[i] = year_day;
-
-	s = e;
-	/* Skip any whitespace. */
-	while (*s == ' ' || *s == '\t')
-	    s++;
-    }
-
-    /* Terminate the array, if it isn't full. */
-    if (i < ICAL_BY_YEARDAY_SIZE)
-	recur->by_year_day[i] = ICAL_RECURRENCE_ARRAY_MAX;
-
-    return s;
-}
-
-
-
-
-/* Converts an RRULE/EXRULE property.
-   NOTE: There are a few things that this doesn't handle:
-     1) vCalendar RRULE properties can contain an UNTIL date and a COUNT, and
-        the first to occur specifies the end of the recurrence. However they
-	are mutually exclusive in iCalendar. For now we just use the COUNT.
-     2) For MONTHLY By Position recurrences, if no modifiers are given they
-        are to be calculated based on the DTSTART, e.g. if DTSTART is on the
-	3rd Wednesday of the month then all occurrences are on the 3rd Wed.
-	This is awkward to do as we need to access the DTSTART property, which
-	may be after the RRULE property. So we don't do this at present.
-     3) The Extended Recurrence Rule Grammar - we only support the Basic rules.
-        The extended grammar supports rules embedded in other rules, MINUTELY
-	recurrences, time modifiers in DAILY rules and maybe other stuff.
-*/
-
-void* rule_prop(int icaltype, VObject *object, icalcomponent *comp,
-		icalvcal_defaults *defaults)
-{
-    icalproperty_kind kind = (icalproperty_kind)icaltype;
-    icalproperty *prop = NULL;
-    icalvalue *value;
-    icalvalue_kind value_kind;
-    char *s, *p, *error_message = NULL;
-    const char *property_name;
-    int free_string;
-    struct icalrecurrencetype recur;
-
-    s = get_string_value (object, &free_string);
-
-    property_name = vObjectName (object);
-
-    icalrecurrencetype_clear (&recur);
-
-    if (*s == 'D') {
-      /* The DAILY RRULE only has an interval and duration (COUNT/UNTIL). */
-	recur.freq = ICAL_DAILY_RECURRENCE;
-	p = rrule_parse_interval (s + 1, &recur, &error_message);
-	p = rrule_parse_duration (p, &recur, &error_message);
-    } else if (*s == 'W') {
-	/* The WEEKLY RRULE has weekday modifiers - MO TU WE. */
-	recur.freq = ICAL_WEEKLY_RECURRENCE;
-	p = rrule_parse_interval (s + 1, &recur, &error_message);
-	p = rrule_parse_weekly_days (p, &recur, &error_message);
-	p = rrule_parse_duration (p, &recur, &error_message);
-    } else if (*s == 'M' && *(s + 1) == 'D') {
-	/* The MONTHLY By Day RRULE has day number modifiers - 1 1- LD. */
-	recur.freq = ICAL_MONTHLY_RECURRENCE;
-	p = rrule_parse_interval (s + 2, &recur, &error_message);
-	p = rrule_parse_monthly_days (p, &recur, &error_message);
-	p = rrule_parse_duration (p, &recur, &error_message);
-    } else if (*s == 'M' && *(s + 1) == 'P') {
-	/* The MONTHLY By Position RRULE has position modifiers - 1 2- and
-	   weekday modifiers - MO TU. */
-	recur.freq = ICAL_MONTHLY_RECURRENCE;
-	p = rrule_parse_interval (s + 2, &recur, &error_message);
-	p = rrule_parse_monthly_positions (p, &recur, &error_message);
-	p = rrule_parse_duration (p, &recur, &error_message);
-    } else if (*s == 'Y' && *(s + 1) == 'M') {
-	/* The YEARLY By Month RRULE has month modifiers - 1 3 12. */
-	recur.freq = ICAL_YEARLY_RECURRENCE;
-	p = rrule_parse_interval (s + 2, &recur, &error_message);
-	p = rrule_parse_yearly_months (p, &recur, &error_message);
-	p = rrule_parse_duration (p, &recur, &error_message);
-    } else if (*s == 'Y' && *(s + 1) == 'D') {
-	/* The YEARLY By Day RRULE has day number modifiers - 100 200. */
-	recur.freq = ICAL_YEARLY_RECURRENCE;
-	p = rrule_parse_interval (s + 2, &recur, &error_message);
-	p = rrule_parse_yearly_days (p, &recur, &error_message);
-	p = rrule_parse_duration (p, &recur, &error_message);
-    } else {
-	error_message = "Invalid RRULE Frequency";
-    }
-
-    if (error_message) {
-	prop = create_parse_error_property (error_message, property_name, s);
-    } else {
-	if (!strcmp (property_name, "RRULE"))
-	    prop = icalproperty_new_rrule (recur);
-	else
-	    prop = icalproperty_new_exrule (recur);
-    }
-
-    if (free_string)
-	deleteStr (s);
-
-    return (void*)prop;
-}
-
-
-
-/* directly convertable property. The string representation of vcal is
-   the same as ical */
-
-void* dc_prop(int icaltype, VObject *object, icalcomponent *comp,
-	      icalvcal_defaults *defaults)
-{
-    icalproperty_kind kind = (icalproperty_kind)icaltype;
-    icalproperty *prop; 
-    icalvalue *value;
-    icalvalue_kind value_kind;
-    char *s,*t=0;
-    int free_string;
-
-
-    prop = icalproperty_new(kind);
-
-    value_kind = icalenum_property_kind_to_value_kind (icalproperty_isa(prop));
-
-    s = get_string_value (object, &free_string);
-
-    value = icalvalue_new_from_string(value_kind,s);
-
-    if (free_string)
-	deleteStr (s);
-
-    icalproperty_set_value(prop,value);
-
-    return (void*)prop;
-}
-
-
-/* My extraction program screwed up, so this table does not have all
-of the vcal properties in it. I didn't feel like re-doing the entire
-table, so you'll have to find the missing properties the hard way --
-the code will assert */
-
-struct conversion_table_struct conversion_table[] = 
-{
-{VCCalProp,            COMPONENT, comp,         ICAL_VCALENDAR_COMPONENT},
-{VCTodoProp,           COMPONENT, comp,         ICAL_VTODO_COMPONENT},
-{VCEventProp,          COMPONENT, comp,         ICAL_VEVENT_COMPONENT},
-{VCAAlarmProp,         COMPONENT, alarm_comp,   ICAL_XAUDIOALARM_COMPONENT},
-{VCDAlarmProp,         COMPONENT, alarm_comp,   ICAL_XDISPLAYALARM_COMPONENT},
-{VCMAlarmProp,         COMPONENT, alarm_comp,   ICAL_XEMAILALARM_COMPONENT},
-{VCPAlarmProp,         COMPONENT, alarm_comp,   ICAL_XPROCEDUREALARM_COMPONENT},
-
-/* These can all be converted directly by parsing the string into a libical
-   value. */
-{VCClassProp,          PROPERTY,  dc_prop,       ICAL_CLASS_PROPERTY},
-{VCDescriptionProp,    PROPERTY,  dc_prop,       ICAL_DESCRIPTION_PROPERTY},
-{VCAttendeeProp,       PROPERTY,  dc_prop,       ICAL_ATTENDEE_PROPERTY},
-{VCDTendProp,          PROPERTY,  dc_prop,       ICAL_DTEND_PROPERTY},
-{VCDTstartProp,        PROPERTY,  dc_prop,       ICAL_DTSTART_PROPERTY},
-{VCDueProp,            PROPERTY,  dc_prop,       ICAL_DUE_PROPERTY},
-{VCLocationProp,       PROPERTY,  dc_prop,       ICAL_LOCATION_PROPERTY},
-{VCSummaryProp,        PROPERTY,  dc_prop,       ICAL_SUMMARY_PROPERTY},
-{VCUniqueStringProp,   PROPERTY,  dc_prop,       ICAL_UID_PROPERTY},
-{VCURLProp,            PROPERTY,  dc_prop,       ICAL_URL_PROPERTY},
-{VCPriorityProp,       PROPERTY,  dc_prop,       ICAL_PRIORITY_PROPERTY},
-
-/* These can contain multiple values, which are separated in ';' in vCalendar
-   but ',' in iCalendar. */
-{VCCategoriesProp,     PROPERTY,  multivalued_prop,ICAL_CATEGORIES_PROPERTY},
-{VCRDateProp,          PROPERTY,  multivalued_prop,ICAL_RDATE_PROPERTY},
-{VCExpDateProp,        PROPERTY,  multivalued_prop,ICAL_EXDATE_PROPERTY},
-
-/* These can be in floating time in vCalendar, but must be in UTC in iCalendar.
- */
-{VCDCreatedProp,       PROPERTY,  utc_datetime_prop,ICAL_CREATED_PROPERTY},
-{VCLastModifiedProp,   PROPERTY,  utc_datetime_prop,ICAL_LASTMODIFIED_PROPERTY},
-{VCCompletedProp,      PROPERTY,  utc_datetime_prop,ICAL_COMPLETED_PROPERTY},
-
-{VCTranspProp,         PROPERTY,  transp_prop,   ICAL_TRANSP_PROPERTY},
-{VCSequenceProp,       PROPERTY,  sequence_prop, ICAL_SEQUENCE_PROPERTY},
-{VCStatusProp,         PROPERTY,  status_prop,   ICAL_STATUS_PROPERTY},
-{VCRRuleProp,          PROPERTY,  rule_prop,     ICAL_RRULE_PROPERTY},
-{VCXRuleProp,          PROPERTY,  rule_prop,     ICAL_EXRULE_PROPERTY},
-
-{VCRSVPProp,           UNSUPPORTED, rsvp_parameter,ICAL_RSVP_PARAMETER  },
-{VCEncodingProp,       UNSUPPORTED, parameter,     ICAL_ENCODING_PARAMETER},
-{VCRoleProp,           UNSUPPORTED, parameter,     ICAL_ROLE_PARAMETER},
-
-/* We don't want the old VERSION or PRODID properties copied across as they
-   are now incorrect. New VERSION & PRODID properties are added instead. */
-{VCVersionProp,        IGNORE,	  0,             0},
-{VCProdIdProp,         IGNORE,    0,             0},
-
-/* We ignore DAYLIGHT and TZ properties of the toplevel object, since we can't
-   really do much with them. */
-{VCDayLightProp,       IGNORE,	  0,             0},
-{VCTimeZoneProp,       IGNORE,	  0,             0},
-
-/* These are all alarm properties. We handle these when the alarm component
-   is created, so we ignore them when doing the automatic conversions.
-   "TYPE" is used in AALARM, but doesn't seem to have a name in vobject.h. */
-{"TYPE",               IGNORE,0,            0},
-{VCRunTimeProp,        IGNORE,0,            0},
-{VCSnoozeTimeProp,     IGNORE,0,            0},
-{VCRepeatCountProp,    IGNORE,0,            0},
-{VCValueProp,          IGNORE,0,            0},
-{VCProcedureNameProp,  IGNORE,0,            0},
-{VCDisplayStringProp,  IGNORE,0,            0},
-{VCEmailAddressProp,   IGNORE,0,            0},
-{VCNoteProp,           IGNORE,0,            0},
-
-{VCQuotedPrintableProp,UNSUPPORTED,0,            0},
-{VC7bitProp,           UNSUPPORTED,0,            0},
-{VC8bitProp,           UNSUPPORTED,0,            0},
-{VCAdditionalNamesProp,UNSUPPORTED,0,            0},
-{VCAdrProp,            UNSUPPORTED,0,            0},
-{VCAgentProp,          UNSUPPORTED,0,            0},
-{VCAIFFProp,           UNSUPPORTED,0,            0},
-{VCAOLProp,            UNSUPPORTED,0,            0},
-{VCAppleLinkProp,      UNSUPPORTED,0,            0},
-{VCAttachProp,         UNSUPPORTED,0,            0},
-{VCATTMailProp,        UNSUPPORTED,0,            0},
-{VCAudioContentProp,   UNSUPPORTED,0,            0},
-{VCAVIProp,            UNSUPPORTED,0,            0},
-{VCBase64Prop,         UNSUPPORTED,0,            0},
-{VCBBSProp,            UNSUPPORTED,0,            0},
-{VCBirthDateProp,      UNSUPPORTED,0,            0},
-{VCBMPProp,            UNSUPPORTED,0,            0},
-{VCBodyProp,           UNSUPPORTED,0,            0},
-{VCCaptionProp,        UNSUPPORTED,0,            0},
-{VCCarProp,            UNSUPPORTED,0,            0},
-{VCCellularProp,       UNSUPPORTED,0,            0},
-{VCCGMProp,            UNSUPPORTED,0,            0},
-{VCCharSetProp,        UNSUPPORTED,0,            0},
-{VCCIDProp,            UNSUPPORTED,0,            0},
-{VCCISProp,            UNSUPPORTED,0,            0},
-{VCCityProp,           UNSUPPORTED,0,            0},
-{VCCommentProp,        UNSUPPORTED,0,            0},
-{VCCountryNameProp,    UNSUPPORTED,0,            0},
-{VCDataSizeProp,       UNSUPPORTED,0,            0},
-{VCDeliveryLabelProp,  UNSUPPORTED,0,            0},
-{VCDIBProp,            UNSUPPORTED,0,            0},
-{VCDomesticProp,       UNSUPPORTED,0,            0},
-{VCEndProp,            UNSUPPORTED,0,            0},
-{VCEWorldProp,         UNSUPPORTED,0,            0},
-{VCExNumProp,          UNSUPPORTED,0,            0},
-{VCExpectProp,         UNSUPPORTED,0,            0},
-{VCFamilyNameProp,     UNSUPPORTED,0,            0},
-{VCFaxProp,            UNSUPPORTED,0,            0},
-{VCFullNameProp,       UNSUPPORTED,0,            0},
-{VCGeoProp,            UNSUPPORTED,0,            0},
-{VCGeoLocationProp,    UNSUPPORTED,0,            0},
-{VCGIFProp,            UNSUPPORTED,0,            0},
-{VCGivenNameProp,      UNSUPPORTED,0,            0},
-{VCGroupingProp,       UNSUPPORTED,0,            0},
-{VCHomeProp,           UNSUPPORTED,0,            0},
-{VCIBMMailProp,        UNSUPPORTED,0,            0},
-{VCInlineProp,         UNSUPPORTED,0,            0},
-{VCInternationalProp,  UNSUPPORTED,0,            0},
-{VCInternetProp,       UNSUPPORTED,0,            0},
-{VCISDNProp,           UNSUPPORTED,0,            0},
-{VCJPEGProp,           UNSUPPORTED,0,            0},
-{VCLanguageProp,       UNSUPPORTED,0,            0},
-{VCLastRevisedProp,    UNSUPPORTED,0,            0},
-{VCLogoProp,           UNSUPPORTED,0,            0},
-{VCMailerProp,         UNSUPPORTED,0,            0},
-{VCMCIMailProp,        UNSUPPORTED,0,            0},
-{VCMessageProp,        UNSUPPORTED,0,            0},
-{VCMETProp,            UNSUPPORTED,0,            0},
-{VCModemProp,          UNSUPPORTED,0,            0},
-{VCMPEG2Prop,          UNSUPPORTED,0,            0},
-{VCMPEGProp,           UNSUPPORTED,0,            0},
-{VCMSNProp,            UNSUPPORTED,0,            0},
-{VCNamePrefixesProp,   UNSUPPORTED,0,            0},
-{VCNameProp,           UNSUPPORTED,0,            0},
-{VCNameSuffixesProp,   UNSUPPORTED,0,            0},
-{VCOrgNameProp,        UNSUPPORTED,0,            0},
-{VCOrgProp,            UNSUPPORTED,0,            0},
-{VCOrgUnit2Prop,       UNSUPPORTED,0,            0},
-{VCOrgUnit3Prop,       UNSUPPORTED,0,            0},
-{VCOrgUnit4Prop,       UNSUPPORTED,0,            0},
-{VCOrgUnitProp,        UNSUPPORTED,0,            0},
-{VCPagerProp,          UNSUPPORTED,0,            0},
-{VCParcelProp,         UNSUPPORTED,0,            0},
-{VCPartProp,           UNSUPPORTED,0,            0},
-{VCPCMProp,            UNSUPPORTED,0,            0},
-{VCPDFProp,            UNSUPPORTED,0,            0},
-{VCPGPProp,            UNSUPPORTED,0,            0},
-{VCPhotoProp,          UNSUPPORTED,0,            0},
-{VCPICTProp,           UNSUPPORTED,0,            0},
-{VCPMBProp,            UNSUPPORTED,0,            0},
-{VCPostalBoxProp,      UNSUPPORTED,0,            0},
-{VCPostalCodeProp,     UNSUPPORTED,0,            0},
-{VCPostalProp,         UNSUPPORTED,0,            0},
-{VCPowerShareProp,     UNSUPPORTED,0,            0},
-{VCPreferredProp,      UNSUPPORTED,0,            0},
-{VCProdigyProp,        UNSUPPORTED,0,            0},
-{VCPronunciationProp,  UNSUPPORTED,0,            0},
-{VCPSProp,             UNSUPPORTED,0,            0},
-{VCPublicKeyProp,      UNSUPPORTED,0,            0},
-{VCQPProp,             UNSUPPORTED,0,            0},
-{VCQuickTimeProp,      UNSUPPORTED,0,            0},
-{VCRegionProp,         UNSUPPORTED,0,            0},
-{VCResourcesProp,      UNSUPPORTED,0,            0},
-{VCRNumProp,           UNSUPPORTED,0,            0},
-{VCStartProp,          UNSUPPORTED,0,            0},
-{VCStreetAddressProp,  UNSUPPORTED,0,            0},
-{VCSubTypeProp,        UNSUPPORTED,0,            0},
-{VCTelephoneProp,      UNSUPPORTED,0,            0},
-{VCTIFFProp,           UNSUPPORTED,0,            0},
-{VCTitleProp,          UNSUPPORTED,0,            0},
-{VCTLXProp,            UNSUPPORTED,0,            0},
-{VCURLValueProp,       UNSUPPORTED,0,            0},
-{VCVideoProp,          UNSUPPORTED,0,            0},
-{VCVoiceProp,          UNSUPPORTED,0,            0},
-{VCWAVEProp,           UNSUPPORTED,0,            0},
-{VCWMFProp,            UNSUPPORTED,0,            0},
-{VCWorkProp,           UNSUPPORTED,0,            0},
-{VCX400Prop,           UNSUPPORTED,0,            0},
-{VCX509Prop,           UNSUPPORTED,0,            0},
-
-{0,0,0,0}
-};
-
-
-#if 0
-		switch (vObjectValueType(object)) {
-		    case VCVT_USTRINGZ: {
-			char c;
-			char *t,*s;
-			s = t = fakeCString(vObjectUStringZValue(object));
-			printf(" ustringzstring:%s\n",s);
-			deleteStr(s);
-			break;
-		    }
-		    case VCVT_STRINGZ: {
-			char c;
-			const char *s = vObjectStringZValue(object);
-			printf(" stringzstring:%s\n",s);
-			break;
-		    }
-		    case VCVT_UINT:
-		    {
-			int i = vObjectIntegerValue(object);
-			printf(" int:%d\n",i);
-			break;
-		    }
-		    case VCVT_ULONG:
-		    {
-			long l = vObjectLongValue(object); 
-			printf(" int:%d\n",l);
-			break;
-		    }
-		    case VCVT_VOBJECT:
-		    {
-			printf("ERROR, should not get here\n");
-			break;
-		    }
-		    case VCVT_RAW:
-		    case 0:
-		    default:
-			break;
-		}
-
-#endif
diff --git a/libical/src/libicalvcal/icalvcal.h b/libical/src/libicalvcal/icalvcal.h
deleted file mode 100644
index e5e0be7831..0000000000
--- a/libical/src/libicalvcal/icalvcal.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* -*- Mode: C -*-*/
-/*======================================================================
- FILE: icalvcal.h
- CREATOR: eric 25 May 00
-
- 
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The original code is icalvcal.h
-
-
-======================================================================*/
-
-#ifndef ICALVCAL_H
-#define ICALVCAL_H
-
-#include <libical/ical.h>
-#include "vcc.h"
-
-/* These are used as default values if the values are missing in the vCalendar
-   file. Gnome Calendar, for example, does not save the URL of the audio alarm,
-   so we have to add a value here to make a valid iCalendar object. */
-typedef struct _icalvcal_defaults icalvcal_defaults;
-struct _icalvcal_defaults {
-    char *alarm_audio_url;
-    char *alarm_audio_fmttype;
-    char *alarm_description;
-};
-
-
-/* Convert a vObject into an icalcomponent */
-
-icalcomponent* icalvcal_convert(VObject *object);
-
-
-icalcomponent* icalvcal_convert_with_defaults (VObject *object,
-					       icalvcal_defaults *defaults);
-
-#endif /* !ICALVCAL_H */
-
-
-
diff --git a/libical/src/libicalvcal/port.h b/libical/src/libicalvcal/port.h
deleted file mode 100644
index 1768beebd8..0000000000
--- a/libical/src/libicalvcal/port.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-                                                                               
-For purposes of this license notice, the term Licensors shall mean,            
-collectively, Apple Computer, Inc., AT&T Corp., International                  
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-The term Licensor shall mean any of the Licensors.                             
-                                                                               
-Subject to acceptance of the following conditions, permission is hereby        
-granted by Licensors without the need for written agreement and without        
-license or royalty fees, to use, copy, modify and distribute this              
-software for any purpose.                                                      
-                                                                               
-The above copyright notice and the following four paragraphs must be           
-reproduced in all copies of this software and any software including           
-this software.                                                                 
-                                                                               
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
-MODIFICATIONS.                                                                 
-                                                                               
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
-DAMAGE.                                                                        
-                                                                               
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
-PURPOSE.                                                                       
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
-disclosure by the government are subject to restrictions set forth in          
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
-
-***************************************************************************/
-
-#ifndef __PORT_H__
-#define __PORT_H__ 1
-
-
-#if defined(__CPLUSPLUS__) || defined(__cplusplus)
-extern "C" {
-#endif
-                     
-/* some of these #defines are commented out because */
-/* Visual C++ sets them on the compiler command line instead */
-
-/* #define _DEBUG */
-/* #define WIN32 */
-/* #define WIN16 */
-/* #define _WINDOWS */
-/* #define __MWERKS__ */
-/* #define INCLUDEMFC */
-
-#define	vCardClipboardFormat		"+//ISBN 1-887687-00-9::versit::PDI//vCard"
-#define	vCalendarClipboardFormat	"+//ISBN 1-887687-00-9::versit::PDI//vCalendar"
-
-/* The above strings vCardClipboardFormat and vCalendarClipboardFormat 
-are globally unique IDs which can be used to generate clipboard format 
-ID's as per the requirements of a specific platform. For example, in 
-Windows they are used as the parameter in a call to RegisterClipboardFormat. 
-For example:
-
-  CLIPFORMAT foo = RegisterClipboardFormat(vCardClipboardFormat);
-
-*/
-
-#define vCardMimeType		"text/x-vCard"
-#define vCalendarMimeType	"text/x-vCalendar"
-
-#define DLLEXPORT(t) t
-
-#ifndef FALSE
-#define FALSE	0
-#endif
-#ifndef TRUE
-#define TRUE	1
-#endif
-
-#define stricmp strcasecmp
-	
-#if defined(__CPLUSPLUS__) || defined(__cplusplus)
-}
-#endif
-
-#endif /* __PORT_H__ */
diff --git a/libical/src/libicalvcal/vcaltest.c b/libical/src/libicalvcal/vcaltest.c
deleted file mode 100644
index 5528aab1d1..0000000000
--- a/libical/src/libicalvcal/vcaltest.c
+++ /dev/null
@@ -1,118 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include "vcaltmp.h"
-
-#if 0
-This testcase would generate a file call "frankcal.vcf" with
-the following content:
-
-BEGIN:VCALENDAR
-DCREATED:19960523T100522
-GEO:37.24,-17.87
-PRODID:-//Frank Dawson/Hand Crafted In North Carolina//NONSGML Made By Hand//EN
-VERSION:0.3
-BEGIN:VEVENT
-DTSTART:19960523T120000
-DTEND:19960523T130000
-DESCRIPTION;QUOTED-PRINTABLE:VERSIT PDI PR Teleconference/Interview =0A=
-With Tom Streeter and Frank Dawson - Discuss VERSIT PDI project and vCard and vCalendar=0A=
-activities with European Press representatives.
-SUMMARY:VERSIT PDI PR Teleconference/Interview
-SUBTYPE:PHONE CALL
-STATUS:CONFIRMED
-TRANSP:19960523T100522-4000F100582713-009251
-UID:http://www.ibm.com/raleigh/fdawson/~c:\or2\orgfiles\versit.or2
-DALARM:19960523T114500;5;3;Your Telecon Starts At Noon!!!;
-MALARM:19960522T120000;;;fdawson@raleigh.ibm.com;Remember 05/23 Noon Telecon!!!;
-PALARM:19960523T115500;;;c:\or2\organize.exe c:\or2\orgfiles\versit.or2;
-X-LDC-OR2-OLE:c:\temp\agenda.doc
-END:VEVENT
-
-BEGIN:VTODO
-DUE:19960614T0173000
-DESCRIPTION:Review VCalendar helper API.
-END:VTODO
-
-END:VCALENDAR
-
-#endif
-
-FILE *cfp;
-
-void testVcalAPIs() {
-    FILE *fp;
-    VObject *vcal, *vevent;
-#if _CONSOLE
-    cfp = stdout;
-#else
-    cfp = fopen("vcaltest.out","w");
-#endif
-    if (cfp == 0) return;
-    vcal = vcsCreateVCal(
-	"19960523T100522",
-	"37.24,-17.87",
-	"-//Frank Dawson/Hand Crafted In North Carolina//NONSGML Made By Hand//EN",
-	0,
-	"0.3"
-	);
-
-    vevent = vcsAddEvent(
-	vcal,
-	"19960523T120000",
-	"19960523T130000",
-	"VERSIT PDI PR Teleconference/Interview \nWith Tom Streeter and Frank Dawson - Discuss VERSIT PDI project and vCard and vCalendar\nactivities with European Press representatives.",
-	"VERSIT PDI PR Teleconference/Interview",
-	"PHONE CALL",
-	0,
-	"CONFIRMED",
-	"19960523T100522-4000F100582713-009251",
-	"http://www.ibm.com/raleigh/fdawson/~c:\\or2\\orgfiles\\versit.or2",
-	0
-	);
-    
-    vcsAddDAlarm(vevent, "19960523T114500", "5", "3",
-	    "Your Telecon Starts At Noon!!!");
-    vcsAddMAlarm(vevent, "19960522T120000", 0, 0, "fdawson@raleigh.ibm.com",
-	    "Remember 05/23 Noon Telecon!!!");
-    vcsAddPAlarm(vevent, "19960523T115500", 0 ,0,
-	    "c:\\or2\\organize.exe c:\\or2\\orgfiles\\versit.or2");
-    
-    addPropValue(vevent, "X-LDC-OR2-OLE", "c:\\temp\\agenda.doc");
-
-    vcsAddTodo(
-	vcal,
-	0,
-	"19960614T0173000",
-	0,
-	"Review VCalendar helper API.",
-	0,
-	0,
-	0,
-	0,
-	0,
-	0
-	);
-
-    /* now do something to the resulting VObject */
-    /* pretty print on stdout for fun */
-    printVObject(cfp,vcal);
-    /* open the output text file */
-
-#define OUTFILE "frankcal.vcf"
-
-    fp = fopen(OUTFILE, "w");
-    if (fp) {
-	/* write it in text form */
-	writeVObject(fp,vcal);
-	fclose(fp);
-	}
-    else {
-	fprintf(cfp,"open output file '%s' failed\n", OUTFILE);
-	}
-    if (cfp != stdout) fclose(cfp);
-    }
-
-void main() {
-    testVcalAPIs();
-    }
-
diff --git a/libical/src/libicalvcal/vcaltmp.c b/libical/src/libicalvcal/vcaltmp.c
deleted file mode 100644
index ccb21a649a..0000000000
--- a/libical/src/libicalvcal/vcaltmp.c
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
-This module provides some helper APIs for creating
-a VCalendar object.
-
-Note on APIs:
-	1.	The APIs does not attempt to verify if the arguments
-		passed are correct.
-	2.	Where the argument to an API is not applicable, pass
-		the value 0.
-	3.	See the test program at the bottom of this file as an
-		example of usage.
-	4.	This code calls APIs in vobject.c. 
-
-*/
-
-/***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-                                                                               
-For purposes of this license notice, the term Licensors shall mean,            
-collectively, Apple Computer, Inc., AT&T Corp., International                  
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-The term Licensor shall mean any of the Licensors.                             
-                                                                               
-Subject to acceptance of the following conditions, permission is hereby        
-granted by Licensors without the need for written agreement and without        
-license or royalty fees, to use, copy, modify and distribute this              
-software for any purpose.                                                      
-                                                                               
-The above copyright notice and the following four paragraphs must be           
-reproduced in all copies of this software and any software including           
-this software.                                                                 
-                                                                               
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
-MODIFICATIONS.                                                                 
-                                                                               
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
-DAMAGE.                                                                        
-                                                                               
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
-PURPOSE.                                                                       
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
-disclosure by the government are subject to restrictions set forth in          
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
-
-***************************************************************************/
-
-
-#include <stdio.h>
-#include <string.h>
-#include "vcaltmp.h"
-
-	
-DLLEXPORT(VObject*) vcsCreateVCal(
-	char *date_created,
-	char *location,
-	char *product_id,
-	char *time_zone,
-	char *version
-	)
-    {
-    VObject *vcal = newVObject(VCCalProp);
-#define Z(p,v) if (v) addPropValue(vcal,p,v);
-    Z(VCDCreatedProp, date_created);
-    Z(VCLocationProp, location)
-    Z(VCProdIdProp, product_id)
-    Z(VCTimeZoneProp, time_zone)
-    Z(VCVersionProp, version)
-#undef Z
-    return vcal;
-    }
-
-
-DLLEXPORT(VObject*) vcsAddEvent(
-	VObject *vcal,
-	char *start_date_time,
-	char *end_date_time,
-	char *description,
-	char *summary,
-	char *categories,
-	char *classification,
-	char *status,
-	char *transparency,
-	char *uid,
-	char *url
-	)
-    {
-    VObject *vevent = addProp(vcal,VCEventProp);
-#define Z(p,v) if (v) addPropValue(vevent,p,v);
-    Z(VCDTstartProp,start_date_time);
-    Z(VCDTendProp,end_date_time);
-    if (description) {
-	VObject *p = addPropValue(vevent,VCDescriptionProp,description);
-	if (strchr(description,'\n'))
-	    addProp(p,VCQuotedPrintableProp);
-	}
-    Z(VCSummaryProp,summary);
-    Z(VCCategoriesProp,categories);
-    Z(VCClassProp,classification);
-    Z(VCStatusProp,status);
-    Z(VCTranspProp,transparency);
-    Z(VCUniqueStringProp,uid);
-    Z(VCURLProp,url);
-#undef Z
-    return vevent;
-    }
-
-
-DLLEXPORT(VObject*) vcsAddTodo(
-	VObject *vcal,
-	char *start_date_time,
-	char *due_date_time,
-	char *date_time_complete,
-	char *description,
-	char *summary,
-	char *priority,
-	char *classification,
-	char *status,
-	char *uid,
-	char *url
-	)
-    {
-    VObject *vtodo = addProp(vcal,VCTodoProp);
-#define Z(p,v) if (v) addPropValue(vtodo,p,v);
-    Z(VCDTstartProp,start_date_time);
-    Z(VCDueProp,due_date_time);
-    Z(VCCompletedProp,date_time_complete);
-    if (description) {
-	VObject *p = addPropValue(vtodo,VCDescriptionProp,description);
-	if (strchr(description,'\n'))
-	    addProp(p,VCQuotedPrintableProp);
-	}
-    Z(VCSummaryProp,summary);
-    Z(VCPriorityProp,priority);
-    Z(VCClassProp,classification);
-    Z(VCStatusProp,status);
-    Z(VCUniqueStringProp,uid);
-    Z(VCURLProp,url);
-#undef Z
-    return vtodo;
-    }
-
-
-DLLEXPORT(VObject*) vcsAddAAlarm(
-	VObject *vevent,
-	char *run_time,
-	char *snooze_time,
-	char *repeat_count,
-	char *audio_content
-	)
-    {
-    VObject *aalarm= addProp(vevent,VCAAlarmProp);
-#define Z(p,v) if (v) addPropValue(aalarm,p,v);
-    Z(VCRunTimeProp,run_time);
-    Z(VCSnoozeTimeProp,snooze_time);
-    Z(VCRepeatCountProp,repeat_count);
-    Z(VCAudioContentProp,audio_content);
-#undef Z
-    return aalarm;
-    }
-
-
-DLLEXPORT(VObject*) vcsAddMAlarm(
-	VObject *vevent,
-	char *run_time,
-	char *snooze_time,
-	char *repeat_count,
-	char *email_address,
-	char *note
-	)
-    {
-    VObject *malarm= addProp(vevent,VCMAlarmProp);
-#define Z(p,v) if (v) addPropValue(malarm,p,v);
-    Z(VCRunTimeProp,run_time);
-    Z(VCSnoozeTimeProp,snooze_time);
-    Z(VCRepeatCountProp,repeat_count);
-    Z(VCEmailAddressProp,email_address);
-    Z(VCNoteProp,note);
-#undef Z
-    return malarm;
-    }
-
-
-DLLEXPORT(VObject*) vcsAddDAlarm(
-	VObject *vevent,
-	char *run_time,
-	char *snooze_time,
-	char *repeat_count,
-	char *display_string
-	)
-    {
-    VObject *dalarm= addProp(vevent,VCDAlarmProp);
-#define Z(p,v) if (v) addPropValue(dalarm,p,v);
-    Z(VCRunTimeProp,run_time);
-    Z(VCSnoozeTimeProp,snooze_time);
-    Z(VCRepeatCountProp,repeat_count);
-    Z(VCDisplayStringProp,display_string);
-#undef Z
-    return dalarm;
-    }
-
-
-DLLEXPORT(VObject*) vcsAddPAlarm(
-	VObject *vevent,
-	char *run_time,
-	char *snooze_time,
-	char *repeat_count,
-	char *procedure_name
-	)
-    {
-    VObject *palarm= addProp(vevent,VCPAlarmProp);
-#define Z(p,v) if (v) addPropValue(palarm,p,v);
-    Z(VCRunTimeProp,run_time);
-    Z(VCSnoozeTimeProp,snooze_time);
-    Z(VCRepeatCountProp,repeat_count);
-    Z(VCProcedureNameProp,procedure_name);
-#undef Z
-    return palarm;
-    }
-
-    
-#ifdef _TEST
-
-#if 0
-This testcase would generate a file call "frankcal.vcf" with
-the following content:
-
-BEGIN:VCALENDAR
-DCREATED:19960523T100522
-GEO:37.24,-17.87
-PRODID:-//Frank Dawson/Hand Crafted In North Carolina//NONSGML Made By Hand//EN
-VERSION:0.3
-BEGIN:VEVENT
-DTSTART:19960523T120000
-DTEND:19960523T130000
-DESCRIPTION;QUOTED-PRINTABLE:VERSIT PDI PR Teleconference/Interview =0A=
-With Tom Streeter and Frank Dawson - Discuss VERSIT PDI project and vCard and vCalendar=0A=
-activities with European Press representatives.
-SUMMARY:VERSIT PDI PR Teleconference/Interview
-CATEGORIES:PHONE CALL
-STATUS:CONFIRMED
-TRANSP:19960523T100522-4000F100582713-009251
-UID:http://www.ibm.com/raleigh/fdawson/~c:\or2\orgfiles\versit.or2
-DALARM:19960523T114500;5;3;Your Telecon Starts At Noon!!!;
-MALARM:19960522T120000;;;fdawson@raleigh.ibm.com;Remember 05/23 Noon Telecon!!!;
-PALARM:19960523T115500;;;c:\or2\organize.exe c:\or2\orgfiles\versit.or2;
-X-LDC-OR2-OLE:c:\temp\agenda.doc
-END:VEVENT
-
-BEGIN:VTODO
-DUE:19960614T0173000
-DESCRIPTION:Review VCalendar helper API.
-END:VTODO
-
-END:VCALENDAR
-
-#endif
-
-void testVcalAPIs() {
-    FILE *fp;
-    VObject *vcal = vcsCreateVCal(
-	"19960523T100522",
-	"37.24,-17.87",
-	"-//Frank Dawson/Hand Crafted In North Carolina//NONSGML Made By Hand//EN",
-	0,
-	"0.3"
-	);
-
-    VObject *vevent = vcsAddEvent(
-	vcal,
-	"19960523T120000",
-	"19960523T130000",
-	"VERSIT PDI PR Teleconference/Interview \nWith Tom Streeter and Frank Dawson - Discuss VERSIT PDI project and vCard and vCalendar\nactivities with European Press representatives.",
-	"VERSIT PDI PR Teleconference/Interview",
-	"PHONE CALL",
-	0,
-	"CONFIRMED",
-	"19960523T100522-4000F100582713-009251",
-	"http://www.ibm.com/raleigh/fdawson/~c:\\or2\\orgfiles\\versit.or2",
-	0
-	);
-    
-    vcsAddDAlarm(vevent, "19960523T114500", "5", "3",
-	    "Your Telecon Starts At Noon!!!");
-    vcsAddMAlarm(vevent, "19960522T120000", 0, 0, "fdawson@raleigh.ibm.com",
-	    "Remember 05/23 Noon Telecon!!!");
-    vcsAddPAlarm(vevent, "19960523T115500", 0 ,0,
-	    "c:\\or2\\organize.exe c:\\or2\\orgfiles\\versit.or2");
-    
-    addPropValue(vevent, "X-LDC-OR2-OLE", "c:\\temp\\agenda.doc");
-
-    vcsAddTodo(
-	vcal,
-	0,
-	"19960614T0173000",
-	0,
-	"Review VCalendar helper API.",
-	0,
-	0,
-	0,
-	0,
-	0,
-	0
-	);
-
-    /* now do something to the resulting VObject */
-    /* pretty print on stdout for fun */
-    printVObject(vcal);
-    /* open the output text file */
-
-#define OUTFILE "frankcal.vcf"
-
-    fp = fopen(OUTFILE, "w");
-    if (fp) {
-	/* write it in text form */
-	writeVObject(fp,vcal);
-	fclose(fp);
-	}
-    else {
-	printf("open output file '%s' failed\n", OUTFILE);
-	}
-    }
-
-void main() {
-    testVcalAPIs();
-    }
-
-#endif
-
-
-/* end of source file vcaltmp.c */
diff --git a/libical/src/libicalvcal/vcaltmp.h b/libical/src/libicalvcal/vcaltmp.h
deleted file mode 100644
index 4c4afde963..0000000000
--- a/libical/src/libicalvcal/vcaltmp.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-                                                                               
-For purposes of this license notice, the term Licensors shall mean,            
-collectively, Apple Computer, Inc., AT&T Corp., International                  
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-The term Licensor shall mean any of the Licensors.                             
-                                                                               
-Subject to acceptance of the following conditions, permission is hereby        
-granted by Licensors without the need for written agreement and without        
-license or royalty fees, to use, copy, modify and distribute this              
-software for any purpose.                                                      
-                                                                               
-The above copyright notice and the following four paragraphs must be           
-reproduced in all copies of this software and any software including           
-this software.                                                                 
-                                                                               
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
-MODIFICATIONS.                                                                 
-                                                                               
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
-DAMAGE.                                                                        
-                                                                               
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
-PURPOSE.                                                                       
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
-disclosure by the government are subject to restrictions set forth in          
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
-
-***************************************************************************/
-
-#include "vcc.h"
-
-#ifndef __VCALTMP_H__
-#define __VCALTMP_H__
-
-#if defined(__CPLUSPLUS__) || defined(__cplusplus)
-extern "C" {
-#endif
-
-extern DLLEXPORT(VObject*) vcsCreateVCal(
-	char *date_created,
-	char *location,
-	char *product_id,
-	char *time_zone,
-	char *version
-	);
-
-extern DLLEXPORT(VObject*) vcsAddEvent(
-	VObject *vcal,
-	char *start_date_time,
-	char *end_date_time,
-	char *description,
-	char *summary,
-	char *categories,
-	char *classification,
-	char *status,
-	char *transparency,
-	char *uid,
-	char *url
-	);
-
-
-extern DLLEXPORT(VObject*) vcsAddTodo(
-	VObject *vcal,
-	char *start_date_time,
-	char *due_date_time,
-	char *date_time_complete,
-	char *description,
-	char *summary,
-	char *priority,
-	char *classification,
-	char *status,
-	char *uid,
-	char *url
-	);
-
-
-extern DLLEXPORT(VObject*) vcsAddAAlarm(
-	VObject *vevent,
-	char *run_time,
-	char *snooze_time,
-	char *repeat_count,
-	char *audio_content
-	);
-
-
-extern DLLEXPORT(VObject*) vcsAddMAlarm(
-	VObject *vevent,
-	char *run_time,
-	char *snooze_time,
-	char *repeat_count,
-	char *email_address,
-	char *note
-	);
-
-
-extern DLLEXPORT(VObject*) vcsAddDAlarm(
-	VObject *vevent,
-	char *run_time,
-	char *snooze_time,
-	char *repeat_count,
-	char *display_string
-	);
-
-
-extern DLLEXPORT(VObject*) vcsAddPAlarm(
-	VObject *vevent,
-	char *run_time,
-	char *snooze_time,
-	char *repeat_count,
-	char *procedure_name
-	);
-
-#if defined(__CPLUSPLUS__) || defined(__cplusplus)
-}
-#endif
-
-#endif /* __VCALTMP_H__ */
-
-
diff --git a/libical/src/libicalvcal/vcc.h b/libical/src/libicalvcal/vcc.h
deleted file mode 100644
index 0e52034710..0000000000
--- a/libical/src/libicalvcal/vcc.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-                                                                               
-For purposes of this license notice, the term Licensors shall mean,            
-collectively, Apple Computer, Inc., AT&T Corp., International                  
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-The term Licensor shall mean any of the Licensors.                             
-                                                                               
-Subject to acceptance of the following conditions, permission is hereby        
-granted by Licensors without the need for written agreement and without        
-license or royalty fees, to use, copy, modify and distribute this              
-software for any purpose.                                                      
-                                                                               
-The above copyright notice and the following four paragraphs must be           
-reproduced in all copies of this software and any software including           
-this software.                                                                 
-                                                                               
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
-MODIFICATIONS.                                                                 
-                                                                               
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
-DAMAGE.                                                                        
-                                                                               
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
-PURPOSE.                                                                       
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
-disclosure by the government are subject to restrictions set forth in          
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
-
-***************************************************************************/
-
-#ifndef __VCC_H__
-#define __VCC_H__ 1
-
-#include "vobject.h"
-
-
-#if defined(__CPLUSPLUS__) || defined(__cplusplus)
-extern "C" {
-#endif
-
-typedef void (*MimeErrorHandler)(char *);
-
-extern DLLEXPORT(void) registerMimeErrorHandler(MimeErrorHandler);
-
-extern DLLEXPORT(VObject*) Parse_MIME(const char *input, unsigned long len);
-extern DLLEXPORT(VObject*) Parse_MIME_FromFileName(char* fname);
-
-
-/* NOTE regarding Parse_MIME_FromFile
-The function above, Parse_MIME_FromFile, comes in two flavors,
-neither of which is exported from the DLL. Each version takes
-a CFile or FILE* as a parameter, neither of which can be
-passed across a DLL interface (at least that is my experience).
-If you are linking this code into your build directly then
-you may find them a more convenient API that the other flavors
-that take a file name. If you use them with the DLL LIB you
-will get a link error.
-*/
-
-
-#if INCLUDEMFC
-extern VObject* Parse_MIME_FromFile(CFile *file);
-#else
-extern VObject* Parse_MIME_FromFile(FILE *file);
-#endif
-
-#if defined(__CPLUSPLUS__) || defined(__cplusplus)
-}
-#endif
-
-#endif /* __VCC_H__ */
-
diff --git a/libical/src/libicalvcal/vcc.y b/libical/src/libicalvcal/vcc.y
deleted file mode 100644
index 245774f37e..0000000000
--- a/libical/src/libicalvcal/vcc.y
+++ /dev/null
@@ -1,1200 +0,0 @@
-%{
-
-/***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International
-Business Machines Corporation and Siemens Rolm Communications Inc.
-
-For purposes of this license notice, the term Licensors shall mean,
-collectively, Apple Computer, Inc., AT&T Corp., International
-Business Machines Corporation and Siemens Rolm Communications Inc.
-The term Licensor shall mean any of the Licensors.
-
-Subject to acceptance of the following conditions, permission is hereby
-granted by Licensors without the need for written agreement and without
-license or royalty fees, to use, copy, modify and distribute this
-software for any purpose.
-
-The above copyright notice and the following four paragraphs must be
-reproduced in all copies of this software and any software including
-this software.
-
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR
-MODIFICATIONS.
-
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or
-disclosure by the government are subject to restrictions set forth in
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.
-
-***************************************************************************/
-
-/*
- * src: vcc.c
- * doc: Parser for vCard and vCalendar. Note that this code is
- * generated by a yacc parser generator. Generally it should not
- * be edited by hand. The real source is vcc.y. The #line directives
- * can be commented out here to make it easier to trace through
- * in a debugger. However, if a bug is found it should
- * be fixed in vcc.y and this file regenerated.
- */
-
-
-/* debugging utilities */
-#if __DEBUG
-#define DBG_(x) printf x
-#else
-#define DBG_(x)
-#endif
-
-#ifdef WIN32
-#define snprintf   _snprintf
-#define strcasecmp stricmp
-#endif
-
-/****  External Functions  ****/
-
-/* assign local name to parser variables and functions so that
-   we can use more than one yacc based parser.
-*/
-
-#define yyparse mime_parse
-#define yylex mime_lex
-#define yyerror mime_error
-#define yychar mime_char
-/* #define p_yyval p_mime_val */
-#undef yyval
-#define yyval mime_yyval
-/* #define p_yylval p_mime_lval */
-#undef yylval
-#define yylval mime_yylval
-#define yydebug mime_debug
-#define yynerrs mime_nerrs
-#define yyerrflag mime_errflag
-#define yyss mime_ss
-#define yyssp mime_ssp
-#define yyvs mime_vs
-#define yyvsp mime_vsp
-#define yylhs mime_lhs
-#define yylen mime_len
-#define yydefred mime_defred
-#define yydgoto mime_dgoto
-#define yysindex mime_sindex
-#define yyrindex mime_rindex
-#define yygindex mime_gindex
-#define yytable mime_table
-#define yycheck mime_check
-#define yyname mime_name
-#define yyrule mime_rule
-#define YYPREFIX "mime_"
-
-
-#ifndef _NO_LINE_FOLDING
-#define _SUPPORT_LINE_FOLDING 1
-#endif
-
-/* undef below if compile with MFC */
-/* #define INCLUDEMFC 1 */
-
-#if defined(WIN32) || defined(_WIN32)
-#ifdef INCLUDEMFC
-#include <afx.h>
-#endif
-#endif
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include "vcc.h"
-
-/****  Types, Constants  ****/
-
-#define YYDEBUG		1	/* 1 to compile in some debugging code */
-#define MAXTOKEN	256	/* maximum token (line) length */
-#define YYSTACKSIZE 	50	/* ~unref ? */
-#define MAXLEVEL	10	/* max # of nested objects parseable */
-				/* (includes outermost) */
-
-
-/****  Global Variables  ****/
-int mime_lineNum, mime_numErrors; /* yyerror() can use these */
-static VObject* vObjList;
-static VObject *curProp;
-static VObject *curObj;
-static VObject* ObjStack[MAXLEVEL];
-static int ObjStackTop;
-
-
-/* A helpful utility for the rest of the app. */
-#if __CPLUSPLUS__
-extern "C" {
-#endif
-
-    extern void Parse_Debug(const char *s);
-    static void yyerror(char *s);
-
-#if __CPLUSPLUS__
-    };
-#endif
-
-int yyparse();
-
-enum LexMode {
-	L_NORMAL,
-	L_VCARD,
-	L_VCAL,
-	L_VEVENT,
-	L_VTODO,
-	L_VALUES,
-	L_BASE64,
-	L_QUOTED_PRINTABLE
-	};
-
-/****  Private Forward Declarations  ****/
-static int pushVObject(const char *prop);
-static VObject* popVObject();
-static void lexPopMode(int top);
-static int lexWithinMode(enum LexMode mode);
-static void lexPushMode(enum LexMode mode);
-static void enterProps(const char *s);
-static void enterAttr(const char *s1, const char *s2);
-static void enterValues(const char *value);
-static void mime_error_(char *s);
-
-%}
-
-/***************************************************************************/
-/***                           The grammar                              ****/
-/***************************************************************************/
-
-%union {
-    char *str;
-    VObject *vobj;
-    }
-
-%token
-	EQ COLON DOT SEMICOLON SPACE HTAB LINESEP NEWLINE
-	BEGIN_VCARD END_VCARD BEGIN_VCAL END_VCAL
-	BEGIN_VEVENT END_VEVENT BEGIN_VTODO END_VTODO
-	ID
-
-/*
- * NEWLINE is the token that would occur outside a vCard,
- * while LINESEP is the token that would occur inside a vCard.
- */
-
-%token <str>
-	STRING ID
-
-%type <str> name value
-
-%type <vobj> vcard vcal vobject
-
-%start mime
-
-%%
-
-
-mime: vobjects
-	;
-
-vobjects: vobject
-	{ addList(&vObjList, $1); curObj = 0; }
-	vobjects
-	| vobject
-		{ addList(&vObjList, $1); curObj = 0; }
-	;
-
-vobject: vcard
-	| vcal
-	;
-
-vcard:
-	BEGIN_VCARD
-	{
-	lexPushMode(L_VCARD);
-	if (!pushVObject(VCCardProp)) YYERROR;
-	}
-	items END_VCARD
-	{
-	lexPopMode(0);
-	$$ = popVObject();
-	}
-	| BEGIN_VCARD
-	{
-	lexPushMode(L_VCARD);
-	if (!pushVObject(VCCardProp)) YYERROR;
-	}
-	END_VCARD
-	{
-	lexPopMode(0);
-	$$ = popVObject();
-	}
-	;
-
-items: item items
-	| item
-	;
-
-item: prop COLON
-	{
-	lexPushMode(L_VALUES);
-	}
-	values LINESEP
-	{
-	if (lexWithinMode(L_BASE64) || lexWithinMode(L_QUOTED_PRINTABLE))
-	   lexPopMode(0);
-	lexPopMode(0);
-	}
-	| error
-	;
-
-prop: name
-	{
-	enterProps($1);
-	}
-	attr_params
-	| name
-	{
-	enterProps($1);
-	}
-	;
-
-attr_params: attr_param attr_params
-	| attr_param
-	;
-
-attr_param: SEMICOLON attr
-	;
-
-attr: name
-	{
-	enterAttr($1,0);
-	}
-	| name EQ name
-	{
-	enterAttr($1,$3);
-
-	}
-	;
-
-name: ID
-	;
-
-values: value SEMICOLON { enterValues($1); } values
-	| value
-	{ enterValues($1); }
-	;
-
-value: STRING
-	| { $$ = 0; }
-	;
-
-vcal:
-	BEGIN_VCAL
-	{ if (!pushVObject(VCCalProp)) YYERROR; }
-	calitems
-	END_VCAL
-	{ $$ = popVObject(); }
-	| BEGIN_VCAL
-	{ if (!pushVObject(VCCalProp)) YYERROR; }
-	END_VCAL
-	{ $$ = popVObject(); }
-	;
-
-calitems: calitem calitems
-	| calitem
-	;
-
-calitem:
-	eventitem
-	| todoitem
-	| items
-	;
-
-eventitem:
-	BEGIN_VEVENT
-	{
-	lexPushMode(L_VEVENT);
-	if (!pushVObject(VCEventProp)) YYERROR;
-	}
-	items
-	END_VEVENT
-	{
-	lexPopMode(0);
-	popVObject();
-	}
-	| BEGIN_VEVENT
-	{
-	lexPushMode(L_VEVENT);
-	if (!pushVObject(VCEventProp)) YYERROR;
-	}
-	END_VEVENT
-	{
-	lexPopMode(0);
-	popVObject();
-	}
-	;
-
-todoitem:
-	BEGIN_VTODO
-	{
-	lexPushMode(L_VTODO);
-	if (!pushVObject(VCTodoProp)) YYERROR;
-	}
-	items
-	END_VTODO
-	{
-	lexPopMode(0);
-	popVObject();
-	}
-	| BEGIN_VTODO
-	{
-	lexPushMode(L_VTODO);
-	if (!pushVObject(VCTodoProp)) YYERROR;
-	}
-	END_VTODO
-	{
-	lexPopMode(0);
-	popVObject();
-	}
-	;
-
-%%
-static int pushVObject(const char *prop)
-    {
-    VObject *newObj;
-    if (ObjStackTop == MAXLEVEL)
-	return FALSE;
-
-    ObjStack[++ObjStackTop] = curObj;
-
-    if (curObj) {
-        newObj = addProp(curObj,prop);
-        curObj = newObj;
-	}
-    else
-	curObj = newVObject(prop);
-
-    return TRUE;
-    }
-
-
-/* This pops the recently built vCard off the stack and returns it. */
-static VObject* popVObject()
-    {
-    VObject *oldObj;
-    if (ObjStackTop < 0) {
-	yyerror("pop on empty Object Stack\n");
-	return 0;
-	}
-    oldObj = curObj;
-    curObj = ObjStack[ObjStackTop--];
-
-    return oldObj;
-    }
-
-
-static void enterValues(const char *value)
-    {
-    if (fieldedProp && *fieldedProp) {
-	if (value) {
-	    addPropValue(curProp,*fieldedProp,value);
-	    }
-	/* else this field is empty, advance to next field */
-	fieldedProp++;
-	}
-    else {
-	if (value) {
-	    char *p1, *p2;
-	    wchar_t *p3;
-	    int i;
-
-	    /* If the property already has a string value, we append this one,
-	       using ';' to separate the values. */
-	    if (vObjectUStringZValue(curProp)) {
-		p1 = fakeCString(vObjectUStringZValue(curProp));
-		p2 = malloc((strlen(p1)+strlen(value)+1));
-		strcpy(p2, p1);
-		deleteStr(p1);
-
-		i = strlen(p2);
-		p2[i] = ';';
-		p2[i+1] = '\0';
-		p2 = strcat(p2, value);
-		p3 = (wchar_t *) vObjectUStringZValue(curProp);
-		free(p3);
-		setVObjectUStringZValue_(curProp,fakeUnicode(p2,0));
-		deleteStr(p2);
-	    } else {
-	    setVObjectUStringZValue_(curProp,fakeUnicode(value,0));
-	    }
-	}
-    }
-    deleteStr(value);
-    }
-
-static void enterProps(const char *s)
-    {
-    curProp = addGroup(curObj,s);
-    deleteStr(s);
-    }
-
-static void enterAttr(const char *s1, const char *s2)
-    {
-    const char *p1, *p2;
-    p1 = lookupProp_(s1);
-    if (s2) {
-	VObject *a;
-	p2 = lookupProp_(s2);
-	a = addProp(curProp,p1);
-	setVObjectStringZValue(a,p2);
-	}
-    else
-	addProp(curProp,p1);
-    if (stricmp(p1,VCBase64Prop) == 0 || (s2 && stricmp(p2,VCBase64Prop)==0))
-	lexPushMode(L_BASE64);
-    else if (stricmp(p1,VCQuotedPrintableProp) == 0
-	    || (s2 && stricmp(p2,VCQuotedPrintableProp)==0))
-	lexPushMode(L_QUOTED_PRINTABLE);
-    deleteStr(s1); deleteStr(s2);
-    }
-
-
-#define MAX_LEX_LOOKAHEAD_0 32
-#define MAX_LEX_LOOKAHEAD 64
-#define MAX_LEX_MODE_STACK_SIZE 10
-#define LEXMODE() (lexBuf.lexModeStack[lexBuf.lexModeStackTop])
-
-struct LexBuf {
-	/* input */
-#ifdef INCLUDEMFC
-    CFile *inputFile;
-#else
-    FILE *inputFile;
-#endif
-    char *inputString;
-    unsigned long curPos;
-    unsigned long inputLen;
-	/* lookahead buffer */
-	/*   -- lookahead buffer is short instead of char so that EOF
-	 /      can be represented correctly.
-	*/
-    unsigned long len;
-    short buf[MAX_LEX_LOOKAHEAD];
-    unsigned long getPtr;
-	/* context stack */
-    unsigned long lexModeStackTop;
-    enum LexMode lexModeStack[MAX_LEX_MODE_STACK_SIZE];
-	/* token buffer */
-    unsigned long maxToken;
-    char *strs;
-    unsigned long strsLen;
-    } lexBuf;
-
-static void lexPushMode(enum LexMode mode)
-    {
-    if (lexBuf.lexModeStackTop == (MAX_LEX_MODE_STACK_SIZE-1))
-	yyerror("lexical context stack overflow");
-    else {
-	lexBuf.lexModeStack[++lexBuf.lexModeStackTop] = mode;
-	}
-    }
-
-static void lexPopMode(int top)
-    {
-    /* special case of pop for ease of error recovery -- this
-	version will never underflow */
-    if (top)
-	lexBuf.lexModeStackTop = 0;
-    else
-	if (lexBuf.lexModeStackTop > 0) lexBuf.lexModeStackTop--;
-    }
-
-static int lexWithinMode(enum LexMode mode) {
-    unsigned long i;
-    for (i=0;i<lexBuf.lexModeStackTop;i++)
-	if (mode == lexBuf.lexModeStack[i]) return 1;
-    return 0;
-    }
-
-static char lexGetc_()
-    {
-    /* get next char from input, no buffering. */
-    if (lexBuf.curPos == lexBuf.inputLen)
-	return EOF;
-    else if (lexBuf.inputString)
-	return *(lexBuf.inputString + lexBuf.curPos++);
-    else {
-#ifdef INCLUDEMFC
-	char result;
-	return lexBuf.inputFile->Read(&result, 1) == 1 ? result : EOF;
-#else
-	return fgetc(lexBuf.inputFile);
-#endif
-	}
-    }
-
-static int lexGeta()
-    {
-    ++lexBuf.len;
-    return (lexBuf.buf[lexBuf.getPtr] = lexGetc_());
-    }
-
-static int lexGeta_(int i)
-    {
-    ++lexBuf.len;
-    return (lexBuf.buf[(lexBuf.getPtr+i)%MAX_LEX_LOOKAHEAD] = lexGetc_());
-    }
-
-static void lexSkipLookahead() {
-    if (lexBuf.len > 0 && lexBuf.buf[lexBuf.getPtr]!=EOF) {
-	/* don't skip EOF. */
-        lexBuf.getPtr = (lexBuf.getPtr + 1) % MAX_LEX_LOOKAHEAD;
-	lexBuf.len--;
-        }
-    }
-
-static int lexLookahead() {
-    int c = (lexBuf.len)?
-	lexBuf.buf[lexBuf.getPtr]:
-	lexGeta();
-    /* do the \r\n -> \n or \r -> \n translation here */
-    if (c == '\r') {
-	int a = (lexBuf.len>1)?
-	    lexBuf.buf[(lexBuf.getPtr+1)%MAX_LEX_LOOKAHEAD]:
-	    lexGeta_(1);
-	if (a == '\n') {
-	    lexSkipLookahead();
-	    }
-	lexBuf.buf[lexBuf.getPtr] = c = '\n';
-	}
-    else if (c == '\n') {
-	int a = (lexBuf.len>1)?
-	    lexBuf.buf[lexBuf.getPtr+1]:
-	    lexGeta_(1);
-	if (a == '\r') {
-	    lexSkipLookahead();
-	    }
-	lexBuf.buf[lexBuf.getPtr] = '\n';
-	}
-    return c;
-    }
-
-static int lexGetc() {
-    int c = lexLookahead();
-    if (lexBuf.len > 0 && lexBuf.buf[lexBuf.getPtr]!=EOF) {
-	/* EOF will remain in lookahead buffer */
-        lexBuf.getPtr = (lexBuf.getPtr + 1) % MAX_LEX_LOOKAHEAD;
-	lexBuf.len--;
-        }
-    return c;
-    }
-
-static void lexSkipLookaheadWord() {
-    if (lexBuf.strsLen <= lexBuf.len) {
-	lexBuf.len -= lexBuf.strsLen;
-	lexBuf.getPtr = (lexBuf.getPtr + lexBuf.strsLen) % MAX_LEX_LOOKAHEAD;
-	}
-    }
-
-static void lexClearToken()
-    {
-    lexBuf.strsLen = 0;
-    }
-
-static void lexAppendc(int c)
-    {
-    lexBuf.strs[lexBuf.strsLen] = c;
-    /* append up to zero termination */
-    if (c == 0) return;
-    lexBuf.strsLen++;
-    if (lexBuf.strsLen > lexBuf.maxToken) {
-	/* double the token string size */
-	lexBuf.maxToken <<= 1;
-	lexBuf.strs = (char*) realloc(lexBuf.strs,(size_t)lexBuf.maxToken);
-	}
-    }
-
-static char* lexStr() {
-    return dupStr(lexBuf.strs,(size_t)lexBuf.strsLen+1);
-    }
-
-static void lexSkipWhite() {
-    int c = lexLookahead();
-    while (c == ' ' || c == '\t') {
-	lexSkipLookahead();
-	c = lexLookahead();
-	}
-    }
-
-static char* lexGetWord() {
-    int c;
-    lexSkipWhite();
-    lexClearToken();
-    c = lexLookahead();
-    while (c != EOF && !strchr("\t\n ;:=",c)) {
-	lexAppendc(c);
-	lexSkipLookahead();
-	c = lexLookahead();
-	}
-    lexAppendc(0);
-    return lexStr();
-    }
-
-static void lexPushLookaheadc(int c) {
-    int putptr;
-    /* can't putback EOF, because it never leaves lookahead buffer */
-    if (c == EOF) return;
-    putptr = (int)lexBuf.getPtr - 1;
-    if (putptr < 0) putptr += MAX_LEX_LOOKAHEAD;
-    lexBuf.getPtr = putptr;
-    lexBuf.buf[putptr] = c;
-    lexBuf.len += 1;
-    }
-
-static char* lexLookaheadWord() {
-    /* this function can lookahead word with max size of MAX_LEX_LOOKAHEAD_0
-     /  and thing bigger than that will stop the lookahead and return 0;
-     / leading white spaces are not recoverable.
-     */
-    int c;
-    int len = 0;
-    int curgetptr = 0;
-    lexSkipWhite();
-    lexClearToken();
-    curgetptr = (int)lexBuf.getPtr;	/* remember! */
-    while (len < (MAX_LEX_LOOKAHEAD_0)) {
-	c = lexGetc();
-	len++;
-	if (c == EOF || strchr("\t\n ;:=", c)) {
-	    lexAppendc(0);
-	    /* restore lookahead buf. */
-	    lexBuf.len += len;
-	    lexBuf.getPtr = curgetptr;
-	    return lexStr();
-	    }
-        else
-	    lexAppendc(c);
-	}
-    lexBuf.len += len;	/* char that has been moved to lookahead buffer */
-    lexBuf.getPtr = curgetptr;
-    return 0;
-    }
-
-#ifdef _SUPPORT_LINE_FOLDING
-static void handleMoreRFC822LineBreak(int c) {
-    /* suport RFC 822 line break in cases like
-     *	ADR: foo;
-     *    morefoo;
-     *    more foo;
-     */
-    if (c == ';') {
-	int a;
-	lexSkipLookahead();
-	/* skip white spaces */
-	a = lexLookahead();
-	while (a == ' ' || a == '\t') {
-	    lexSkipLookahead();
-	    a = lexLookahead();
-	    }
-	if (a == '\n') {
-	    lexSkipLookahead();
-	    a = lexLookahead();
-	    if (a == ' ' || a == '\t') {
-		/* continuation, throw away all the \n and spaces read so
-		 * far
-		 */
-		lexSkipWhite();
-		lexPushLookaheadc(';');
-		}
-	    else {
-		lexPushLookaheadc('\n');
-		lexPushLookaheadc(';');
-		}
-	    }
-	else {
-	    lexPushLookaheadc(';');
-	    }
-	}
-    }
-
-static char* lexGet1Value() {
-    int c;
-    lexSkipWhite();
-    c = lexLookahead();
-    lexClearToken();
-    while (c != EOF && c != ';') {
-	if (c == '\n') {
-	    int a;
-	    lexSkipLookahead();
-	    a  = lexLookahead();
-	    if (a == ' ' || a == '\t') {
-		lexAppendc(' ');
-		lexSkipLookahead();
-		}
-	    else {
-		lexPushLookaheadc('\n');
-		break;
-		}
-	    }
-	else {
-	    lexAppendc(c);
-	    lexSkipLookahead();
-	    }
-	c = lexLookahead();
-	}
-    lexAppendc(0);
-    handleMoreRFC822LineBreak(c);
-    return c==EOF?0:lexStr();
-    }
-#endif
-
-
-static int match_begin_name(int end) {
-    char *n = lexLookaheadWord();
-    int token = ID;
-    if (n) {
-	if (!stricmp(n,"vcard")) token = end?END_VCARD:BEGIN_VCARD;
-	else if (!stricmp(n,"vcalendar")) token = end?END_VCAL:BEGIN_VCAL;
-	else if (!stricmp(n,"vevent")) token = end?END_VEVENT:BEGIN_VEVENT;
-	else if (!stricmp(n,"vtodo")) token = end?END_VTODO:BEGIN_VTODO;
-	deleteStr(n);
-	return token;
-	}
-    return 0;
-    }
-
-
-#ifdef INCLUDEMFC
-void initLex(const char *inputstring, unsigned long inputlen, CFile *inputfile)
-#else
-void initLex(const char *inputstring, unsigned long inputlen, FILE *inputfile)
-#endif
-    {
-    /* initialize lex mode stack */
-    lexBuf.lexModeStack[lexBuf.lexModeStackTop=0] = L_NORMAL;
-
-    /* iniatialize lex buffer. */
-    lexBuf.inputString = (char*) inputstring;
-    lexBuf.inputLen = inputlen;
-    lexBuf.curPos = 0;
-    lexBuf.inputFile = inputfile;
-
-    lexBuf.len = 0;
-    lexBuf.getPtr = 0;
-
-    lexBuf.maxToken = MAXTOKEN;
-    lexBuf.strs = (char*)malloc(MAXTOKEN);
-    lexBuf.strsLen = 0;
-
-    }
-
-static void finiLex() {
-    free(lexBuf.strs);
-    }
-
-
-/* This parses and converts the base64 format for binary encoding into
- * a decoded buffer (allocated with new).  See RFC 1521.
- */
-static char * lexGetDataFromBase64()
-    {
-    unsigned long bytesLen = 0, bytesMax = 0;
-    int quadIx = 0, pad = 0;
-    unsigned long trip = 0;
-    unsigned char b;
-    int c;
-    unsigned char *bytes = NULL;
-    unsigned char *oldBytes = NULL;
-
-    DBG_(("db: lexGetDataFromBase64\n"));
-    while (1) {
-	c = lexGetc();
-	if (c == '\n') {
-	    ++mime_lineNum;
-	    if (lexLookahead() == '\n') {
-		/* a '\n' character by itself means end of data */
-		break;
-		}
-	    else continue; /* ignore '\n' */
-	    }
-	else {
-	    if ((c >= 'A') && (c <= 'Z'))
-		b = (unsigned char)(c - 'A');
-	    else if ((c >= 'a') && (c <= 'z'))
-		b = (unsigned char)(c - 'a') + 26;
-	    else if ((c >= '0') && (c <= '9'))
-		b = (unsigned char)(c - '0') + 52;
-	    else if (c == '+')
-		b = 62;
-	    else if (c == '/')
-		b = 63;
-	    else if (c == '=') {
-		b = 0;
-		pad++;
-	    } else if ((c == ' ') || (c == '\t')) {
-		continue;
-	    } else { /* error condition */
-		if (bytes) free(bytes);
-		else if (oldBytes) free(oldBytes);
-		/* error recovery: skip until 2 adjacent newlines. */
-		DBG_(("db: invalid character 0x%x '%c'\n", c,c));
-		if (c != EOF)  {
-		    c = lexGetc();
-		    while (c != EOF) {
-			if (c == '\n' && lexLookahead() == '\n') {
-			    ++mime_lineNum;
-			    break;
-			    }
-			c = lexGetc();
-			}
-		    }
-		return NULL;
-		}
-	    trip = (trip << 6) | b;
-	    if (++quadIx == 4) {
-		unsigned char outBytes[3];
-		int numOut;
-		int i;
-		for (i = 0; i < 3; i++) {
-		    outBytes[2-i] = (unsigned char)(trip & 0xFF);
-		    trip >>= 8;
-		    }
-		numOut = 3 - pad;
-		if (bytesLen + numOut > bytesMax) {
-		    if (!bytes) {
-			bytesMax = 1024;
-			bytes = (unsigned char*)malloc((size_t)bytesMax);
-			}
-		    else {
-			bytesMax <<= 2;
-			oldBytes = bytes;
-			bytes = (unsigned char*)realloc(bytes,(size_t)bytesMax);
-			}
-		    if (bytes == 0) {
-			mime_error("out of memory while processing BASE64 data\n");
-			}
-		    }
-		if (bytes) {
-		    memcpy(bytes + bytesLen, outBytes, numOut);
-		    bytesLen += numOut;
-		    }
-		trip = 0;
-		quadIx = 0;
-		}
-	    }
-	} /* while */
-    DBG_(("db: bytesLen = %d\n",  bytesLen));
-    /* kludge: all this won't be necessary if we have tree form
-	representation */
-    if (bytes) {
-	setValueWithSize(curProp,bytes,(unsigned int)bytesLen);
-	free(bytes);
-	}
-    else if (oldBytes) {
-	setValueWithSize(curProp,oldBytes,(unsigned int)bytesLen);
-	free(oldBytes);
-	}
-    return 0;
-    }
-
-static int match_begin_end_name(int end) {
-    int token;
-    lexSkipWhite();
-    if (lexLookahead() != ':') return ID;
-    lexSkipLookahead();
-    lexSkipWhite();
-    token = match_begin_name(end);
-    if (token == ID) {
-	lexPushLookaheadc(':');
-	DBG_(("db: ID '%s'\n", yylval.str));
-	return ID;
-	}
-    else if (token != 0) {
-	lexSkipLookaheadWord();
-	deleteStr(yylval.str);
-	DBG_(("db: begin/end %d\n", token));
-	return token;
-	}
-    return 0;
-    }
-
-static char* lexGetQuotedPrintable()
-    {
-    char cur;
-
-    lexClearToken();
-    do {
-	cur = lexGetc();
-	switch (cur) {
-	    case '=': {
-		int c = 0;
-		int next[2];
-		int i;
-		for (i = 0; i < 2; i++) {
-		    next[i] = lexGetc();
-		    if (next[i] >= '0' && next[i] <= '9')
-			c = c * 16 + next[i] - '0';
-		    else if (next[i] >= 'A' && next[i] <= 'F')
-			c = c * 16 + next[i] - 'A' + 10;
-		    else
-			break;
-		    }
-		if (i == 0) {
-		    /* single '=' follow by LINESEP is continuation sign? */
-		    if (next[0] == '\n') {
-			++mime_lineNum;
-			}
-		    else {
-			lexPushLookaheadc('=');
-			goto EndString;
-			}
-		    }
-		else if (i == 1) {
-		    lexPushLookaheadc(next[1]);
-		    lexPushLookaheadc(next[0]);
-		    lexAppendc('=');
-		} else {
-		    lexAppendc(c);
-		    }
-		break;
-		} /* '=' */
-	    case '\n': {
-		lexPushLookaheadc('\n');
-		goto EndString;
-		}
-	    case (char)EOF:
-		break;
-	    default:
-		lexAppendc(cur);
-		break;
-	    } /* switch */
-	} while (cur != (char)EOF);
-
-EndString:
-    lexAppendc(0);
-    return lexStr();
-    } /* LexQuotedPrintable */
-
-int yylex() {
-
-    int lexmode = LEXMODE();
-    if (lexmode == L_VALUES) {
-	int c = lexGetc();
-	if (c == ';') {
-	    DBG_(("db: SEMICOLON\n"));
-	    lexPushLookaheadc(c);
-#ifdef _SUPPORT_LINE_FOLDING
-	    handleMoreRFC822LineBreak(c);
-#endif
-	    lexSkipLookahead();
-	    return SEMICOLON;
-	    }
-	else if (strchr("\n",c)) {
-	    ++mime_lineNum;
-	    /* consume all line separator(s) adjacent to each other */
-	    c = lexLookahead();
-	    while (strchr("\n",c)) {
-		lexSkipLookahead();
-		c = lexLookahead();
-		++mime_lineNum;
-		}
-	    DBG_(("db: LINESEP\n"));
-	    return LINESEP;
-	    }
-	else {
-	    char *p = 0;
-	    lexPushLookaheadc(c);
-	    if (lexWithinMode(L_BASE64)) {
-		/* get each char and convert to bin on the fly... */
-		p = lexGetDataFromBase64();
-		yylval.str = p;
-		return STRING;
-		}
-	    else if (lexWithinMode(L_QUOTED_PRINTABLE)) {
-		p = lexGetQuotedPrintable();
-		}
-	    else {
-#ifdef _SUPPORT_LINE_FOLDING
-		p = lexGet1Value();
-#else
-		p = lexGetStrUntil(";\n");
-#endif
-		}
-	    if (p) {
-		DBG_(("db: STRING: '%s'\n", p));
-		yylval.str = p;
-		return STRING;
-		}
-	    else return 0;
-	    }
-	}
-    else {
-	/* normal mode */
-	while (1) {
-	    int c = lexGetc();
-	    switch(c) {
-		case ':': {
-		    /* consume all line separator(s) adjacent to each other */
-		    /* ignoring linesep immediately after colon. */
-/*		    c = lexLookahead();
-		    while (strchr("\n",c)) {
-			lexSkipLookahead();
-			c = lexLookahead();
-			++mime_lineNum;
-			}*/
-		    DBG_(("db: COLON\n"));
-		    return COLON;
-		    }
-		case ';':
-		    DBG_(("db: SEMICOLON\n"));
-		    return SEMICOLON;
-		case '=':
-		    DBG_(("db: EQ\n"));
-		    return EQ;
-		/* ignore whitespace in this mode */
-		case '\t':
-		case ' ': continue;
-		case '\n': {
-		    ++mime_lineNum;
-		    continue;
-		    }
-		case EOF: return 0;
-		    break;
-		default: {
-		    lexPushLookaheadc(c);
-		    if (isalpha(c)) {
-			char *t = lexGetWord();
-			yylval.str = t;
-			if (!stricmp(t, "begin")) {
-			    return match_begin_end_name(0);
-			    }
-			else if (!stricmp(t,"end")) {
-			    return match_begin_end_name(1);
-			    }
-		        else {
-			    DBG_(("db: ID '%s'\n", t));
-			    return ID;
-			    }
-			}
-		    else {
-			/* unknow token */
-			return 0;
-			}
-		    break;
-		    }
-		}
-	    }
-	}
-    return 0;
-    }
-
-
-/***************************************************************************/
-/***							Public Functions						****/
-/***************************************************************************/
-
-static VObject* Parse_MIMEHelper()
-    {
-    ObjStackTop = -1;
-    mime_numErrors = 0;
-    mime_lineNum = 1;
-    vObjList = 0;
-    curObj = 0;
-
-    if (yyparse() != 0)
-	return 0;
-
-    finiLex();
-    return vObjList;
-    }
-
-DLLEXPORT(VObject*) Parse_MIME(const char *input, unsigned long len)
-    {
-    initLex(input, len, 0);
-    return Parse_MIMEHelper();
-    }
-
-
-#if INCLUDEMFC
-
-DLLEXPORT(VObject*) Parse_MIME_FromFile(CFile *file)
-    {
-    unsigned long startPos;
-    VObject *result;
-
-    initLex(0,-1,file);
-    startPos = file->GetPosition();
-    if (!(result = Parse_MIMEHelper()))
-	file->Seek(startPos, CFile::begin);
-    return result;
-    }
-
-#else
-
-VObject* Parse_MIME_FromFile(FILE *file)
-    {
-    VObject *result;
-    long startPos;
-
-    initLex(0,(unsigned long)-1,file);
-    startPos = ftell(file);
-    if (!(result = Parse_MIMEHelper())) {
-	fseek(file,startPos,SEEK_SET);
-	}
-    return result;
-    }
-
-DLLEXPORT(VObject*) Parse_MIME_FromFileName(char *fname)
-    {
-    FILE *fp = fopen(fname,"r");
-    if (fp) {
-	VObject* o = Parse_MIME_FromFile(fp);
-	fclose(fp);
-	return o;
-	}
-    else {
-	char msg[256];
-	snprintf(msg, sizeof(msg), "can't open file '%s' for reading\n", fname);
-	mime_error_(msg);
-	return 0;
-	}
-    }
-
-#endif
-
-
-static MimeErrorHandler mimeErrorHandler;
-
-DLLEXPORT(void) registerMimeErrorHandler(MimeErrorHandler me)
-    {
-    mimeErrorHandler = me;
-    }
-
-static void mime_error(char *s)
-    {
-    char msg[256];
-    if (mimeErrorHandler) {
-	sprintf(msg,"%s at line %d", s, mime_lineNum);
-	mimeErrorHandler(msg);
-	}
-    }
-
-static void mime_error_(char *s)
-    {
-    if (mimeErrorHandler) {
-	mimeErrorHandler(s);
-	}
-    }
-
diff --git a/libical/src/libicalvcal/vctest.c b/libical/src/libicalvcal/vctest.c
deleted file mode 100644
index 7975d1e200..0000000000
--- a/libical/src/libicalvcal/vctest.c
+++ /dev/null
@@ -1,95 +0,0 @@
-
-#include <stdio.h>
-#include <string.h>
-#include "vcc.h"
-
-FILE *cfp;
-
-void myMimeErrorHandler(char *s)
-{
-    printf("%s\n", s);
-}
-
-void main(int argc, char **argv)
-{
-    int testmem = 0;
-
-	char * foo[2] = {"foo","alden.vcf"};
-
-argc = 2;
-argv = foo;
-
-#ifdef _CONSOLE
-    cfp = stdout;
-    registerMimeErrorHandler(myMimeErrorHandler);
-#else
-    cfp = fopen("vctest.out", "w");
-    if (!cfp) return;
-#endif
-    ++argv;
-    while (--argc) {
-	FILE *fp;
-	if (strcmp(*argv,"-testmem") == 0) {
-	    testmem = 1;
-	    argv++;
-	    continue;
-	    }
-	fprintf(cfp,"processing %s\n",*argv);
-	fp = fopen(*argv,"r");
-	if (!fp) {
-	    fprintf(cfp,"error opening file\n");
-	    }
-	else {
-	    VObject *v, *t;
-	    FILE *ofp;
-	    char buf[256];
-	    char *p;
-	    strcpy(buf,*argv);
-	    p = strchr(buf,'.');
-	    if (p) *p = 0;
-	    strcat(buf,".out");
-	    fprintf(cfp,"reading text input from '%s'...\n", *argv);
-	    /*v = Parse_MIME_FromFile(fp); */
-	    v = Parse_MIME_FromFileName(*argv);
-		writeVObjectToFile(buf,v);
-		cleanVObject(v);
-
-		/*
-	    fprintf(cfp,"pretty print internal format of '%s'...\n", *argv);
-	    ofp = fopen(buf,"w");
-	    while (v) {
-		printVObject(cfp,v);
-		if (testmem) {
-		    char *s, *p;
-		    fprintf(cfp,"test writing to mem...\n");
-		    p = s  = writeMemVObject(0,0,v);
-		    if (s) {
-			while (*s) {
-			    fputc(*s,ofp);
-			    s++;
-			    }
-			free(p);
-			}
-		    }
-		else {
-		    writeVObject(ofp,v);
-		    }
-		t = v;
-		v = nextVObjectInList(v);
-		cleanVObject(t);
-		}
-		
-	    fclose(ofp);
-	    fclose(fp);
-		*/
-	    }
-		
-	cleanStrTbl();
-	argv++;
-	
-	}
-	
-    if (cfp != stdout) fclose(cfp);
-
-}
-
diff --git a/libical/src/libicalvcal/vobject.c b/libical/src/libicalvcal/vobject.c
deleted file mode 100644
index 616581ffa8..0000000000
--- a/libical/src/libicalvcal/vobject.c
+++ /dev/null
@@ -1,1455 +0,0 @@
-/***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-                                                                               
-For purposes of this license notice, the term Licensors shall mean,            
-collectively, Apple Computer, Inc., AT&T Corp., International                  
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-The term Licensor shall mean any of the Licensors.                             
-                                                                               
-Subject to acceptance of the following conditions, permission is hereby        
-granted by Licensors without the need for written agreement and without        
-license or royalty fees, to use, copy, modify and distribute this              
-software for any purpose.                                                      
-                                                                               
-The above copyright notice and the following four paragraphs must be           
-reproduced in all copies of this software and any software including           
-this software.                                                                 
-                                                                               
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
-MODIFICATIONS.                                                                 
-                                                                               
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
-DAMAGE.                                                                        
-                                                                               
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
-PURPOSE.                                                                       
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
-disclosure by the government are subject to restrictions set forth in          
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
-
-***************************************************************************/
-
-/*
- * src: vobject.c
- * doc: vobject and APIs to construct vobject, APIs pretty print 
- * vobject, and convert a vobject into its textual representation.
- */
-
-#ifdef WIN32
-#define snprintf   _snprintf
-#define strcasecmp stricmp
-#endif
-
-#include "vobject.h"
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <fcntl.h>
-
-
-#define NAME_OF(o)				o->id
-#define VALUE_TYPE(o)			o->valType
-#define STRINGZ_VALUE_OF(o)		o->val.strs
-#define USTRINGZ_VALUE_OF(o)	o->val.ustrs
-#define INTEGER_VALUE_OF(o)		o->val.i
-#define LONG_VALUE_OF(o)		o->val.l
-#define ANY_VALUE_OF(o)			o->val.any
-#define VOBJECT_VALUE_OF(o)		o->val.vobj
-
-typedef union ValueItem {
-    const char *strs;
-    const wchar_t *ustrs;
-    unsigned int i;
-    unsigned long l;
-    void *any;
-    VObject *vobj;
-    } ValueItem;
-
-struct VObject {
-    VObject *next;
-    const char *id;
-    VObject *prop;
-    unsigned short valType;
-    ValueItem val;
-    };
-
-typedef struct StrItem StrItem;
-
-struct StrItem {
-    StrItem *next;
-    const char *s;
-    unsigned int refCnt;
-    };
-
-const char** fieldedProp;
-
-
-
-/*----------------------------------------------------------------------
-   The following functions involve with memory allocation:
-	newVObject
-	deleteVObject
-	dupStr
-	deleteStr
-	newStrItem
-	deleteStrItem
-   ----------------------------------------------------------------------*/
-
-DLLEXPORT(VObject*) newVObject_(const char *id)
-{
-    VObject *p = (VObject*)malloc(sizeof(VObject));
-    p->next = 0;
-    p->id = id;
-    p->prop = 0;
-    VALUE_TYPE(p) = 0;
-    ANY_VALUE_OF(p) = 0;
-    return p;
-}
-
-DLLEXPORT(VObject*) newVObject(const char *id)
-{
-    return newVObject_(lookupStr(id));
-}
-
-DLLEXPORT(void) deleteVObject(VObject *p)
-{
-    unUseStr(p->id);
-    free(p);
-}
-
-DLLEXPORT(char*) dupStr(const char *s, unsigned int size)
-{
-    char *t;
-    if  (size == 0) {
-	size = strlen(s);
-	}
-    t = (char*)malloc(size+1);
-    if (t) {
-	memcpy(t,s,size);
-	t[size] = 0;
-	return t;
-	}
-    else {
-	return (char*)0;
-	}
-}
-
-DLLEXPORT(void) deleteStr(const char *p)
-{
-    if (p) free((void*)p);
-}
-
-
-static StrItem* newStrItem(const char *s, StrItem *next)
-{
-    StrItem *p = (StrItem*)malloc(sizeof(StrItem));
-    p->next = next;
-    p->s = s;
-    p->refCnt = 1;
-    return p;
-}
-
-static void deleteStrItem(StrItem *p)
-{
-    free((void*)p);
-}
-
-
-/*----------------------------------------------------------------------
-  The following function provide accesses to VObject's value.
-  ----------------------------------------------------------------------*/
-
-DLLEXPORT(const char*) vObjectName(VObject *o)
-{
-    return NAME_OF(o);
-}
-
-DLLEXPORT(void) setVObjectName(VObject *o, const char* id)
-{
-    NAME_OF(o) = id;
-}
-
-DLLEXPORT(const char*) vObjectStringZValue(VObject *o)
-{
-    return STRINGZ_VALUE_OF(o);
-}
-
-DLLEXPORT(void) setVObjectStringZValue(VObject *o, const char *s)
-{
-    STRINGZ_VALUE_OF(o) = dupStr(s,0);
-    VALUE_TYPE(o) = VCVT_STRINGZ;
-}
-
-DLLEXPORT(void) setVObjectStringZValue_(VObject *o, const char *s)
-{
-    STRINGZ_VALUE_OF(o) = s;
-    VALUE_TYPE(o) = VCVT_STRINGZ;
-}
-
-DLLEXPORT(const wchar_t*) vObjectUStringZValue(VObject *o)
-{
-    return USTRINGZ_VALUE_OF(o);
-}
-
-DLLEXPORT(void) setVObjectUStringZValue(VObject *o, const wchar_t *s)
-{
-    USTRINGZ_VALUE_OF(o) = (wchar_t*) dupStr((char*)s,(uStrLen(s)+1)*2);
-    VALUE_TYPE(o) = VCVT_USTRINGZ;
-}
-
-DLLEXPORT(void) setVObjectUStringZValue_(VObject *o, const wchar_t *s)
-{
-    USTRINGZ_VALUE_OF(o) = s;
-    VALUE_TYPE(o) = VCVT_USTRINGZ;
-}
-
-DLLEXPORT(unsigned int) vObjectIntegerValue(VObject *o)
-{
-    return INTEGER_VALUE_OF(o);
-}
-
-DLLEXPORT(void) setVObjectIntegerValue(VObject *o, unsigned int i)
-{
-    INTEGER_VALUE_OF(o) = i;
-    VALUE_TYPE(o) = VCVT_UINT;
-}
-
-DLLEXPORT(unsigned long) vObjectLongValue(VObject *o)
-{
-    return LONG_VALUE_OF(o);
-}
-
-DLLEXPORT(void) setVObjectLongValue(VObject *o, unsigned long l)
-{
-    LONG_VALUE_OF(o) = l;
-    VALUE_TYPE(o) = VCVT_ULONG;
-}
-
-DLLEXPORT(void*) vObjectAnyValue(VObject *o)
-{
-    return ANY_VALUE_OF(o);
-}
-
-DLLEXPORT(void) setVObjectAnyValue(VObject *o, void *t)
-{
-    ANY_VALUE_OF(o) = t;
-    VALUE_TYPE(o) = VCVT_RAW;
-}
-
-DLLEXPORT(VObject*) vObjectVObjectValue(VObject *o)
-{
-    return VOBJECT_VALUE_OF(o);
-}
-
-DLLEXPORT(void) setVObjectVObjectValue(VObject *o, VObject *p)
-{
-    VOBJECT_VALUE_OF(o) = p;
-    VALUE_TYPE(o) = VCVT_VOBJECT;
-}
-
-DLLEXPORT(int) vObjectValueType(VObject *o)
-{
-    return VALUE_TYPE(o);
-}
-
-
-/*----------------------------------------------------------------------
-  The following functions can be used to build VObject.
-  ----------------------------------------------------------------------*/
-
-DLLEXPORT(VObject*) addVObjectProp(VObject *o, VObject *p)
-{
-    /* circular link list pointed to tail */
-    /*
-    o {next,id,prop,val}
-                V
-	pn {next,id,prop,val}
-             V
-	    ...
-	p1 {next,id,prop,val}
-             V
-	     pn
-    -->
-    o {next,id,prop,val}
-                V
-	pn {next,id,prop,val}
-             V
-	p {next,id,prop,val}
-	    ...
-	p1 {next,id,prop,val}
-             V
-	     pn
-    */
-
-    VObject *tail = o->prop;
-    if (tail) {
-	p->next = tail->next;
-	o->prop = tail->next = p;
-	}
-    else {
-	o->prop = p->next = p;
-	}
-    return p;
-}
-
-DLLEXPORT(VObject*) addProp(VObject *o, const char *id)
-{
-    return addVObjectProp(o,newVObject(id));
-}
-
-DLLEXPORT(VObject*) addProp_(VObject *o, const char *id)
-{
-    return addVObjectProp(o,newVObject_(id));
-}
-
-DLLEXPORT(void) addList(VObject **o, VObject *p)
-{
-    p->next = 0;
-    if (*o == 0) {
-	*o = p;
-	}
-    else {
-	VObject *t = *o;
-	while (t->next) {
-	   t = t->next;
-	   }
-	t->next = p;
-	}
-}
-
-DLLEXPORT(VObject*) nextVObjectInList(VObject *o)
-{
-    return o->next;
-}
-
-DLLEXPORT(VObject*) setValueWithSize_(VObject *prop, void *val, unsigned int size)
-{
-    VObject *sizeProp;
-    setVObjectAnyValue(prop, val);
-    sizeProp = addProp(prop,VCDataSizeProp);
-    setVObjectLongValue(sizeProp, size);
-    return prop;
-}
-
-DLLEXPORT(VObject*) setValueWithSize(VObject *prop, void *val, unsigned int size)
-{
-    void *p = dupStr((const char *)val,size);
-    return setValueWithSize_(prop,p,p?size:0);
-}
-
-DLLEXPORT(void) initPropIterator(VObjectIterator *i, VObject *o)
-{
-    i->start = o->prop; 
-    i->next = 0;
-}
-
-DLLEXPORT(void) initVObjectIterator(VObjectIterator *i, VObject *o)
-{
-    i->start = o->next; 
-    i->next = 0;
-}
-
-DLLEXPORT(int) moreIteration(VObjectIterator *i)
-{ 
-    return (i->start && (i->next==0 || i->next!=i->start));
-}
-
-DLLEXPORT(VObject*) nextVObject(VObjectIterator *i)
-{
-    if (i->start && i->next != i->start) {
-	if (i->next == 0) {
-	    i->next = i->start->next;
-	    return i->next;
-	    }
-	else {
-	    i->next = i->next->next;
-	    return i->next;
-	    }
-	}
-    else return (VObject*)0;
-}
-
-DLLEXPORT(VObject*) isAPropertyOf(VObject *o, const char *id)
-{
-    VObjectIterator i;
-    initPropIterator(&i,o);
-    while (moreIteration(&i)) {
-	VObject *each = nextVObject(&i);
-	if (!stricmp(id,each->id))
-	    return each;
-	}
-    return (VObject*)0;
-}
-
-DLLEXPORT(VObject*) addGroup(VObject *o, const char *g)
-{
-    /*
-	a.b.c
-	-->
-	prop(c)
-	    prop(VCGrouping=b)
-		prop(VCGrouping=a)
-     */
-    char *dot = strrchr(g,'.');
-    if (dot) {
-	VObject *p, *t;
-	char *gs, *n = dot+1;
-	gs = dupStr(g,0);	/* so we can write to it. */
-	/* used to be
-	* t = p = addProp_(o,lookupProp_(n));
-	*/
-	t = p = addProp_(o,lookupProp(n));
-	dot = strrchr(gs,'.');
-	*dot = 0;
-	do {
-	    dot = strrchr(gs,'.');
-	    if (dot) {
-		n = dot+1;
-		*dot=0;
-		}
-	    else
-		n = gs;
-	    /* property(VCGroupingProp=n);
-	     *	and the value may have VCGrouping property
-	     */
-	    t = addProp(t,VCGroupingProp);
-	    setVObjectStringZValue(t,lookupProp_(n));
-	    } while (n != gs);
-	deleteStr(gs);	
-	return p;
-	}
-    else
-	return addProp_(o,lookupProp(g));
-}
-
-DLLEXPORT(VObject*) addPropValue(VObject *o, const char *p, const char *v)
-{
-    VObject *prop;
-    prop = addProp(o,p);
-    setVObjectUStringZValue_(prop, fakeUnicode(v,0));
-    return prop;
-}
-
-DLLEXPORT(VObject*) addPropSizedValue_(VObject *o, const char *p, const char *v,
-	unsigned int size)
-{
-    VObject *prop;
-    prop = addProp(o,p);
-    setValueWithSize_(prop, (void*)v, size);
-    return prop;
-}
-
-DLLEXPORT(VObject*) addPropSizedValue(VObject *o, const char *p, const char *v,
-	unsigned int size)
-{
-    return addPropSizedValue_(o,p,dupStr(v,size),size);
-}
-
-
-
-/*----------------------------------------------------------------------
-  The following pretty print a VObject
-  ----------------------------------------------------------------------*/
-
-static void printVObject_(FILE *fp, VObject *o, int level);
-
-static void indent(FILE *fp, int level)
-{
-    int i;
-    for (i=0;i<level*4;i++) {
-	fputc(' ', fp);
-	}
-}
-
-static void printValue(FILE *fp, VObject *o, int level)
-{
-    switch (VALUE_TYPE(o)) {
-	case VCVT_USTRINGZ: {
-	    char c;
-            char *t,*s;
-	    s = t = fakeCString(USTRINGZ_VALUE_OF(o));
-	    fputc('"',fp);
-	    while (c=*t,c) {
-	        fputc(c,fp);
-		if (c == '\n') indent(fp,level+2);
-		t++;
-		}
-	    fputc('"',fp);
-	    deleteStr(s);
-	    break;
-	    }
-	case VCVT_STRINGZ: {
-	    char c;
-	    const char *s = STRINGZ_VALUE_OF(o);
-	    fputc('"',fp);
-	    while (c=*s,c) {
-	        fputc(c,fp);
-		if (c == '\n') indent(fp,level+2);
-		s++;
-		}
-	    fputc('"',fp);
-	    break;
-	    }
-	case VCVT_UINT:
-	    fprintf(fp,"%d", INTEGER_VALUE_OF(o)); break;
-	case VCVT_ULONG:
-	    fprintf(fp,"%ld", LONG_VALUE_OF(o)); break;
-	case VCVT_RAW:
-	    fprintf(fp,"[raw data]"); break;
-	case VCVT_VOBJECT:
-	    fprintf(fp,"[vobject]\n");
-	    printVObject_(fp,VOBJECT_VALUE_OF(o),level+1);
-	    break;
-	case 0:
-	    fprintf(fp,"[none]"); break;
-	default:
-	    fprintf(fp,"[unknown]"); break;
-	}
-}
-
-static void printNameValue(FILE *fp,VObject *o, int level)
-{
-    indent(fp,level);
-    if (NAME_OF(o)) {
-	fprintf(fp,"%s", NAME_OF(o));
-	}
-    if (VALUE_TYPE(o)) {
-	fputc('=',fp);
-	printValue(fp,o, level);
-	}
-    fprintf(fp,"\n");
-}
-
-static void printVObject_(FILE *fp, VObject *o, int level)
-    {
-    VObjectIterator t;
-    if (o == 0) {
-	fprintf(fp,"[NULL]\n");
-	return;
-	}
-    printNameValue(fp,o,level);
-    initPropIterator(&t,o);
-    while (moreIteration(&t)) {
-	VObject *eachProp = nextVObject(&t);
-	printVObject_(fp,eachProp,level+1);
-	}
-    }
-
-void printVObject(FILE *fp,VObject *o)
-{
-    printVObject_(fp,o,0);
-}
-
-DLLEXPORT(void) printVObjectToFile(char *fname,VObject *o)
-{
-    FILE *fp = fopen(fname,"w");
-    if (fp) {
-	printVObject(fp,o);
-	fclose(fp);
-	}
-}
-
-DLLEXPORT(void) printVObjectsToFile(char *fname,VObject *list)
-{
-    FILE *fp = fopen(fname,"w");
-    if (fp) {
-	while (list) {
-	    printVObject(fp,list);
-	    list = nextVObjectInList(list);
-	    }
-	fclose(fp);
-	}
-}
-
-DLLEXPORT(void) cleanVObject(VObject *o)
-{
-    if (o == 0) return;
-    if (o->prop) {
-	/* destroy time: cannot use the iterator here.
-	   Have to break the cycle in the circular link
-	   list and turns it into regular NULL-terminated
-	   list -- since at some point of destruction,
-	   the reference entry for the iterator to work
-	   will not longer be valid.
-	   */
-	VObject *p;
-	p = o->prop->next;
-	o->prop->next = 0;
-	do {
-	   VObject *t = p->next;
-	   cleanVObject(p);
-	   p = t;
-	   } while (p);
-	}
-    switch (VALUE_TYPE(o)) {
-	case VCVT_USTRINGZ:
-	case VCVT_STRINGZ:
-	case VCVT_RAW:
-		/* assume they are all allocated by malloc. */
-	    free((char*)STRINGZ_VALUE_OF(o));
-	    break;
-	case VCVT_VOBJECT:
-	    cleanVObject(VOBJECT_VALUE_OF(o));
-	    break;
-	}
-    deleteVObject(o);
-}
-
-DLLEXPORT(void) cleanVObjects(VObject *list)
-{
-    while (list) {
-	VObject *t = list;
-	list = nextVObjectInList(list);
-	cleanVObject(t);
-	}
-}
-
-/*----------------------------------------------------------------------
-  The following is a String Table Facilities.
-  ----------------------------------------------------------------------*/
-
-#define STRTBLSIZE 255
-
-static StrItem *strTbl[STRTBLSIZE];
-
-static unsigned int hashStr(const char *s)
-{
-    unsigned int h = 0;
-    int i;
-    for (i=0;s[i];i++) {
-	h += s[i]*i;
-	}
-    return h % STRTBLSIZE;
-}
-
-DLLEXPORT(const char*) lookupStr(const char *s)
-{
-    StrItem *t;
-    unsigned int h = hashStr(s);
-    if ((t = strTbl[h]) != 0) {
-	do {
-	    if (stricmp(t->s,s) == 0) {
-		t->refCnt++;
-		return t->s;
-		}
-	    t = t->next;
-	    } while (t);
-	}
-    s = dupStr(s,0);
-    strTbl[h] = newStrItem(s,strTbl[h]);
-    return s;
-}
-
-DLLEXPORT(void) unUseStr(const char *s)
-{
-    StrItem *t, *p;
-    unsigned int h = hashStr(s);
-    if ((t = strTbl[h]) != 0) {
-	p = t;
-	do {
-	    if (stricmp(t->s,s) == 0) {
-		t->refCnt--;
-		if (t->refCnt == 0) {
-		    if (p == strTbl[h]) {
-			strTbl[h] = t->next;
-			}
-		    else {
-			p->next = t->next;
-			}
-		    deleteStr(t->s);
-		    deleteStrItem(t);
-		    return;
-		    }
-		}
-	    p = t;
-	    t = t->next;
-	    } while (t);
-	}
-}
-
-DLLEXPORT(void) cleanStrTbl()
-{
-    int i;
-    for (i=0; i<STRTBLSIZE;i++) {
-	StrItem *t = strTbl[i];
-	while (t) {
-	    StrItem *p;
-	    deleteStr(t->s);
-	    p = t;
-	    t = t->next;
-	    deleteStrItem(p);
-	    } while (t);
-	strTbl[i] = 0;
-	}
-}
-
-
-struct PreDefProp {
-    const char *name;
-    const char *alias;
-    const char** fields;
-    unsigned int flags;
-    };
-
-/* flags in PreDefProp */
-#define PD_BEGIN	0x1
-#define PD_INTERNAL	0x2
-
-static const char *adrFields[] = {
-    VCPostalBoxProp,
-    VCExtAddressProp,
-    VCStreetAddressProp,
-    VCCityProp,
-    VCRegionProp,
-    VCPostalCodeProp,
-    VCCountryNameProp,
-    0
-};
-
-static const char *nameFields[] = {
-    VCFamilyNameProp,
-    VCGivenNameProp,
-    VCAdditionalNamesProp,
-    VCNamePrefixesProp,
-    VCNameSuffixesProp,
-    NULL
-    };
-
-static const char *orgFields[] = {
-    VCOrgNameProp,
-    VCOrgUnitProp,
-    VCOrgUnit2Prop,
-    VCOrgUnit3Prop,
-    VCOrgUnit4Prop,
-    NULL
-    };
-
-static const char *AAlarmFields[] = {
-    VCRunTimeProp,
-    VCSnoozeTimeProp,
-    VCRepeatCountProp,
-    VCAudioContentProp,
-    0
-    };
-
-/* ExDate -- has unamed fields */
-/* RDate -- has unamed fields */
-
-static const char *DAlarmFields[] = {
-    VCRunTimeProp,
-    VCSnoozeTimeProp,
-    VCRepeatCountProp,
-    VCDisplayStringProp,
-    0
-    };
-
-static const char *MAlarmFields[] = {
-    VCRunTimeProp,
-    VCSnoozeTimeProp,
-    VCRepeatCountProp,
-    VCEmailAddressProp,
-    VCNoteProp,
-    0
-    };
-
-static const char *PAlarmFields[] = {
-    VCRunTimeProp,
-    VCSnoozeTimeProp,
-    VCRepeatCountProp,
-    VCProcedureNameProp,
-    0
-    };
-
-static struct PreDefProp propNames[] = {
-    { VC7bitProp, 0, 0, 0 },
-    { VC8bitProp, 0, 0, 0 },
-    { VCAAlarmProp, 0, AAlarmFields, 0 },
-    { VCAdditionalNamesProp, 0, 0, 0 },
-    { VCAdrProp, 0, adrFields, 0 },
-    { VCAgentProp, 0, 0, 0 },
-    { VCAIFFProp, 0, 0, 0 },
-    { VCAOLProp, 0, 0, 0 },
-    { VCAppleLinkProp, 0, 0, 0 },
-    { VCAttachProp, 0, 0, 0 },
-    { VCAttendeeProp, 0, 0, 0 },
-    { VCATTMailProp, 0, 0, 0 },
-    { VCAudioContentProp, 0, 0, 0 },
-    { VCAVIProp, 0, 0, 0 },
-    { VCBase64Prop, 0, 0, 0 },
-    { VCBBSProp, 0, 0, 0 },
-    { VCBirthDateProp, 0, 0, 0 },
-    { VCBMPProp, 0, 0, 0 },
-    { VCBodyProp, 0, 0, 0 },
-    { VCBusinessRoleProp, 0, 0, 0 },
-    { VCCalProp, 0, 0, PD_BEGIN },
-    { VCCaptionProp, 0, 0, 0 },
-    { VCCardProp, 0, 0, PD_BEGIN },
-    { VCCarProp, 0, 0, 0 },
-    { VCCategoriesProp, 0, 0, 0 },
-    { VCCellularProp, 0, 0, 0 },
-    { VCCGMProp, 0, 0, 0 },
-    { VCCharSetProp, 0, 0, 0 },
-    { VCCIDProp, VCContentIDProp, 0, 0 },
-    { VCCISProp, 0, 0, 0 },
-    { VCCityProp, 0, 0, 0 },
-    { VCClassProp, 0, 0, 0 },
-    { VCCommentProp, 0, 0, 0 },
-    { VCCompletedProp, 0, 0, 0 },
-    { VCContentIDProp, 0, 0, 0 },
-    { VCCountryNameProp, 0, 0, 0 },
-    { VCDAlarmProp, 0, DAlarmFields, 0 },
-    { VCDataSizeProp, 0, 0, PD_INTERNAL },
-    { VCDayLightProp, 0, 0, 0 },
-    { VCDCreatedProp, 0, 0, 0 },
-    { VCDeliveryLabelProp, 0, 0, 0 },
-    { VCDescriptionProp, 0, 0, 0 },
-    { VCDIBProp, 0, 0, 0 },
-    { VCDisplayStringProp, 0, 0, 0 },
-    { VCDomesticProp, 0, 0, 0 },
-    { VCDTendProp, 0, 0, 0 },
-    { VCDTstartProp, 0, 0, 0 },
-    { VCDueProp, 0, 0, 0 },
-    { VCEmailAddressProp, 0, 0, 0 },
-    { VCEncodingProp, 0, 0, 0 },
-    { VCEndProp, 0, 0, 0 },
-    { VCEventProp, 0, 0, PD_BEGIN },
-    { VCEWorldProp, 0, 0, 0 },
-    { VCExNumProp, 0, 0, 0 },
-    { VCExpDateProp, 0, 0, 0 },
-    { VCExpectProp, 0, 0, 0 },
-    { VCExtAddressProp, 0, 0, 0 },
-    { VCFamilyNameProp, 0, 0, 0 },
-    { VCFaxProp, 0, 0, 0 },
-    { VCFullNameProp, 0, 0, 0 },
-    { VCGeoLocationProp, 0, 0, 0 },
-    { VCGeoProp, 0, 0, 0 },
-    { VCGIFProp, 0, 0, 0 },
-    { VCGivenNameProp, 0, 0, 0 },
-    { VCGroupingProp, 0, 0, 0 },
-    { VCHomeProp, 0, 0, 0 },
-    { VCIBMMailProp, 0, 0, 0 },
-    { VCInlineProp, 0, 0, 0 },
-    { VCInternationalProp, 0, 0, 0 },
-    { VCInternetProp, 0, 0, 0 },
-    { VCISDNProp, 0, 0, 0 },
-    { VCJPEGProp, 0, 0, 0 },
-    { VCLanguageProp, 0, 0, 0 },
-    { VCLastModifiedProp, 0, 0, 0 },
-    { VCLastRevisedProp, 0, 0, 0 },
-    { VCLocationProp, 0, 0, 0 },
-    { VCLogoProp, 0, 0, 0 },
-    { VCMailerProp, 0, 0, 0 },
-    { VCMAlarmProp, 0, MAlarmFields, 0 },
-    { VCMCIMailProp, 0, 0, 0 },
-    { VCMessageProp, 0, 0, 0 },
-    { VCMETProp, 0, 0, 0 },
-    { VCModemProp, 0, 0, 0 },
-    { VCMPEG2Prop, 0, 0, 0 },
-    { VCMPEGProp, 0, 0, 0 },
-    { VCMSNProp, 0, 0, 0 },
-    { VCNamePrefixesProp, 0, 0, 0 },
-    { VCNameProp, 0, nameFields, 0 },
-    { VCNameSuffixesProp, 0, 0, 0 },
-    { VCNoteProp, 0, 0, 0 },
-    { VCOrgNameProp, 0, 0, 0 },
-    { VCOrgProp, 0, orgFields, 0 },
-    { VCOrgUnit2Prop, 0, 0, 0 },
-    { VCOrgUnit3Prop, 0, 0, 0 },
-    { VCOrgUnit4Prop, 0, 0, 0 },
-    { VCOrgUnitProp, 0, 0, 0 },
-    { VCPagerProp, 0, 0, 0 },
-    { VCPAlarmProp, 0, PAlarmFields, 0 },
-    { VCParcelProp, 0, 0, 0 },
-    { VCPartProp, 0, 0, 0 },
-    { VCPCMProp, 0, 0, 0 },
-    { VCPDFProp, 0, 0, 0 },
-    { VCPGPProp, 0, 0, 0 },
-    { VCPhotoProp, 0, 0, 0 },
-    { VCPICTProp, 0, 0, 0 },
-    { VCPMBProp, 0, 0, 0 },
-    { VCPostalBoxProp, 0, 0, 0 },
-    { VCPostalCodeProp, 0, 0, 0 },
-    { VCPostalProp, 0, 0, 0 },
-    { VCPowerShareProp, 0, 0, 0 },
-    { VCPreferredProp, 0, 0, 0 },
-    { VCPriorityProp, 0, 0, 0 },
-    { VCProcedureNameProp, 0, 0, 0 },
-    { VCProdIdProp, 0, 0, 0 },
-    { VCProdigyProp, 0, 0, 0 },
-    { VCPronunciationProp, 0, 0, 0 },
-    { VCPSProp, 0, 0, 0 },
-    { VCPublicKeyProp, 0, 0, 0 },
-    { VCQPProp, VCQuotedPrintableProp, 0, 0 },
-    { VCQuickTimeProp, 0, 0, 0 },
-    { VCQuotedPrintableProp, 0, 0, 0 },
-    { VCRDateProp, 0, 0, 0 },
-    { VCRegionProp, 0, 0, 0 },
-    { VCRelatedToProp, 0, 0, 0 },
-    { VCRepeatCountProp, 0, 0, 0 },
-    { VCResourcesProp, 0, 0, 0 },
-    { VCRNumProp, 0, 0, 0 },
-    { VCRoleProp, 0, 0, 0 },
-    { VCRRuleProp, 0, 0, 0 },
-    { VCRSVPProp, 0, 0, 0 },
-    { VCRunTimeProp, 0, 0, 0 },
-    { VCSequenceProp, 0, 0, 0 },
-    { VCSnoozeTimeProp, 0, 0, 0 },
-    { VCStartProp, 0, 0, 0 },
-    { VCStatusProp, 0, 0, 0 },
-    { VCStreetAddressProp, 0, 0, 0 },
-    { VCSubTypeProp, 0, 0, 0 },
-    { VCSummaryProp, 0, 0, 0 },
-    { VCTelephoneProp, 0, 0, 0 },
-    { VCTIFFProp, 0, 0, 0 },
-    { VCTimeZoneProp, 0, 0, 0 },
-    { VCTitleProp, 0, 0, 0 },
-    { VCTLXProp, 0, 0, 0 },
-    { VCTodoProp, 0, 0, PD_BEGIN },
-    { VCTranspProp, 0, 0, 0 },
-    { VCUniqueStringProp, 0, 0, 0 },
-    { VCURLProp, 0, 0, 0 },
-    { VCURLValueProp, 0, 0, 0 },
-    { VCValueProp, 0, 0, 0 },
-    { VCVersionProp, 0, 0, 0 },
-    { VCVideoProp, 0, 0, 0 },
-    { VCVoiceProp, 0, 0, 0 },
-    { VCWAVEProp, 0, 0, 0 },
-    { VCWMFProp, 0, 0, 0 },
-    { VCWorkProp, 0, 0, 0 },
-    { VCX400Prop, 0, 0, 0 },
-    { VCX509Prop, 0, 0, 0 },
-    { VCXRuleProp, 0, 0, 0 },
-    { 0,0,0,0 }
-    };
-
-
-static struct PreDefProp* lookupPropInfo(const char* str)
-{
-    /* brute force for now, could use a hash table here. */
-    int i;
-	
-    for (i = 0; propNames[i].name; i++)
-	if (stricmp(str, propNames[i].name) == 0) {
-	    return &propNames[i];
-	    }
-    
-    return 0;
-}
-
-
-DLLEXPORT(const char*) lookupProp_(const char* str)
-{
-    int i;
-	
-    for (i = 0; propNames[i].name; i++)
-	if (stricmp(str, propNames[i].name) == 0) {
-	    const char* s;
-	    s = propNames[i].alias?propNames[i].alias:propNames[i].name;
-	    return lookupStr(s);
-	    }
-    return lookupStr(str);
-}
-
-
-DLLEXPORT(const char*) lookupProp(const char* str)
-{
-    int i;
-	
-    for (i = 0; propNames[i].name; i++)
-	if (stricmp(str, propNames[i].name) == 0) {
-	    const char *s;
-	    fieldedProp = propNames[i].fields;
-	    s = propNames[i].alias?propNames[i].alias:propNames[i].name;
-	    return lookupStr(s);
-	    }
-    fieldedProp = 0;
-    return lookupStr(str);
-}
-
-
-/*----------------------------------------------------------------------
-  APIs to Output text form.
-  ----------------------------------------------------------------------*/
-#define OFILE_REALLOC_SIZE 256
-typedef struct OFile {
-    FILE *fp;
-    char *s;
-    int len;
-    int limit;
-    int alloc:1;
-    int fail:1;
-    } OFile;
-
-#if 0
-static void appendsOFile(OFile *fp, const char *s)
-{
-    int slen;
-    if (fp->fail) return;
-    slen  = strlen(s);
-    if (fp->fp) {
-	fwrite(s,1,slen,fp->fp);
-	}
-    else {
-stuff:
-	if (fp->len + slen < fp->limit) {
-	    memcpy(fp->s+fp->len,s,slen);
-	    fp->len += slen;
-	    return;
-	    }
-	else if (fp->alloc) {
-	    fp->limit = fp->limit + OFILE_REALLOC_SIZE;
-	    if (OFILE_REALLOC_SIZE <= slen) fp->limit += slen;
-	    fp->s = (char *) realloc(fp->s,fp->limit);
-	    if (fp->s) goto stuff;
-	    }
-	if (fp->alloc)
-	    free(fp->s);
-	fp->s = 0;
-	fp->fail = 1;
-	}
-}
-
-static void appendcOFile(OFile *fp, char c)
-{
-    if (fp->fail) return;
-    if (fp->fp) {
-	fputc(c,fp->fp);
-	}
-    else {
-stuff:
-	if (fp->len+1 < fp->limit) {
-	    fp->s[fp->len] = c;
-	    fp->len++;
-	    return;
-	    }
-	else if (fp->alloc) {
-	    fp->limit = fp->limit + OFILE_REALLOC_SIZE;
-	    fp->s = (char *) realloc(fp->s,fp->limit);
-	    if (fp->s) goto stuff;
-	    }
-	if (fp->alloc)
-	    free(fp->s);
-	fp->s = 0;
-	fp->fail = 1;
-	}
-}
-#else
-static void appendcOFile_(OFile *fp, char c)
-{
-    if (fp->fail) return;
-    if (fp->fp) {
-	fputc(c,fp->fp);
-	}
-    else {
-stuff:
-	if (fp->len+1 < fp->limit) {
-	    fp->s[fp->len] = c;
-	    fp->len++;
-	    return;
-	    }
-	else if (fp->alloc) {
-	    fp->limit = fp->limit + OFILE_REALLOC_SIZE;
-	    fp->s = realloc(fp->s,fp->limit);
-	    if (fp->s) goto stuff;
-	    }
-	if (fp->alloc)
-	    free(fp->s);
-	fp->s = 0;
-	fp->fail = 1;
-	}
-}
-
-static void appendcOFile(OFile *fp, char c)
-{
-    if (c == '\n') {
-	/* write out as <CR><LF> */
-	appendcOFile_(fp,0xd);
-	appendcOFile_(fp,0xa);
-	}
-    else
-	appendcOFile_(fp,c);
-}
-
-static void appendsOFile(OFile *fp, const char *s)
-{
-    int i, slen;
-    slen  = strlen(s);
-    for (i=0; i<slen; i++) {
-	appendcOFile(fp,s[i]);
-	}
-}
-
-#endif
-
-static void initOFile(OFile *fp, FILE *ofp)
-{
-    fp->fp = ofp;
-    fp->s = 0;
-    fp->len = 0;
-    fp->limit = 0;
-    fp->alloc = 0;
-    fp->fail = 0;
-}
-
-static void initMemOFile(OFile *fp, char *s, int len)
-{
-    fp->fp = 0;
-    fp->s = s;
-    fp->len = 0;
-    fp->limit = s?len:0;
-    fp->alloc = s?0:1;
-    fp->fail = 0;
-}
-
-
-static int writeBase64(OFile *fp, unsigned char *s, long len)
-{
-    long cur = 0;
-    int i, numQuads = 0;
-    unsigned long trip;
-    unsigned char b;
-    char quad[5];
-#define MAXQUADS 16
-
-    quad[4] = 0;
-
-    while (cur < len) {
-	    /* collect the triplet of bytes into 'trip' */
-	trip = 0;
-	for (i = 0; i < 3; i++) {
-	    b = (cur < len) ? *(s + cur) : 0;
-	    cur++;
-	    trip = trip << 8 | b;
-	    }
-	/* fill in 'quad' with the appropriate four characters */
-	for (i = 3; i >= 0; i--) {
-	    b = (unsigned char)(trip & 0x3F);
-	    trip = trip >> 6;
-	    if ((3 - i) < (cur - len))
-		    quad[i] = '='; /* pad char */
-	    else if (b < 26) quad[i] = (char)b + 'A';
-	    else if (b < 52) quad[i] = (char)(b - 26) + 'a';
-	    else if (b < 62) quad[i] = (char)(b - 52) + '0';
-	    else if (b == 62) quad[i] = '+';
-	    else quad[i] = '/';
-	    }
-	/* now output 'quad' with appropriate whitespace and line ending */
-	appendsOFile(fp, (numQuads == 0 ? "    " : ""));
-	appendsOFile(fp, quad);
-	appendsOFile(fp, ((cur >= len)?"\n" :(numQuads==MAXQUADS-1?"\n" : "")));
-	numQuads = (numQuads + 1) % MAXQUADS;
-	}
-    appendcOFile(fp,'\n');
-
-    return 1;
-}
-
-static void writeString(OFile *fp, const char *s)
-{
-    appendsOFile(fp,s);
-}
-
-static void writeQPString(OFile *fp, const char *s)
-{
-    char buf[4];
-    int count=0;
-    const char *p = s;
-
-    while (*p) {
-        /* break up lines biggger than 75 chars */
-        if(count >=74){
-		count=0;
-		appendsOFile(fp,"=\n");
-	}
-	
-	/* escape any non ASCII characters and '=' as per rfc1521 */
-	if (*p<= 0x1f || *p >=0x7f || *p == '=' ) {
-		sprintf(buf,"=%02X",(unsigned char)*p);
-		appendsOFile(fp,buf); 
-		count+=3; 
-	} else {
-		appendcOFile(fp,*p);	
-		count++; 
-	}
-	p++;
-    }
-}
-
-
-
-static void writeVObject_(OFile *fp, VObject *o);
-
-static void writeValue(OFile *fp, VObject *o, unsigned long size,int quote)
-{
-    if (o == 0) return;
-    switch (VALUE_TYPE(o)) {
-	case VCVT_USTRINGZ: {
-	    char *s = fakeCString(USTRINGZ_VALUE_OF(o));
-	    if(quote) writeQPString(fp, s);
-	    else writeString(fp,s);
-	    deleteStr(s);
-	    break;
-	    }
-	case VCVT_STRINGZ: {
-	    if(quote) writeQPString(fp, STRINGZ_VALUE_OF(o));
-	    else writeString(fp,STRINGZ_VALUE_OF(o));
-	    break;
-	    }
-	case VCVT_UINT: {
-	    char buf[16];
-	    sprintf(buf,"%u", INTEGER_VALUE_OF(o));
-	    appendsOFile(fp,buf);
-	    break;
-	    }
-	case VCVT_ULONG: {
-	    char buf[16];
-	    sprintf(buf,"%lu", LONG_VALUE_OF(o));
-	    appendsOFile(fp,buf);
-	    break;
-	    }
-	case VCVT_RAW: {
-	    appendcOFile(fp,'\n');
-	    writeBase64(fp,(unsigned char*)(ANY_VALUE_OF(o)),size);
-	    break;
-	    }
-	case VCVT_VOBJECT:
-	    appendcOFile(fp,'\n');
-	    writeVObject_(fp,VOBJECT_VALUE_OF(o));
-	    break;
-	}
-}
-
-static void writeAttrValue(OFile *fp, VObject *o)
-{
-    if (NAME_OF(o)) {
-	struct PreDefProp *pi;
-	pi = lookupPropInfo(NAME_OF(o));
-	if (pi && ((pi->flags & PD_INTERNAL) != 0)) return;
-	appendcOFile(fp,';');
-	appendsOFile(fp,NAME_OF(o));
-	}
-    else
-	appendcOFile(fp,';');
-    if (VALUE_TYPE(o)) {
-	appendcOFile(fp,'=');
-	writeValue(fp,o,0,0);
-	}
-}
-
-static void writeGroup(OFile *fp, VObject *o)
-{
-    char buf1[256];
-    char buf2[256];
-    strcpy(buf1,NAME_OF(o));
-    while ((o=isAPropertyOf(o,VCGroupingProp)) != 0) {
-	strncpy(buf2,STRINGZ_VALUE_OF(o),sizeof(buf2));
-	buf2[sizeof(buf2)-1] = '\0';
-	strncat(buf2,".",sizeof(buf2)-strlen(buf2)-1);
-	strncat(buf2,buf1,sizeof(buf2)-strlen(buf2)-1);
-	strcpy(buf1,buf2);
-	}
-    appendsOFile(fp,buf1);
-}
-
-static int inList(const char **list, const char *s)
-{
-    if (list == 0) return 0;
-    while (*list) {
-	if (stricmp(*list,s) == 0) return 1;
-	list++;
-	}
-    return 0;
-}
-
-static void writeProp(OFile *fp, VObject *o)
-{
-    int isQuoted=0;
-    if (NAME_OF(o)) {
-	struct PreDefProp *pi;
-	VObjectIterator t;
-	const char **fields_ = 0;
-	pi = lookupPropInfo(NAME_OF(o));
-	if (pi && ((pi->flags & PD_BEGIN) != 0)) {
-	    writeVObject_(fp,o);
-	    return;
-	    }
-	if (isAPropertyOf(o,VCGroupingProp))
-	    writeGroup(fp,o);
-	else
-	    appendsOFile(fp,NAME_OF(o));
-	if (pi) fields_ = pi->fields;
-	initPropIterator(&t,o);
-	while (moreIteration(&t)) {
-	    const char *s;
-	    VObject *eachProp = nextVObject(&t);
-	    s = NAME_OF(eachProp);
-	    if (stricmp(VCGroupingProp,s) && !inList(fields_,s))
-		writeAttrValue(fp,eachProp);
-	    if (stricmp(VCQPProp,s)==0 || stricmp(VCQuotedPrintableProp,s)==0)
-		 isQuoted=1;
-	    }
-	if (fields_) {
-	    int i = 0, n = 0;
-	    const char** fields = fields_;
-	    /* output prop as fields */
-	    appendcOFile(fp,':');
-	    while (*fields) {
-		VObject *t = isAPropertyOf(o,*fields);
-		i++;
-		if (t) n = i;
-		fields++;
-		}
-	    fields = fields_;
-	    for (i=0;i<n;i++) {
-		writeValue(fp,isAPropertyOf(o,*fields),0,isQuoted);
-		fields++;
-		if (i<(n-1)) appendcOFile(fp,';');
-		}
-	    }
-	}
-	
-    if (VALUE_TYPE(o)) {
-	unsigned long size = 0;
-        VObject *p = isAPropertyOf(o,VCDataSizeProp);
-	if (p) size = LONG_VALUE_OF(p);
-	appendcOFile(fp,':');
-	writeValue(fp,o,size,isQuoted);
-	}
-
-    appendcOFile(fp,'\n');
-}
-
-static void writeVObject_(OFile *fp, VObject *o)
-{
-    if (NAME_OF(o)) {
-	struct PreDefProp *pi;
-	pi = lookupPropInfo(NAME_OF(o));
-
-	if (pi && ((pi->flags & PD_BEGIN) != 0)) {
-	    VObjectIterator t;
-	    const char *begin = NAME_OF(o);
-	    appendsOFile(fp,"BEGIN:");
-	    appendsOFile(fp,begin);
-	    appendcOFile(fp,'\n');
-	    initPropIterator(&t,o);
-	    while (moreIteration(&t)) {
-		VObject *eachProp = nextVObject(&t);
-		writeProp(fp, eachProp);
-		}
-	    appendsOFile(fp,"END:");
-	    appendsOFile(fp,begin);
-	    appendsOFile(fp,"\n\n");
-	    }
-	}
-}
-
-void writeVObject(FILE *fp, VObject *o)
-{
-    OFile ofp;
-    initOFile(&ofp,fp);
-    writeVObject_(&ofp,o);
-}
-
-DLLEXPORT(void) writeVObjectToFile(char *fname, VObject *o)
-{
-    FILE *fp = fopen(fname,"w");
-    if (fp) {
-	writeVObject(fp,o);
-	fclose(fp);
-	}
-}
-
-DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list)
-{
-    FILE *fp = fopen(fname,"w");
-    if (fp) {
-	while (list) {
-	    writeVObject(fp,list);
-	    list = nextVObjectInList(list);
-	    }
-	fclose(fp);
-	}
-}
-
-DLLEXPORT(char*) writeMemVObject(char *s, int *len, VObject *o)
-{
-    OFile ofp;
-    initMemOFile(&ofp,s,len?*len:0);
-    writeVObject_(&ofp,o);
-    if (len) *len = ofp.len;
-    appendcOFile(&ofp,0);
-    return ofp.s;
-}
-
-DLLEXPORT(char*) writeMemVObjects(char *s, int *len, VObject *list)
-{
-    OFile ofp;
-    initMemOFile(&ofp,s,len?*len:0);
-    while (list) {
-	writeVObject_(&ofp,list);
-	list = nextVObjectInList(list);
-	}
-    if (len) *len = ofp.len;
-    appendcOFile(&ofp,0);
-    return ofp.s;
-}
-
-/*----------------------------------------------------------------------
-  APIs to do fake Unicode stuff.
-  ----------------------------------------------------------------------*/
-DLLEXPORT(wchar_t*) fakeUnicode(const char *ps, int *bytes)
-{
-    wchar_t *r, *pw;
-    int len = strlen(ps)+1;
-
-    pw = r = (wchar_t*)malloc(sizeof(wchar_t)*len);
-    if (bytes)
-	*bytes = len * sizeof(wchar_t);
-
-    while (*ps) { 
-	if (*ps == '\n')
-	    *pw = (wchar_t)0x2028;
-	else if (*ps == '\r')
-	    *pw = (wchar_t)0x2029;
-	else
-	    *pw = (wchar_t)(unsigned char)*ps;
-	ps++; pw++;
-	}				 
-    *pw = (wchar_t)0;
-	
-    return r;
-}
-
-DLLEXPORT(int) uStrLen(const wchar_t *u)
-{
-    int i = 0;
-    while (*u != (wchar_t)0) { u++; i++; }
-    return i;
-}
-
-DLLEXPORT(char*) fakeCString(const wchar_t *u)
-{
-    char *s, *t;
-    int len = uStrLen(u) + 1;
-    t = s = (char*)malloc(len);
-    while (*u) {
-	if (*u == (wchar_t)0x2028)
-	    *t = '\n';
-	else if (*u == (wchar_t)0x2029)
-	    *t = '\r';
-	else
-	    *t = (char)*u;
-	u++; t++;
-	}
-    *t = 0;
-    return s;
-}
-
-/* end of source file vobject.c */
diff --git a/libical/src/libicalvcal/vobject.h b/libical/src/libicalvcal/vobject.h
deleted file mode 100644
index bc31dc8297..0000000000
--- a/libical/src/libicalvcal/vobject.h
+++ /dev/null
@@ -1,366 +0,0 @@
-/***************************************************************************
-(C) Copyright 1996 Apple Computer, Inc., AT&T Corp., International             
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-                                                                               
-For purposes of this license notice, the term Licensors shall mean,            
-collectively, Apple Computer, Inc., AT&T Corp., International                  
-Business Machines Corporation and Siemens Rolm Communications Inc.             
-The term Licensor shall mean any of the Licensors.                             
-                                                                               
-Subject to acceptance of the following conditions, permission is hereby        
-granted by Licensors without the need for written agreement and without        
-license or royalty fees, to use, copy, modify and distribute this              
-software for any purpose.                                                      
-                                                                               
-The above copyright notice and the following four paragraphs must be           
-reproduced in all copies of this software and any software including           
-this software.                                                                 
-                                                                               
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS AND NO LICENSOR SHALL HAVE       
-ANY OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS OR       
-MODIFICATIONS.                                                                 
-                                                                               
-IN NO EVENT SHALL ANY LICENSOR BE LIABLE TO ANY PARTY FOR DIRECT,              
-INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES OR LOST PROFITS ARISING OUT         
-OF THE USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH         
-DAMAGE.                                                                        
-                                                                               
-EACH LICENSOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, EXPRESS OR IMPLIED,       
-INCLUDING BUT NOT LIMITED TO ANY WARRANTY OF NONINFRINGEMENT OR THE            
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR             
-PURPOSE.                                                                       
-
-The software is provided with RESTRICTED RIGHTS.  Use, duplication, or         
-disclosure by the government are subject to restrictions set forth in          
-DFARS 252.227-7013 or 48 CFR 52.227-19, as applicable.                         
-
-***************************************************************************/
-
-/*
- 
-The vCard/vCalendar C interface is implemented in the set 
-of files as follows:
-
-vcc.y, yacc source, and vcc.c, the yacc output you will use
-implements the core parser
-
-vobject.c implements an API that insulates the caller from
-the parser and changes in the vCard/vCalendar BNF
-
-port.h defines compilation environment dependent stuff
-
-vcc.h and vobject.h are header files for their .c counterparts
-
-vcaltmp.h and vcaltmp.c implement vCalendar "macro" functions
-which you may find useful.
-
-test.c is a standalone test driver that exercises some of
-the features of the APIs provided. Invoke test.exe on a
-VCARD/VCALENDAR input text file and you will see the pretty
-print output of the internal representation (this pretty print
-output should give you a good idea of how the internal 
-representation looks like -- there is one such output in the 
-following too). Also, a file with the .out suffix is generated 
-to show that the internal representation can be written back 
-in the original text format.
-
-For more information on this API see the readme.txt file
-which accompanied this distribution.
-
-  Also visit:
-
-		http://www.versit.com
-		http://www.ralden.com
-
-*/
-
-
-#ifndef __VOBJECT_H__
-#define __VOBJECT_H__ 1
-
-
-#include "port.h"
-#include <stdlib.h>
-#include <stdio.h>
-
-#if defined(__CPLUSPLUS__) || defined(__cplusplus)
-extern "C" {
-#endif
-
-
-#define VC7bitProp				"7BIT"
-#define VC8bitProp				"8BIT"
-#define VCAAlarmProp			"AALARM"
-#define VCAdditionalNamesProp	"ADDN"
-#define VCAdrProp				"ADR"
-#define VCAgentProp				"AGENT"
-#define VCAIFFProp				"AIFF"
-#define VCAOLProp				"AOL"
-#define VCAppleLinkProp			"APPLELINK"
-#define VCAttachProp			"ATTACH"
-#define VCAttendeeProp			"ATTENDEE"
-#define VCATTMailProp			"ATTMAIL"
-#define VCAudioContentProp		"AUDIOCONTENT"
-#define VCAVIProp				"AVI"
-#define VCBase64Prop			"BASE64"
-#define VCBBSProp				"BBS"
-#define VCBirthDateProp			"BDAY"
-#define VCBMPProp				"BMP"
-#define VCBodyProp				"BODY"
-#define VCBusinessRoleProp		"ROLE"
-#define VCCalProp				"VCALENDAR"
-#define VCCaptionProp			"CAP"
-#define VCCardProp				"VCARD"
-#define VCCarProp				"CAR"
-#define VCCategoriesProp		"CATEGORIES"
-#define VCCellularProp			"CELL"
-#define VCCGMProp				"CGM"
-#define VCCharSetProp			"CS"
-#define VCCIDProp				"CID"
-#define VCCISProp				"CIS"
-#define VCCityProp				"L"
-#define VCClassProp				"CLASS"
-#define VCCommentProp			"NOTE"
-#define VCCompletedProp			"COMPLETED"
-#define VCContentIDProp			"CONTENT-ID"
-#define VCCountryNameProp		"C"
-#define VCDAlarmProp			"DALARM"
-#define VCDataSizeProp			"DATASIZE"
-#define VCDayLightProp			"DAYLIGHT"
-#define VCDCreatedProp			"DCREATED"
-#define VCDeliveryLabelProp     "LABEL"
-#define VCDescriptionProp		"DESCRIPTION"
-#define VCDIBProp				"DIB"
-#define VCDisplayStringProp		"DISPLAYSTRING"
-#define VCDomesticProp			"DOM"
-#define VCDTendProp				"DTEND"
-#define VCDTstartProp			"DTSTART"
-#define VCDueProp				"DUE"
-#define VCEmailAddressProp		"EMAIL"
-#define VCEncodingProp			"ENCODING"
-#define VCEndProp				"END"
-#define VCEventProp				"VEVENT"
-#define VCEWorldProp			"EWORLD"
-#define VCExNumProp				"EXNUM"
-#define VCExpDateProp			"EXDATE"
-#define VCExpectProp			"EXPECT"
-#define VCExtAddressProp		"EXT ADD"
-#define VCFamilyNameProp		"F"
-#define VCFaxProp				"FAX"
-#define VCFullNameProp			"FN"
-#define VCGeoProp				"GEO"
-#define VCGeoLocationProp		"GEO"
-#define VCGIFProp				"GIF"
-#define VCGivenNameProp			"G"
-#define VCGroupingProp			"Grouping"
-#define VCHomeProp				"HOME"
-#define VCIBMMailProp			"IBMMail"
-#define VCInlineProp			"INLINE"
-#define VCInternationalProp		"INTL"
-#define VCInternetProp			"INTERNET"
-#define VCISDNProp				"ISDN"
-#define VCJPEGProp				"JPEG"
-#define VCLanguageProp			"LANG"
-#define VCLastModifiedProp		"LAST-MODIFIED"
-#define VCLastRevisedProp		"REV"
-#define VCLocationProp			"LOCATION"
-#define VCLogoProp				"LOGO"
-#define VCMailerProp			"MAILER"
-#define VCMAlarmProp			"MALARM"
-#define VCMCIMailProp			"MCIMAIL"
-#define VCMessageProp			"MSG"
-#define VCMETProp				"MET"
-#define VCModemProp				"MODEM"
-#define VCMPEG2Prop				"MPEG2"
-#define VCMPEGProp				"MPEG"
-#define VCMSNProp				"MSN"
-#define VCNamePrefixesProp		"NPRE"
-#define VCNameProp				"N"
-#define VCNameSuffixesProp		"NSUF"
-#define VCNoteProp				"NOTE"
-#define VCOrgNameProp			"ORGNAME"
-#define VCOrgProp				"ORG"
-#define VCOrgUnit2Prop			"OUN2"
-#define VCOrgUnit3Prop			"OUN3"
-#define VCOrgUnit4Prop			"OUN4"
-#define VCOrgUnitProp			"OUN"
-#define VCPagerProp				"PAGER"
-#define VCPAlarmProp			"PALARM"
-#define VCParcelProp			"PARCEL"
-#define VCPartProp				"PART"
-#define VCPCMProp				"PCM"
-#define VCPDFProp				"PDF"
-#define VCPGPProp				"PGP"
-#define VCPhotoProp				"PHOTO"
-#define VCPICTProp				"PICT"
-#define VCPMBProp				"PMB"
-#define VCPostalBoxProp			"BOX"
-#define VCPostalCodeProp		"PC"
-#define VCPostalProp			"POSTAL"
-#define VCPowerShareProp		"POWERSHARE"
-#define VCPreferredProp			"PREF"
-#define VCPriorityProp			"PRIORITY"
-#define VCProcedureNameProp		"PROCEDURENAME"
-#define VCProdIdProp			"PRODID"
-#define VCProdigyProp			"PRODIGY"
-#define VCPronunciationProp		"SOUND"
-#define VCPSProp				"PS"
-#define VCPublicKeyProp			"KEY"
-#define VCQPProp				"QP"
-#define VCQuickTimeProp			"QTIME"
-#define VCQuotedPrintableProp	"QUOTED-PRINTABLE"
-#define VCRDateProp				"RDATE"
-#define VCRegionProp			"R"
-#define VCRelatedToProp			"RELATED-TO"
-#define VCRepeatCountProp		"REPEATCOUNT"
-#define VCResourcesProp			"RESOURCES"
-#define VCRNumProp				"RNUM"
-#define VCRoleProp				"ROLE"
-#define VCRRuleProp				"RRULE"
-#define VCRSVPProp				"RSVP"
-#define VCRunTimeProp			"RUNTIME"
-#define VCSequenceProp			"SEQUENCE"
-#define VCSnoozeTimeProp		"SNOOZETIME"
-#define VCStartProp				"START"
-#define VCStatusProp			"STATUS"
-#define VCStreetAddressProp		"STREET"
-#define VCSubTypeProp			"SUBTYPE"
-#define VCSummaryProp			"SUMMARY"
-#define VCTelephoneProp			"TEL"
-#define VCTIFFProp				"TIFF"
-#define VCTimeZoneProp			"TZ"
-#define VCTitleProp				"TITLE"
-#define VCTLXProp				"TLX"
-#define VCTodoProp				"VTODO"
-#define VCTranspProp			"TRANSP"
-#define VCUniqueStringProp		"UID"
-#define VCURLProp				"URL"
-#define VCURLValueProp			"URLVAL"
-#define VCValueProp				"VALUE"
-#define VCVersionProp			"VERSION"
-#define VCVideoProp				"VIDEO"
-#define VCVoiceProp				"VOICE"
-#define VCWAVEProp				"WAVE"
-#define VCWMFProp				"WMF"
-#define VCWorkProp				"WORK"
-#define VCX400Prop				"X400"
-#define VCX509Prop				"X509"
-#define VCXRuleProp				"XRULE"
-
-/* Extensions */
-
-#define XPilotIdProp                            "X-PILOTID"
-#define XPilotStatusProp                        "X-PILOTSTAT"
-
-typedef struct VObject VObject;
-
-typedef struct VObjectIterator {
-    VObject* start;
-    VObject* next;
-    } VObjectIterator;
-
-extern DLLEXPORT(VObject*) newVObject(const char *id);
-extern DLLEXPORT(void) deleteVObject(VObject *p);
-extern DLLEXPORT(char*) dupStr(const char *s, unsigned int size);
-extern DLLEXPORT(void) deleteStr(const char *p);
-extern DLLEXPORT(void) unUseStr(const char *s);
-
-extern DLLEXPORT(void) setVObjectName(VObject *o, const char* id);
-extern DLLEXPORT(void) setVObjectStringZValue(VObject *o, const char *s);
-extern DLLEXPORT(void) setVObjectStringZValue_(VObject *o, const char *s);
-extern DLLEXPORT(void) setVObjectUStringZValue(VObject *o, const wchar_t *s);
-extern DLLEXPORT(void) setVObjectUStringZValue_(VObject *o, const wchar_t *s);
-extern DLLEXPORT(void) setVObjectIntegerValue(VObject *o, unsigned int i);
-extern DLLEXPORT(void) setVObjectLongValue(VObject *o, unsigned long l);
-extern DLLEXPORT(void) setVObjectAnyValue(VObject *o, void *t);
-extern DLLEXPORT(VObject*) setValueWithSize(VObject *prop, void *val, unsigned int size);
-extern DLLEXPORT(VObject*) setValueWithSize_(VObject *prop, void *val, unsigned int size);
-
-extern DLLEXPORT(const char*) vObjectName(VObject *o);
-extern DLLEXPORT(const char*) vObjectStringZValue(VObject *o);
-extern DLLEXPORT(const wchar_t*) vObjectUStringZValue(VObject *o);
-extern DLLEXPORT(unsigned int) vObjectIntegerValue(VObject *o);
-extern DLLEXPORT(unsigned long) vObjectLongValue(VObject *o);
-extern DLLEXPORT(void*) vObjectAnyValue(VObject *o);
-extern DLLEXPORT(VObject*) vObjectVObjectValue(VObject *o);
-extern DLLEXPORT(void) setVObjectVObjectValue(VObject *o, VObject *p);
-
-extern DLLEXPORT(VObject*) addVObjectProp(VObject *o, VObject *p);
-extern DLLEXPORT(VObject*) addProp(VObject *o, const char *id);
-extern DLLEXPORT(VObject*) addProp_(VObject *o, const char *id);
-extern DLLEXPORT(VObject*) addPropValue(VObject *o, const char *p, const char *v);
-extern DLLEXPORT(VObject*) addPropSizedValue_(VObject *o, const char *p, const char *v, unsigned int size);
-extern DLLEXPORT(VObject*) addPropSizedValue(VObject *o, const char *p, const char *v, unsigned int size);
-extern DLLEXPORT(VObject*) addGroup(VObject *o, const char *g);
-extern DLLEXPORT(void) addList(VObject **o, VObject *p);
-
-extern DLLEXPORT(VObject*) isAPropertyOf(VObject *o, const char *id);
-
-extern DLLEXPORT(VObject*) nextVObjectInList(VObject *o);
-extern DLLEXPORT(void) initPropIterator(VObjectIterator *i, VObject *o);
-extern DLLEXPORT(int) moreIteration(VObjectIterator *i);
-extern DLLEXPORT(VObject*) nextVObject(VObjectIterator *i);
-
-extern DLLEXPORT(char*) writeMemVObject(char *s, int *len, VObject *o);
-extern DLLEXPORT(char*) writeMemVObjects(char *s, int *len, VObject *list);
-
-extern DLLEXPORT(const char*) lookupStr(const char *s);
-extern DLLEXPORT(void) cleanStrTbl();
-
-extern DLLEXPORT(void) cleanVObject(VObject *o);
-extern DLLEXPORT(void) cleanVObjects(VObject *list);
-
-extern DLLEXPORT(const char*) lookupProp(const char* str);
-extern DLLEXPORT(const char*) lookupProp_(const char* str);
-
-extern DLLEXPORT(wchar_t*) fakeUnicode(const char *ps, int *bytes);
-extern DLLEXPORT(int) uStrLen(const wchar_t *u);
-extern DLLEXPORT(char*) fakeCString(const wchar_t *u);
-
-extern DLLEXPORT(void) printVObjectToFile(char *fname,VObject *o);
-extern DLLEXPORT(void) printVObjectsToFile(char *fname,VObject *list);
-extern DLLEXPORT(void) writeVObjectToFile(char *fname, VObject *o);
-extern DLLEXPORT(void) writeVObjectsToFile(char *fname, VObject *list);
-
-extern DLLEXPORT(int) vObjectValueType(VObject *o);
-
-/* return type of vObjectValueType: */
-#define VCVT_NOVALUE	0
-	/* if the VObject has no value associated with it. */
-#define VCVT_STRINGZ	1
-	/* if the VObject has value set by setVObjectStringZValue. */
-#define VCVT_USTRINGZ	2
-	/* if the VObject has value set by setVObjectUStringZValue. */
-#define VCVT_UINT		3
-	/* if the VObject has value set by setVObjectIntegerValue. */
-#define VCVT_ULONG		4
-	/* if the VObject has value set by setVObjectLongValue. */
-#define VCVT_RAW		5
-	/* if the VObject has value set by setVObjectAnyValue. */
-#define VCVT_VOBJECT	6
-	/* if the VObject has value set by setVObjectVObjectValue. */
-
-extern const char** fieldedProp;
-
-/* NOTE regarding printVObject and writeVObject
-
-The functions below are not exported from the DLL because they
-take a FILE* as a parameter, which cannot be passed across a DLL 
-interface (at least that is my experience). Instead you can use
-their companion functions which take file names or pointers
-to memory. However, if you are linking this code into 
-your build directly then you may find them a more convenient API
-and you can go ahead and use them. If you try to use them with 
-the DLL LIB you will get a link error.
-*/
-extern void printVObject(FILE *fp,VObject *o);
-extern void writeVObject(FILE *fp, VObject *o);
-
-
-#if defined(__CPLUSPLUS__) || defined(__cplusplus)
-}
-#endif
-
-#endif /* __VOBJECT_H__ */
-
-
diff --git a/libical/src/python/.cvsignore b/libical/src/python/.cvsignore
deleted file mode 100644
index 4f03abd9aa..0000000000
--- a/libical/src/python/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-Makefile
-Makefile.in
-.deps
-.libs
-*.lo
-*.la
-*.pyc
-LibicalWrap.c
-LibicalWrap_wrap.doc
-config.c
diff --git a/libical/src/python/Attendee.py b/libical/src/python/Attendee.py
deleted file mode 100644
index 52001ba3e8..0000000000
--- a/libical/src/python/Attendee.py
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/usr/bin/env python 
-# -*- Mode: python -*-
-#======================================================================
-# FILE: Property.py
-# CREATOR: eric 
-#
-# DESCRIPTION:
-#   
-#
-#  $Id$
-#  $Locker$
-#
-# (C) COPYRIGHT 2001, Eric Busboom <eric@softwarestudio.org>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>  
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either: 
-#
-#    The LGPL as published by the Free Software Foundation, version
-#    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-#
-#  Or:
-#
-#    The Mozilla Public License Version 1.0. You may obtain a copy of
-#    the License at http://www.mozilla.org/MPL/
-#======================================================================
-
-from LibicalWrap import *
-from Property import Property
-from types import DictType, StringType, IntType
-
-class Attendee(Property):
-    """Class for Attendee properties.
-
-    Usage:
-    Attendee([dict])
-    Attendee([address])
-
-    Where:
-    dict is an optional dictionary with keys of
-     'value': CAL-ADDRESS string and any parameter: parameter_value entries.
-     'name' and 'value_type' entries in dict are ignored and automatically set
-     with the appropriate values.
-    address is the CAL-ADDRESS (string) of the Attendee 
-    """
-
-    def __init__(self, arg={}):
-        
-        assert(isinstance(arg,DictType))
-
-        ref = None
-        
-        if arg!={}:
-            ref = arg['ref']
-
-        Property.__init__(self,type='ATTENDEE',ref=ref)
-        
-    def _doParam(self, parameter, v):
-        if v!=None:
-            self[parameter]=v
-        return self[parameter]
-
-    # Methods for accessing enumerated parameters
-    def cn(self, v=None): self._doParam('CN', v)
-    def cutype(self, v=None): self._doParam('CUTYPE', v)
-    def dir(self, v=None): self._doParam('DIR', v)
-    def delegated_from(self, v=None): self._doParam('DELEGATED-FROM', v)
-    def delegated_to(self, v=None): self._doParam('DELEGATED-TO', v)
-    def language(self, v=None): self._doParam('LANGUAGE', v)
-    def member(self, v=None): self._doParam('MEMBER', v)
-    def partstat(self, v=None): self._doParam('PARTSTAT', v)
-    def role(self, v=None): self._doParam('ROLE', v)
-    def rsvp(self, v=None): self._doParam('RSVP', v)
-    def sent_by(self, v=None): self._doParam('SENT-BY', v)
-
-
-class Organizer(Property):
-    """Class for Organizer property.
-    """
-
-    def __init__(self, arg={}):
-
-        assert(isinstance(arg, DictType))
-        
-        ref = None
-        if arg != {}:
-            ref = arg['ref']
-        Property.__init__(self, type='ORGANIZER', ref=ref)
-       
-##         param_t = ( 'CN', 'DIR', 'SENT-BY', 'LANGUAGE' )
-##         for param in param_t:
-##             self[param] = None
-##         if value != None:
-##             self.value(value)
-
-
-    def _doParam(self, parameter, v):
-        if v!=None:
-            self[parameter]=v
-        return self[parameter]
-
-    def name(self):
-        "Return the name of the property."
-        return Property.name(self)
-
-    def value_type(self):
-        "Return the value type of the property."
-        return self._desc['value_type']
-
-    # Methods for accessing enumerated parameters
-    def cn(self, v=None): self._doParam('CN', v)
-    def dir(self, v=None): self._doParam('DIR', v)
-    def language(self, v=None): self._doParam('LANGUAGE', v)
-    def sent_by(self, v=None): self._doParam('SENT-BY', v)
diff --git a/libical/src/python/ChangeLog b/libical/src/python/ChangeLog
deleted file mode 100644
index ef096f4e3a..0000000000
--- a/libical/src/python/ChangeLog
+++ /dev/null
@@ -1,129 +0,0 @@
-2001-04-04  Eric Busboom  <eric@softwarestudio.org>
-
-	* Component.py Added Calendar class. 
-
-	* Componeny.py Changed all component constructor so they cannot
- 	take string arguments. Now, only NewComponent() can turn an iCal
- 	string into a component.
-
-	
-2001-04-02  Eric Busboom  <eric@softwarestudio.org>
-
-	* Component.py removed arguments from the Event constructor, since
- 	I presume that the Component derived classes will always be
- 	constructed with no arguments.
-
-	* Property.py Split out Attendee, Organizer, Time, Duration and
- 	Period into their own files. Moved remaining classes to Derived
- 	Properties.pm
-
-	
-2001-03-13  Eric Busboom  <eric@softwarestudio.org>
-
-	* Component.py Added Component.property()
-
-2001-03-10  Patrick Lewis <plewis@inetarena.com>
-
-	* Added __str__ method to Collection.Collection
-
-	* Component.Component can now be initialized without arguments
-
-	* Made _singular_property and _multiple_properties (in Component)
-	useful for nearly all the specific component interfaces
-
-	* Changed Property.Attendee and Property.Organizer to allow creation
-	with no arguments
-
-	* Filled in Todo skeleton
-
-	* Added test function for an Event
-
-
-2001-03-05  Eric Busboom  <eric@softwarestudio.org>
-
-	* Property.py Added a lot of exception code to signal failure to
- 	create a Property.
-
-	* DerivedProperties.py Added derived property classes for RDATE
- 	and TRIGGER, two properties that can have one of two value types. 
-
-
-2001-03-04  Eric Busboom  <eric@softwarestudio.org>
-
-	* Property.pm Added Property.ConstructorFailedError exception
-
-	* Component.pm fixed bug in Collection.__setslice__. "," used
- 	instead of ":"
-
-2001-03-04  Patrick Lewis <plewis@inetarena.com>
-	
-	* Split Libical.py file into Component.py, Property.py, Collection.py, 
-	and Store.py
-
-	* Added test_* functions to test.py
-
-	* Changed component bindings to return a Collection when objects can 
-	have multiple values
-
-	* Changed Component object to allow for creation of an object without
-	an initial string
-
-	* Added Todo and Journal events
-
-2001-02-28  Eric Busboom  <eric@softwarestudio.org>
-
-	* Property Remove most internal data. The property now work
- 	alsmost entirely off of the icalproperty that it holds a reference
- 	to. Made changes in all derived Properties to accomodate the
- 	change.
-
-	* Property Added __del__ 
-
-	* Component Component.properties() now caches properties that it
- 	constructs, so two calls to properties() to that get the same
- 	icalproperty will also get the same Property.
-
-	* Property Added Property.__cmp__ to test equality of properties
- 	based on ical string values
-
-2001-02-27  Eric Busboom  <eric@softwarestudio.org>
-
-	* Property Added Property.ref() to set/get the reference to the
- 	Property's internal icalproperty
-
-	* Property Property._update_value now changes the icalproperty
- 	value if a reference has been set.
-
-	* Component re-instituted Component.properties(). The routine now
- 	adds a 'ref' key to the dict that holds the python pointer
- 	string. The C hex value of the pointer is in the 'pid' key
-	
-
-2001-02-27  Patrick Lewis  <plewis@inetarena.com>
-
-	* Backed out changes to Component removing comp_p; 
-	  Component.comp_p should be restored
-
-2001-02-26  Eric Busboom  <eric@softwarestudio.org>
-
-	* Period Added test routine,test_period()
-
-	* Period implemented methods in period
-
-	* Time Addedd addition and subtraction operators
-
-2001-02-25  Eric Busboom  <eric@softwarestudio.org>
-
-	* Libical.py Added test routine for time, time_test()
-
-	* Libical.py Remove end of line chars ('\r\n" ) from
- 	Property._str__. Caller should add these lines itself
-
-	* Liical.py CHanges Time._update_values to set time VALUE type
- 	based on use of is_date, rather than length of string.
-
-	* Libical.py Removed call to _update_value in TIme::timezone
-	
-
-	* Libical.py changed update_value to _update_value
-
diff --git a/libical/src/python/Collection.py b/libical/src/python/Collection.py
deleted file mode 100644
index 48092aadaa..0000000000
--- a/libical/src/python/Collection.py
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/usr/bin/env python 
-# -*- Mode: python -*-
-#======================================================================
-# FILE: Collection.py
-# CREATOR: eric 
-#
-# DESCRIPTION:
-#   
-#
-#  $Id$
-#  $Locker$
-#
-# (C) COPYRIGHT 2001, Eric Busboom <eric@softwarestudio.org>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>  
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either: 
-#
-#    The LGPL as published by the Free Software Foundation, version
-#    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-#
-#  Or:
-#
-#    The Mozilla Public License Version 1.0. You may obtain a copy of
-#    the License at http://www.mozilla.org/MPL/
-#======================================================================
-
-from types import *
-
-class Collection:
-    """A group of components that can be modified somewhat like a list.
-
-    Usage:
-        Collection(componet, propSequence)
-
-    component is a Component object
-    propSequence is a list or tuple of Property (or subclass of Property)
-        of objects already in component
-    """
-
-    def __init__(self, component, propSequence):
-        self._properties = list(propSequence[:])
-        self._component = component
-
-    def __getslice__(self, beg, end):
-        return Collection(self._component, self._properties[beg:end])
-
-    def __setslice__(self, beg, end, sequence):
-
-        if  not isinstance(sequence,ListType):
-            raise TypeError, "must assign list (not instance) to slice"
-
-        oldProps = self._properties[beg:end]
-
-        for p in oldProps:
-            self._component.remove_property(p)
-
-        self._properties[beg:end] = sequence
-        for p in sequence:
-            self._component.add_property(p)
-            
-    def __getitem__(self, i):
-        return self._properties[i]
-
-    def __setitem__(self, i, prop):
-        self._component.remove_property(self._properties[i])
-        self._component.add_property(prop)
-        self._properties[i]=prop
-
-    def __delitem__(self, i):
-        self._component.remove_property(self._properties[i])
-        del self._properties[i]
-
-    def __len__(self):
-        return len(self._properties)
-
-    def __str__(self):
-        s = "[ "
-        if len(self._properties) > 0:
-            s = s + str(self._properties[0])
-            for p in self._properties[1:]:
-                s = "%s, %s" % (s, p)
-        s = s + " ]"
-        return s
-            
-    def append(self, property):
-        self._properties.append(property)
-        self._component.add_property(property)
-
-class ComponentCollection:
-    
-    def __init__(self, parent, componentSequence):
-        self._parent = parent
-        self._components = list(componentSequence[:])
-
-    def __getslice__(self, beg, end):
-        return ComponentCollection(self._parent, self._components[beg:end])
-
-    def __setslice__(self, beg, end, sequence):
-        oldComps = self._components[beg:end]
-        self._components.__setslice__(beg, end, sequence)
-        for c in sequence:
-            self._components.addComponent(c)
-        for c in oldComps:
-            self._parent.remove_component(c)
-
-    def __getitem__(self, i):
-        return self._components[i]
-
-    def __setitem__(self, i, prop):
-        self._parent.remove_component(self._components[i])
-        self._parent.add_property(prop)
-        self._components[i]=prop
-
-    def __delitem__(self, i):
-        self._parent.remove_componet(self._components[i])
-        del self._components[i]
-
-    def __len__(self):
-        return len(self._components)
-            
-    def append(self, property):
-        self._components.append(property)
-        self._parent.addComponent(property)
diff --git a/libical/src/python/Component.py b/libical/src/python/Component.py
deleted file mode 100644
index 41ef7419db..0000000000
--- a/libical/src/python/Component.py
+++ /dev/null
@@ -1,799 +0,0 @@
-#!/usr/bin/env python 
-# -*- Mode: python -*-
-#======================================================================
-# FILE: Component.py
-# CREATOR: eric 
-#
-# DESCRIPTION:
-#   
-#
-#  $Id$
-#  $Locker$
-#
-# (C) COPYRIGHT 2001, Eric Busboom <eric@softwarestudio.org>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>  
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either: 
-#
-#    The LGPL as published by the Free Software Foundation, version
-#    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-#
-#  Or:
-#
-#    The Mozilla Public License Version 1.0. You may obtain a copy of
-#    the License at http://www.mozilla.org/MPL/
-#======================================================================
-
-from LibicalWrap import *
-from types import DictType, StringType, IntType
-from Property import Property
-from Collection import *
-from Attendee import Attendee, Organizer
-from Time import Time
-from Duration import Duration
-from Period import Period
-import string
-
-WrapperNULL = None
-
-class Component:
-
-    def __init__(self,ref=None,kind=None):
-
-        if ref != None:
-            self._ref = ref
-        elif kind != None:
-            self._ref = icalcomponent_new(
-                icalcomponent_string_to_kind("VCALENDAR"))
-            _kind = icalcomponent_string_to_kind(kind)
-            inner = icalcomponent_new(_kind)
-            
-            icalcomponent_add_component(self._ref,inner);
-
-        else:
-            raise "Could not construct component of kind" + kind
-
-        self.cached_props = {}
-        self.cached_comps = {}
-
-    def __del__(self):
-        if self._ref != None and icalcomponent_get_parent(self._ref) != WrapperNULL:
-
-            for k in self.cached_props.keys():
-                del self.cached_props[k]
-            
-            icalcomponent_free(self._ref)
-            self._ref = None
-
-    def _prop_from_ref(self,p):
-
-        if(p == None or p== WrapperNULL):
-            return None;
-
-	d = {}
-	d['value'] = icalproperty_get_value_as_string(p)
-	d['name'] = icalproperty_get_name(p)
-
-	propkind = icalproperty_string_to_kind(d['name'])
-	kind = icalproperty_kind_to_value_kind(propkind)
-	d['value_type'] = icalvalue_kind_to_string(kind)
-        d['ref'] = p
-
-
-        if not self.cached_props.has_key(p):
-            
-            if d['value_type'] == 'DATE-TIME' or d['value_type'] == 'DATE':
-                prop = Time(d,)
-            elif d['value_type'] == 'PERIOD':
-                prop = Period(d)
-            elif d['value_type'] == 'DURATION':
-                prop = Duration(d)
-            elif d['name'] == 'ATTACH':
-                prop = Attach(d)
-            elif d['name'] == 'ATTENDEE':
-                prop = Attendee(d)
-            elif d['name'] == 'ORGANIZER':
-                prop = Organizer(d)
-            else:
-                prop=Property(ref=p)
-                
-            self.cached_props[p] = prop
-
-    def property(self, type):
-
-       p = icallangbind_get_first_property(self._ref,type) 
-
-       if p !=WrapperNULL:
-           self._prop_from_ref(p)
-           prop =  self.cached_props[p]
-           return prop
-       else :    
-           return None
-
-    def properties(self,type='ANY'): 
-        """  
-        Return a list of Property instances, each representing a
-        property of the type 'type.'
-        """
-
-        props = []
-
-        p = icallangbind_get_first_property(self._ref,type)
-
-        while p !=WrapperNULL and p != None:
-
-            self._prop_from_ref(p) # Puts property in self.cached_props
-            prop =  self.cached_props[p]
-            props.append(prop)
-            p = icallangbind_get_next_property(self._ref,type)
-
-        return Collection(self,props)
- 
-    def add_property(self, prop):
-        "Adds the property object to the component."
-        
-        if not isinstance(prop,Property):
-            raise TypeError
-
-        prop_p = prop.ref()
-
-        if not prop_p:
-            s = str(prop)
-            prop_p = icalproperty_new_from_string(s)
-
-            if prop_p == WrapperNULL:
-                raise "Bad property string: " + s
-
-            prop.ref(prop_p)
-
-        if icalproperty_get_parent(prop_p)==WrapperNULL:
-            icalcomponent_add_property(self._ref, prop_p)
-        elif  icalproperty_get_parent(prop_p) != self._ref:
-            raise "Property is already a child of another component"
-
-
-    def remove_property(self,prop):
-
-        if prop.ref() and self.cached_props.has_key(prop.ref()):
-
-            del self.cached_props[prop.ref()]
-            icalcomponent_remove_property(self._ref,prop.ref())
-
-    def components(self,type='ANY'):        
-        comps = []
-
-        kind = icalcomponent_string_to_kind(type)
-        c = icalcomponent_get_first_component(self._ref,kind);
-
-        while c != WrapperNULL and c != None:
-
-            if not self.cached_comps.has_key(c):              
-
-                self.cached_comps[c] = Component(c)
-
-            comp = self.cached_comps[c]
-            comps.append(comp)
-            c = icalcomponent_get_next_component(self._ref,kind);
-
-        return comps
-
-    def inner_component(self):
-        
-        inner = icalcomponent_get_inner(self._ref)
-
-        if inner == WrapperNULL and inner != None:
-            return None
-
-        return NewComponent(inner)
-
-    def add_component(self, comp):
-        "Adds a child component."
-
-        if not isinstance(comp,Component):
-            raise ValueError("Expected a Component")
-
-        if icalcomponent_get_parent(comp._ref) != WrapperNULL:
-           raise "Failed to add child component. Child already has a parent"; 
-
-        icalcomponent_add_component(self._ref,comp._ref)
-
-    def remove_component(self, comp):
-        "Removes a child component"
-
-        if not isinstance(comp,Component):
-            raise ValueError("Expected a Component")
-
-        icalcomponent_remove_component(self._ref,comp._ref)
-
-    def as_ical_string(self):
-        return self.__str__()
-
-    def __str__(self):
-
-        return icalcomponent_as_ical_string(self._ref)
-
-    def ref(self):
-	""" Return the internal reference to the libical icalproperty """
-	return self._ref
-
-def CloneComponent(c):
-    "Clones a string or C icalcomponent into the right component object."
-
-    wasStr=0 # Were we passed a string or an icalcomponent?
-
-    if isinstance(c, Component):
-        comp = icalparser_parse_string(c.as_ical_string())
-    elif isinstance (c, StringType) and  string.find(c,"icalcomponent") == -1:
-        comp = icalparser_parse_string(c)
-    else:
-        comp = c
-
-    if comp == None or comp == WrapperNULL:
-        raise ValueError("Expected a libical reference or an iCal string")
-
-    kind = icalcomponent_isa(comp)
-    kindStr = icalcomponent_kind_to_string(kind)
-
-    if kindStr == 'VCALENDAR':
-	inner = icalcomponent_get_inner(comp) 
-    	kind = icalcomponent_isa(inner)
-    	kindStr = icalcomponent_kind_to_string(kind)
-    
-    if kindStr == 'VEVENT':
-        newComp = Event(comp)
-    elif kindStr == 'VTODO':
-        newComp = Todo(comp)
-    elif kindStr == 'VJOURNAL':
-        newComp = Journal(comp)
-    else:
-        newComp = Component(comp)
-
-    # I don't think I need to free the component created when passed a string,
-    # as it wasn't created with a _new function.
-
-    return newComp
-
-
-def NewComponent(c):
-    "Converts a string or C icalcomponent into the right component object."
-
-    wasStr=0 # Were we passed a string or an icalcomponent?
-
-    if isinstance (c, StringType) and  string.find(c,"icalcomponent") == -1:
-        comp = icalparser_parse_string(c)
-    else:
-        comp = c
-
-    if comp == None or comp == WrapperNULL:
-        raise ValueError("Expected a libical reference or an iCal string")
-
-    kind = icalcomponent_isa(comp)
-    kindStr = icalcomponent_kind_to_string(kind)
-
-    if kindStr == 'VEVENT':
-        newComp = Event(comp)
-    elif kindStr == 'VTODO':
-        newComp = Todo(comp)
-    elif kindStr == 'VJOURNAL':
-        newComp = Journal(comp)
-    else:
-        newComp = Component(comp)
-
-    # I don't think I need to free the component created when passed a string,
-    # as it wasn't created with a _new function.
-
-    return newComp
-
-
-class GenericComponent(Component):
-
-    def __init__(self,ref=None,kind=None):
-        
-        if ref != None:
-            Component.__init__(self, ref=ref) # Call from subclasses
-        elif type != None:
-            Component.__init__(self, kind=kind) # Call from subclasses
-        else:
-            raise ValueError("Expected either a icalcomponent reference or a kind string")
-     
-        
-        self._recurrence_set=None
-
-    def _singular_property(self, name, value_type, value=None,
-                           property_obj=None, enumerated_values=None):
-        """Sets or gets the value of a method which exists once per Component.
-
-        This is a constructor method for properties without a strictly defined
-        object."""
-
-        # Depending on the property name, this routine will either
-        # operate on the VCALENDAR container or on the inner VEVENT,
-        # VTODO, or VJOURNAL
-
-        if name in ['METHOD','PRODID','CALSCALE','VERSION']:
-            comp = self
-        else:
-            comp = self.inner_component()
-
-        curr_properties = comp.properties(name)
-
-        # Get the value
-        if value==None:
-            if len(curr_properties) == 0:
-                return None
-            elif len(curr_properties) == 1:
-                return curr_properties[0]
-            else:
-                raise ValueError, "too many properties of type %s" % propType
-
-        # Set the value
-        else:
-            # Check if value is in enumerated_values
-            if enumerated_values:
-                value = string.upper(value)
-                if value not in enumerated_values:
-                    raise ValueError, "%s is not one of %s" \
-                          % (value, enumerated_values)
-
-            # Create the new property
-            if property_obj:
-                if not isinstance(value, property_obj):
-                    # Create a special property_obj property
-                    if property_obj == Time:
-                        p = Time(value, name)
-                        ## p.value_type(value_type)
-                    elif property_obj == Duration:
-                        p = Duration(value)
-                    else:
-                        p = property_obj()
-                        ## p.value_type(value_type)
-                        p.value(value)
-                else:
-                    p = value # value is already a property_obj
-            else:
-                # Create a generic property
-                p = Property(name)
-                ## p.value_type(value_type)
-                p.value(value)
-
-            if len(curr_properties) == 1:
-                comp.remove_property(curr_properties[0])
-            elif len(curr_properties) > 1:
-                raise ValueError, "too many properties of type %s" % propType
-
-            comp.add_property(p)
-
-    # METHOD, PRODID, CALSCALE and VERSION are properties of the
-    # VCALENDAR, not the inner component
-
-    def method(self, v=None):
-        "Sets or returns the value of the METHOD property."
-        return self._singular_property("METHOD", "TEXT", v)
-
-    def prodid(self, v=None):
-        "Sets or returns the value of the PRODID property."
-        return self._singular_property("PRODID", "TEXT", v)
-
-    def calscale(self, v=None):
-        "Sets or returns the value of the CALSCALE property."
-        return self._singular_property("CALSCALE", "TEXT", v)
-
-    def version(self, v=None):
-        "Sets or returns the value of the Version property."
-        return self._singular_property("VERSION", "TEXT", v)
-
-    # The remaining properties are all in the inner component
-
-    def clone(self):
-        "Returns a copy of the object."
-        return CloneComponent(self)
-
-    def class_prop(self, v=None):  # Class is a reserved word
-        "Sets or returns the value of the CLASS property."
-        if v!=None:
-            v = string.upper(v)
-        return self._singular_property('CLASS', 'TEXT', v)
-
-    def created(self, v=None):
-        """Sets or returns the value of the CREATED property.
-
-        Usage:
-        created(time_obj)           # Set the value using a Time object
-        created('19970101T123000Z') # Set using an iCalendar string
-        created(982362522)          # Set using seconds 
-        created()                   # Return an iCalendar string
-        """
-        return self._singular_property("CREATED", "DATE-TIME", v, Time)
-        
-    def description(self, v=None):
-        "Sets or returns the value of the DESCRIPTION property."
-        return self._singular_property("DESCRIPTION", "TEXT", v)
-
-    def dtstamp(self, v=None):
-        """Sets or returns the value of the DTSTAMP property.
-
-        Usage:
-        dtstamp(time_obj)          # Set the value using a Time object
-        dtstamp('19970101T123000Z')# Set using an iCalendar string
-        dtstamp(982362522)         # Set using seconds 
-        dtstamp()                  # Return an iCalendar string
-        """
-        return self._singular_property("DTSTAMP", "DATE-TIME", v, Time)
-
-    def dtstart(self, v=None):
-        """Sets or returns the value of the DTSTART property.
-
-        Usage:
-        dtstart(time_obj)           # Set the value using a Time object
-        dtstart('19970101T123000Z') # Set the value as an iCalendar string
-        dtstart(982362522)          # Set the value using seconds (time_t)
-        dtstart()                   # Return the time as an iCalendar string
-        """
-        return self._singular_property("DTSTART", "DATE-TIME", v, Time)
-
-    def last_modified(self, v=None):
-        """Sets or returns the value of the LAST-MODIFIED property.
-
-        Usage:
-        last_modified(time_obj)          # Set the value using a Time object
-        last_modified('19970101T123000Z')# Set using an iCalendar string
-        last_modified(982362522)         # Set using seconds 
-        last_modified()                  # Return an iCalendar string
-        """
-        return self._singular_property("LAST-MODIFIED", "DATE-TIME", v, Time)
-
-    def organizer(self, v=None):
-        """Sets or gets the value of the ORGANIZER property.
-
-        Usage:
-        organizer(orgObj)              # Set value using an organizer object
-        organizer('MAILTO:jd@not.com') # Set value using a CAL-ADDRESS string
-        organizer()                    # Return a CAL-ADDRESS string
-        """
-        return self._singular_property('ORGANIZER', 'CAL-ADDRESS', v,
-                                       Organizer)
-
-    def recurrence_id(self, v=None):
-        """Sets or gets the value for the RECURRENCE-ID property.
-
-        Usage:
-        recurrence_id(recIdObj)             # Set using a Recurrence_Id object
-        recurrence_id("19700801T133000")    # Set using an iCalendar string
-        recurrence_id(8349873494)           # Set using seconds from epoch
-        recurrence_id()                     # Return an iCalendar string
-        """
-        return self._singular_property('RECURRENCE-ID', 'DATE-TIME', v,
-                                       Recurrence_Id)
-
-    def sequence(self, v=None):
-        """Sets or gets the SEQUENCE value of the Event.
-
-        Usage:
-        sequence(1)     # Set the value using an integer
-        sequence('2')   # Set the value using a string containing an integer
-        sequence()      # Return an integer
-        """
-        if isinstance(v, StringType):
-            v = int(str)
-        return self._singular_property('SEQUENCE', 'INTEGER', v)
-
-    def summary(self, v=None):
-        "Sets or gets the SUMMARY value of the Event."
-        return self._singular_property('SUMMARY', 'TEXT', v)
-
-    def uid(self, v=None):
-        "Sets or gets the UID of the Event."
-        return self._singular_property('UID', 'TEXT', v)
-
-    def url(self, v=None):
-        """Sets or returns the URL property."""
-        return self._singular_property('URL', 'URI', v)
-
-    ####
-    # Not quite sure if this is how we want to handle recurrence rules, but
-    # this is a start.
-    
-    def recurrence_set(self):
-        "Returns the Events RecurrenceSet object."
-        if self._recurrence_set == None:  # i.e haven't initialized one
-            self._recurrence_set = RecurrenceSet()
-        return self._recurrence_set
-
-    ###
-    # Alarm interface.  Returns an ComponentCollection.
-
-    def alarms(self, values=None):
-        """Sets or returns ALARM components.
-
-        Examples:
-        alarms((alarm1,))   # Set using Alarm component
-        alarms()            # Returns an ComponentCollection of all Alarms
-        """
-        if values!=None:
-            for alarm in values:
-                self.add_component(alarm)
-        else:
-            return ComponentCollection(self, self.components('VALARM'))
-
-    ####
-    # Methods that deal with Properties that can occur multiple times are
-    # below.  They use the Collection class to return their Properties.
-
-    def _multiple_properties(self, name, value_type, values,
-                             property_obj=None):
-        "Processes set/get for Properties that can have multiple instances."
-
-        comp = self.inner_component()
-
-        # Set value
-        if values!=None:
-            if not isinstance(values, TupleType) \
-               and not isinstance(values, ListType):
-                raise TypeError, "%s is not a tuple or list."
-
-            # Delete old properties
-            for p in comp.properties(name):
-                comp.remove_property(p)
-                
-            for v in values:
-                if property_obj:   # Specialized properties
-                    if not isinstance(v, property_obj): # Make new object
-                        new_prop = property_obj()
-                        new_prop.value(v)
-                    else:                            # Use existing object
-                        new_prop = v
-                else:                  # Generic properties
-                    new_prop=Property(name) 
-                    # new_prop.value_type(value_type)
-                    new_prop.value(v)
-                    
-                comp.add_property(new_prop)
-        
-        # Get value
-        else:
-            return Collection(self, comp.properties(name))
-
-    def attachments(self, values=None):
-        """Sets or returns a Collection of Attach properties.
-
-        'values' can be a sequence containing URLs (strings) and/or file-ish
-        objects.
-        """
-        return self._multiple_properties("ATTACH", "", value, Attach)
-
-    def attendees(self, value=None):
-        """Sets attendees or returns a Collection of Attendee objects.
-
-        If setting the attendees, pass a sequence as the argument.
-        Examples:
-        # Set using Attendee objects
-        attendees((attObj1, attObj2))
-        # Set using a CAL-ADDRESS string
-        attendees(['MAILTO:jdoe@somewhere.com'])
-        # Set using a combination of Attendee objects and strings
-        attendees(['MAILTO:jdoe@somewhere.com', attObj1])
-        # Returns a list of Attendee objects
-        attendees()
-
-        When setting the attendees, any previous Attendee objects in the Event
-        are overwritten.  If you want to add to the Attendees, one way to do it
-        is:
-
-        attendees().append(Attendee('MAILTO:jdoe@nothere.com'))
-        """
-        return self._multiple_properties("ATTENDEE", "", value, Attendee)
-
-    def categories(self, value=None):
-        """Sets categories or returns a Collection of CATEGORIES properties.
-
-        If setting the categories, pass a sequence as the argument.
-        Examples:
-        # Set using string[s]
-        categories(('APPOINTMENT', 'EDUCATION'))
-        # Returns a list of Category properites
-        categories()
-
-        When setting the attendees, any previous category Properties in the
-        Event are overwritten.  If you want to add to the categories, one way
-        to do it is:
-
-        new_cat=Property('CATEGORIES')
-        new_cat.value_type('TEXT')
-        new_cat.value('PERSONAL')
-        categories().append(new_cat)
-        """
-        return self._multiple_properties("CATEGORIES", "TEXT", value)
-
-    def comments(self, value=None):
-        "Sets or returns a Collection of COMMENT properties."
-        return self._multiple_properties('COMMENT', 'TEXT', value)
-
-    def contacts(self, value=None):
-        "Sets or returns a Collection of CONTACT properties."
-        return self._multiple_properties('CONTACT', 'TEXT', value)
-
-    def related_tos(self, value=None):
-        "Sets or returns a Collection of RELATED-TO properties."
-        return self._multiple_properties('RELATED-TO', 'TEXT', value)
-
-    def x_properties(self, name, value=None):
-        "Sets or returns a Collection of X- properties."
-        return self._multiple_properties(name, 'TEXT', value)
-
-class Event(GenericComponent):
-    "The iCalendar Event object."
-
-    def __init__(self,ref=None):
-        if ref != None:
-            GenericComponent.__init__(self, ref=ref)
-        else: 
-            GenericComponent.__init__(self, kind='VEVENT')
-        
-    def component_type(self):
-        "Returns the type of component for the object."
-        return "VEVENT"
-
-    def dtend(self, v=None):
-        """Sets or returns the value of the DTEND property.
-
-        Usage:
-        dtend(time_obj)             # Set the value using a Time object
-        dtend('19970101T123000Z')   # Set the value as an iCalendar string
-        dtend(982362522)            # Set the value using seconds (time_t)
-        dtend()                     # Return the time as an iCalendar string
-
-        If the dtend value is being set and duration() has a value, the
-        duration property will be removed.
-        """
-        if v != None:
-            duration = self.properties('DURATION')
-            for d in duration:          # Clear DURATION properties
-                self.remove_property(d)
-        return self._singular_property("DTEND", "DATE-TIME", v, Time)
-            
-    def duration(self, v=None):
-        """Sets or returns the value of the duration property.
-
-        Usage:
-        duration(dur_obj)       # Set the value using a Duration object
-        duration("P3DT12H")     # Set value as an iCalendar string
-        duration(3600)          # Set duration using seconds
-        duration()              # Return duration as an iCalendar string
-
-        If the duration value is being set and dtend() has a value, the dtend
-        property will be removed.
-        """
-
-        if v != None:
-            dtend = self.properties('DTEND')
-            for d in dtend:
-                self.remove_property(d)  # Clear DTEND properties
-        return self._singular_property("DURATION", "DURATION", v, Duration)
-
-    def status(self, v=None):
-        "Sets or returns the value of the STATUS property."
-
-        # These values are only good for VEVENT components (i.e. don't copy
-        # & paste into VTODO or VJOURNAL
-        valid_values=('TENTATIVE', 'CONFIRMED', 'CANCELLED')
-        return self._singular_property("STATUS", "TEXT", v,
-                                       enumerated_values=valid_values)
-
-    def geo(self, v=None):
-        """Sets or returns the value of the GEO property.
-
-        Usage:
-        geo(value) or
-        geo()           # Returns the icalendar string
-
-        'value' is either a icalendar GEO string or a sequence with two 'float'
-        numbers.
-
-        Examples:
-        geo('40.232;-115.9531')     # Set value using string
-        geo((40.232, -115.9531))    # Set value using a sequence
-        geo()                       # Returns "40.232;-115.9531"
-
-        To get the GEO property represented as a tuple and numbers instead of
-        the iCalendar string, use geo_get_tuple().
-        """
-        
-        if isinstance(v, ListType) or isinstance(v, TupleType):
-            v = "%s;%s" % (float(v[0]), float(v[1]))
-        return self._singular_property("GEO", "FLOAT", v)
-
-    def geo_get_tuple(self):
-        """Returns the GEO property as a tuple."""
-
-        geo = self.geo()
-        geo = split(geo, ';')
-        return float(geo[0]), float(geo[1])
-
-    def location(self, v=None):
-        """Sets or returns the LOCATION property."""
-        return self._singular_property("LOCATION", "TEXT", v)
-
-    def transp(self, v=None):
-        """Sets or returns the TRANSP property."""
-        ok_values = ('OPAQUE', 'TRANSPARENT')
-        return self._singular_property('TRANSP', 'TEXT', v,
-                                       enumerated_values=ok_values)
-
-    def resources(self, v=None):
-        pass
-
-class Todo(GenericComponent):
-    "The iCalendar TODO component."
-
-    def __init__(self,ref=None):
-        if ref != None:
-            GenericComponent.__init__(self, ref=ref)
-        else: 
-            GenericComponent.__init__(self, kind='VTODO')
-
-
-    def component_type(self):
-        "Returns the type of component for the object."
-        return "VTODO"
-
-    def completed(self, value=None):
-        return self._singular_property('COMPLETED', 'DATE-TIME', value, Time)
-
-    def geo(self, value=None):
-        if isinstance(v, ListType) or isinstance(v, TupleType):
-            v = "%s;%s" % (float(v[0]), float(v[1]))
-        return self._singular_property("GEO", "FLOAT", value)
-
-    def location(self, value=None):
-        return self._singular_property('LOCATION', 'TEXT', value)
-
-    def percent(self, value=None):
-        if value!=None:
-            value = str(int(value))
-        return self._singular_property('PERCENT', 'INTEGER', value)
-
-    def status(self, value=None):
-        if value!=None:
-            value=string.upper(value)
-        ok_values = ('NEEDS-ACTION', 'COMPLETED', 'IN-PROCESS', 'CANCELLED')
-        return self._singular_property('STATUS', 'TEXT', value,
-                                       enumerated_values=ok_values)
-
-    def due(self, value=None):
-        if value != None:
-            duration = self.properties('DURATION')
-            for d in duration:
-                self.remove_property(d) # Clear DURATION properties
-        return self._singular_property('DUE', 'DATE-TIME', value, Time)
-
-    def duration(self, value=None):
-        if value != None:
-            due = self.properites('DUE')
-            for d in due:
-                self.remove_property(d)  # Clear DUE properties
-        return self._singular_property("DURATION", "DURATION", value, Duration)
-
-    def resources():
-        pass
-
-class Journal(GenericComponent):
-    "The iCalendar JOURNAL component."
-
-    def __init__(self):
-        if ref != None:
-            GenericComponent.__init__(self, ref=ref)
-        else: 
-            GenericComponent.__init__(self, kind='VJOURNAL')
-
-    def component_type(self):
-        "Returns the type of component for the object."
-        return "VJOURNAL"
-
-    def status(self, v=None):
-        if v!=None:
-            v = string.upper(v)
-        ok_values=('DRAFT', 'FINAL', 'CANCELLED')
-        return self._singular_property('STATUS', 'TEXT', v,
-                                       enumerated_values=ok_values)
-        
diff --git a/libical/src/python/DerivedProperties.py b/libical/src/python/DerivedProperties.py
deleted file mode 100644
index 81248fe7b7..0000000000
--- a/libical/src/python/DerivedProperties.py
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/usr/bin/env python 
-# -*- Mode: python -*-
-#======================================================================
-# FILE: DerivedProperties.py
-# CREATOR: eric 
-#
-# DESCRIPTION:
-#   
-#
-#  $Id$
-#  $Locker$
-#
-# (C) COPYRIGHT 2001, Eric Busboom <eric@softwarestudio.org>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>  
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either: 
-#
-#    The LGPL as published by the Free Software Foundation, version
-#    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-#
-#  Or:
-#
-#    The Mozilla Public License Version 1.0. You may obtain a copy of
-#    the License at http://www.mozilla.org/MPL/
-#======================================================================
-
-from Property import Property
-from Time import Time
-from Period import Period
-from Duration import Duration
-
-def RDate(arg):
-
-    class RDate_Time(Time):
-        def __init__(self,arg): Time.__init__(self,arg,"RDATE")
-    
-    class RDate_Period(Period):
-        def __init__(self,arg): Period.__init__(self,arg,"RDATE")
-
-    p = None
-    for c in [RDate_Time, RDate_Period]:
-        try: return c(arg)
-        except Property.ConstructorFailedError, d: pass
-    raise Property.ConstructorFailedError("Failed to construct RDATE from "+str(arg))
-
-
-def Trigger(arg):        
-    class Trigger_Time(Time): 
-        def __init__(self,arg): Time.__init__(self,arg,"TRIGGER")
-    
-    class Trigger_Duration(Duration):
-        def __init__(self,arg): Duration.__init__(self,arg,"TRIGGER")
-
-    p = None
-    for c in [Trigger_Duration, Trigger_Time]:
-        try: return c(arg)
-        except Property.ConstructorFailedError, d: pass        
-    raise Property.ConstructorFailedError("Failed to construct TRIGGER from "+str(arg))
-
-
-
-class Recurrence_Id(Time):
-    """Class for RECURRENCE-ID property.
-
-    Usage:
-    Reccurence_Id(dict)         # A normal property dictionary
-    Reccurence_Id("19960401")   # An iCalendar string
-    Reccurence_Id(8349873494)   # Seconds from epoch
-
-    If the 'dict' constructor is used, 'name' and 'value_type'
-    entries in dict are ignored and automatically set with the appropriate
-    values.
-    """
-
-    def __init__(self, dict={}):
-        Time.__init__(self, dict)
-        Property.name(self, 'RECURRENCE-ID')
-
-    def name(self):
-        return Property.name(self)
-
-    def _doParam(self, parameter, v):
-        if v!=None:
-            self[parameter]=v
-        return self[parameter]
-
-    # Enumerated parameters
-    def value_parameter(self, v=None):
-        """Sets or gets the VALUE parameter value.
-
-        The value passed should be either "DATE-TIME" or "DATE".  Setting this
-        parameter has no impact on the property's value_type.  Doing something
-        like:
-
-        rid=Recurrence_Id("19960401")    # Sets value & makes value_type="DATE"
-        rid.value_parameter("DATE-TIME") # Sets the parameter VALUE=DATE-TIME
-
-        Would be allowed (even though it is wrong), so pay attention.
-        Verifying the component will reveal the error.
-        """
-        if v!=None and v!="DATE" and v!="DATE-TIME":
-            raise ValueError, "%s is an invalid VALUE parameter value" % str(v)
-        self._doParam("VALUE", v)
-
-    def tzid(self, v=None):
-        "Sets or gets the TZID parameter value."
-        self._doParam("TZID", v)
-
-    def range_parameter(self, v=None): # 'range' is a builtin function
-        "Sets or gets the RANGE parameter value."
-        if v!=None and v!="THISANDPRIOR" and v!= "THISANDFUTURE":
-            raise ValueError, "%s is an invalid RANGE parameter value" % str(v)
-        self._doParam("RANGE", v)
-
-class Attach(Property):
-    """A class representing an ATTACH property.
-
-    Usage:
-    Attach(uriString [, parameter_dict])
-    Attach(fileObj [, parameter_dict])
-    """
-
-    def __init__(self, value=None, parameter_dict={}):
-        Property.__init__(self, parameter_dict)
-        Property.name(self, 'ATTACH')
-        self.value(value)
-
-    def value(self, v=None):
-        "Returns or sets the value of the property."
-        if v != None:
-            if isinstance(v, StringType):  # Is a URI
-                self._desc['value']=v
-                Property.value_type(self, 'URI')
-            else:
-                try:
-                    tempStr = v.read()
-                except:
-                    raise TypeError,"%s must be a URL string or file-ish type"\
-                          % str(v)
-                self._desc['value'] = base64.encodestring(tempStr)
-                Property.value_type(self, 'BINARY')
-        else:
-            return self._desc['value']
-
-    def name(self):
-        "Returns the name of the property."
-        return Property.name(self)
-
-    def value_type(self):
-        return Property.value_type(self)
-
-    def fmttype(self, v=None):
-        "Gets or sets the FMTYPE parameter."
-        if v!= None:
-            self['FMTTYPE']=v
-        else:
-            return self['FMTTYPE']
-
diff --git a/libical/src/python/Duration.py b/libical/src/python/Duration.py
deleted file mode 100644
index e6c642a8f7..0000000000
--- a/libical/src/python/Duration.py
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/env python 
-# -*- Mode: python -*-
-#======================================================================
-# FILE: Duration.py
-# CREATOR: eric 
-#
-# DESCRIPTION:
-#   
-#
-#  $Id$
-#  $Locker$
-#
-# (C) COPYRIGHT 2001, Eric Busboom <eric@softwarestudio.org>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>  
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either: 
-#
-#    The LGPL as published by the Free Software Foundation, version
-#    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-#
-#  Or:
-#
-#    The Mozilla Public License Version 1.0. You may obtain a copy of
-#    the License at http://www.mozilla.org/MPL/
-#===============================================================
-
-from LibicalWrap import *
-from Property import Property
-from types import DictType, StringType, IntType
-
-class Duration(Property):
-    """ 
-    Represent a length of time, like 3 minutes, or 6 days, 20 seconds.
-    
-
-    """
-
-    def __init__(self, arg, name="DURATION"):
-        """
-        Create a new duration from an RFC2445 string or number of seconds.
-        Construct the duration from an iCalendar string or a number of seconds.
-
-        Duration("P3DT2H34M45S")   Construct from an iCalendar string
-        Duration(3660)             Construct from seconds 
-        """ 
-
-        self.dur = None
-
-        e=icalerror_supress("MALFORMEDDATA")
-
-        if isinstance(arg, DictType):
-            
-            self.dur = icaldurationtype_from_string(arg['value'])
-            Property.__init__(self,ref=arg['ref'])
-        else:
-            if isinstance(arg, StringType):
-                self.dur = icaldurationtype_from_string(arg)
-            elif isinstance(arg, IntType): 
-                self.dur = icaldurationtype_from_int(arg)
-            elif isinstance(arg,Duration):
-                self.dur = arg.dur
-            else:
-                self.dur = icaldurationtype_null_duration()
-
-            Property.__init__(self,type=name)
-
-        icalerror_restore("MALFORMEDDATA",e)
-
-        if self.dur == None or icaldurationtype_is_null_duration(self.dur):
-            raise Property.ConstructorFailedError("Failed to construct Duration from " +str(arg))
-
-        try:
-            self._update_value()
-        except Property.UpdateFailedError:
-            raise Property.ConstructorFailedError("Failed to construct Duration from  " + str(arg))
-
-    def _update_value(self):
-        
-        self.value(icaldurationtype_as_ical_string(self.dur),"DURATION")
-
-    def valid(self):
-        "Return true if this is a valid duration"
-
-        return not icaldurationtype_is_null_duration(self.dur)
-
-    def seconds(self,v=None):
-        """Return or set duration in seconds"""
-        if(v != None):
-            self.dur = icaldurationtype_from_int(v);
-            self.dict['value'] = icaltimedurationtype_as_ical_string(self.dur)
-        return icaldurationtype_as_int(self.dur)
diff --git a/libical/src/python/Error.py b/libical/src/python/Error.py
deleted file mode 100644
index 912553d14e..0000000000
--- a/libical/src/python/Error.py
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-class LibicalError(Exception):
-    "Libical Error"
-
-    def __init__(self,str):
-        Exception.__init__(self,str)
-
-    def __str__(self):
-        return Exception.__str__(self)+"\nLibical errno: "+icalerror_perror()
diff --git a/libical/src/python/Gauge.py b/libical/src/python/Gauge.py
deleted file mode 100644
index ec859055fb..0000000000
--- a/libical/src/python/Gauge.py
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/env python 
-# -*- Mode: python -*-
-#======================================================================
-# FILE: Gauge.py
-# CREATOR: mtearle 
-#
-# DESCRIPTION:
-#   
-#
-#  $Id$
-#  $Locker$
-#
-# (C) COPYRIGHT 2001, Eric Busboom <eric@softwarestudio.org>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>  
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either: 
-#
-#    The LGPL as published by the Free Software Foundation, version
-#    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-#
-#  Or:
-#
-#    The Mozilla Public License Version 1.0. You may obtain a copy of
-#    the License at http://www.mozilla.org/MPL/
-#======================================================================
-
-from LibicalWrap import *
-from Error import LibicalError
-from Component import Component
-
-class Gauge:
-    """ 
-    Base class for gauge
-    """
-
-    class ConstructorFailedError(LibicalError):
-        "Failed to create a Guage "
-    
-    class CloneFailedError(LibicalError):
-        "Failed to clone a component given Gauge "
-    
-    class CompareFailedError(LibicalError):
-        "Failed to compare a component given Gauge "
-
-    def __init__(self,ref=None,sql=None,expand=0):
-	if ref != None:
-	    self._ref = ref
-	elif sql != None:
-            s = str(sql)
-	    self._ref = icalgauge_new_from_sql(s,expand)
-	else:
-	    Gauge.ConstructorFailedError("No SQL Specified")
-
-    def __del__(self):
-	if self._ref != None:
-	    icalgauge_free(self._ref)
-	    self._ref = None
-
-    def ref(self):
-	return self._ref
-
-    def compare(self, comp):
-	if not isinstance(comp,Component):
-	    raise Gauge.CompareFailedError("Argument is not a component")
-
-	if comp.ref() == None:
-	    raise Gauge.CompareFailedError("Argument is not a component")
-
-	return icalgauge_compare(self._ref, comp.ref())
-
-    # Pending Implementation
-    #def as_sql_string(self):
-    #	return self.__str__()
-
-    #def __str__(self):
-    #	return icalgauge_as_sql(self._ref)
-
-    #def clone(self, comp):
-#	if not isinstance(comp,Component):
-#	    raise Gauge.CloneFailedError("Argument is not a component")
-#
-#        comp_ref = icalgauge_new_clone(self._ref, comp)
-#
-#	if comp_ref == None:
-#	    return None
-#
-#	return Component(ref=comp_ref)
diff --git a/libical/src/python/Libical.py b/libical/src/python/Libical.py
deleted file mode 100644
index 9cf5076520..0000000000
--- a/libical/src/python/Libical.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env python 
-# -*- Mode: python -*-
-#======================================================================
-# FILE: Libical.py
-# CREATOR: eric 
-#
-# DESCRIPTION:
-#   
-#
-#  $Id$
-#  $Locker$
-#
-# (C) COPYRIGHT 2001, Eric Busboom <eric@softwarestudio.org>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>  
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either: 
-#
-#    The LGPL as published by the Free Software Foundation, version
-#    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-#
-#  Or:
-#
-#    The Mozilla Public License Version 1.0. You may obtain a copy of
-#    the License at http://www.mozilla.org/MPL/
-#======================================================================
-
-from Component import Component, NewComponent, Event, Todo, Journal
-from Property import Property, RecurrenceSet, test_enum
-from Time import Time
-from Period import Period
-from Duration import Duration
-from Attendee import Attendee, Organizer
-from DerivedProperties import RDate, Trigger,Recurrence_Id, Attach 
-from Store import Store, FileStore
-from Gauge import Gauge
diff --git a/libical/src/python/LibicalWrap.i b/libical/src/python/LibicalWrap.i
deleted file mode 100644
index bf3e19c1d9..0000000000
--- a/libical/src/python/LibicalWrap.i
+++ /dev/null
@@ -1,453 +0,0 @@
-/* -*- Mode: C -*-*/
-/*======================================================================
-  FILE: ical.i
-
-  (C) COPYRIGHT 1999 Eric Busboom
-  http://www.softwarestudio.org
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
-
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and
-  limitations under the License.
-
-  The original author is Eric Busboom
-
-  Contributions from:
-  Graham Davison (g.m.davison@computer.org)
-
-  ======================================================================*/  
-
-%module LibicalWrap
-
-
-%{
-#include "ical.h"
-#include "icalss.h"
-
-#include <sys/types.h> /* for size_t */
-#include <time.h>
-
-%}
-
-
-#include "fcntl.h" /* For Open flags */
-
-typedef void icalcomponent;
-typedef void icalproperty;
-
-icalcomponent* icalparser_parse_string(char* str);
-
-
-/* actually takes icalcomponent_kind */
-icalcomponent* icalcomponent_new(int kind);
-icalcomponent* icalcomponent_new_clone(icalcomponent* component);
-icalcomponent* icalcomponent_new_from_string(char* str);
-
-const char* icalcomponent_kind_to_string(int kind);
-int icalcomponent_string_to_kind(const char* string);
-
-
-char* icalcomponent_as_ical_string(icalcomponent* component);
-
-void icalcomponent_free(icalcomponent* component);
-int icalcomponent_count_errors(icalcomponent* component);
-void icalcomponent_strip_errors(icalcomponent* component);
-void icalcomponent_convert_errors(icalcomponent* component);
-
-icalproperty* icalcomponent_get_current_property(icalcomponent* component);
-
-icalproperty* icalcomponent_get_first_property(icalcomponent* component,
-					      int kind);
-icalproperty* icalcomponent_get_next_property(icalcomponent* component,
-					      int kind);
-
-icalcomponent* icalcomponent_get_current_component (icalcomponent* component);
-
-icalcomponent* icalcomponent_get_first_component(icalcomponent* component,
-					      int kind);
-icalcomponent* icalcomponent_get_next_component(icalcomponent* component,
-					      int kind);
-
-void icalcomponent_add_property(icalcomponent* component,
-				icalproperty* property);
-
-void icalcomponent_remove_property(icalcomponent* component,
-				   icalproperty* property);
-
-
-void icalcomponent_add_component(icalcomponent* parent,
-				icalcomponent* child);
-
-void icalcomponent_remove_component(icalcomponent* parent,
-				icalcomponent* child);
-
-icalcomponent* icalcomponent_get_inner(icalcomponent* comp);
-
-icalcomponent* icalcomponent_get_parent(icalcomponent* component);
-int icalcomponent_isa(icalcomponent* component);
-
-int icalrestriction_check(icalcomponent* comp);
-
-/* actually takes icalproperty_kind */
-icalproperty* icalproperty_new(int kind);
-
-icalproperty* icalproperty_new_from_string(char* str);
-
-char* icalproperty_as_ical_string(icalproperty *prop);
-
-void icalproperty_set_parameter_from_string(icalproperty* prop,
-                                          const char* name, const char* value);
-const char* icalproperty_get_parameter_as_string(icalproperty* prop,
-                                                 const char* name);
-void icalproperty_remove_parameter_by_name(icalproperty* prop,
-                                           const char *name);
-
-void icalproperty_set_value_from_string(icalproperty* prop,const char* value, const char * kind);
-
-const char* icalproperty_get_value_as_string(icalproperty* prop);
-icalcomponent* icalproperty_get_parent(icalproperty* property);
-
-const char* icalproperty_kind_to_string(int kind);
-int icalproperty_string_to_kind(const char* string);
-int icalproperty_string_to_enum(const char* str);
-int icalproperty_enum_belongs_to_property(int kind, int e);
-int icalproperty_kind_to_value_kind(int kind);
-
-/* Deal with X properties */
-
-void icalproperty_set_x_name(icalproperty* prop, const char* name);
-const char* icalproperty_get_x_name(icalproperty* prop);
-
-/* Return the name of the property -- the type name converted to a
-   string, or the value of _get_x_name if the type is and X property */
-const char* icalproperty_get_name (const icalproperty* prop);
-
-
-int icalerror_supress(const char* error);
-void icalerror_restore(const char* error, int es);
-char* icalerror_perror();
-void icalerror_clear_errno(void);
-
-
-const char* icalvalue_kind_to_string(int kind);
-int icalvalue_string_to_kind(const char* str);
-
-char* icalparameter_as_ical_string(icalparameter* parameter);
-
-const char* icalparameter_kind_to_string(int kind);
-int icalparameter_string_to_kind(const char* string);
-
-int* icallangbind_new_array(int size);
-void icallangbind_free_array(int* array);
-int icallangbind_access_array(int* array, int index);
-
-
-
-/* int icalrecur_expand_recurrence(char* rule, int start, 
-				int count, int* array);*/
-int icalrecur_expand_recurrence(char* rule, int start, 
-				int count, time_t* array);
-
-
-/* Iterate through properties, components and parameters using strings for the kind */
-icalproperty* icallangbind_get_first_property(icalcomponent *c,
-                                              const char* prop);
-
-icalproperty* icallangbind_get_next_property(icalcomponent *c,
-                                              const char* prop);
-
-icalcomponent* icallangbind_get_first_component(icalcomponent *c,
-                                              const char* comp);
-
-icalcomponent* icallangbind_get_next_component(icalcomponent *c,
-                                              const char* comp);
-
-icalparameter* icallangbind_get_first_parameter(icalproperty *prop);
-
-icalparameter* icallangbind_get_next_parameter(icalproperty *prop);
-
-
-/* Return a string that can be evaluated in perl or python to
-   generated a hash that holds the property's name, value and
-   parameters. Sep is the hash seperation string, "=>" for perl and
-   ":" for python */
-const char* icallangbind_property_eval_string(icalproperty* prop, char* sep);
-
-int icallangbind_string_to_open_flag(const char* str);
-
-const char* icallangbind_quote_as_ical(const char* str);
-
-/***********************************************************************
- Time routines 
-***********************************************************************/
-
-
-struct icaltimetype
-{
-	int year;
-	int month;
-	int day;
-	int hour;
-	int minute;
-	int second;
-};	
-
-
-/* Convert seconds past UNIX epoch to a timetype*/
-struct icaltimetype icaltime_from_timet(int v, int is_date);
-
-/** Convert seconds past UNIX epoch to a timetype, using timezones. */
-struct icaltimetype icaltime_from_timet_with_zone(int tm,
-        int is_date, icaltimezone *zone);
-
-/* Return the time as seconds past the UNIX epoch */
-/* Normally, this returns a time_t, but SWIG tries to turn that type
-   into a pointer */
-int icaltime_as_timet(struct icaltimetype tt);
-
-/* Return a string represention of the time, in RFC2445 format. The
-   string is owned by libical */
-char* icaltime_as_ical_string(struct icaltimetype tt);
-
-/* create a time from an ISO format string */
-struct icaltimetype icaltime_from_string(const char* str);
-
-/* Routines for handling timezones */
-/* Return a null time, which indicates no time has been set. This time represent the beginning of the epoch */
-struct icaltimetype icaltime_null_time(void);
-
-/* Return true of the time is null. */
-int icaltime_is_null_time(struct icaltimetype t);
-
-/* Returns false if the time is clearly invalid, but is not null. This
-   is usually the result of creating a new time type buy not clearing
-   it, or setting one of the flags to an illegal value. */
-int icaltime_is_valid_time(struct icaltimetype t);
-
-/** @brief Return the timezone */
-const icaltimezone *icaltime_get_timezone(const struct icaltimetype t);
-
-/** @brief Return the tzid, or NULL for a floating time */
-char *icaltime_get_tzid(const struct icaltimetype t);
-
-/** @brief Set the timezone */
-struct icaltimetype icaltime_set_timezone(struct icaltimetype *t,
-        const icaltimezone *zone);
-
-/* Returns true if time is of DATE type, false if DATE-TIME */
-int icaltime_is_date(struct icaltimetype t);
-
-/* Returns true if time is relative to UTC zone */
-int icaltime_is_utc(struct icaltimetype t);
-
-/* Reset all of the time components to be in their normal ranges. For
-   instance, given a time with minutes=70, the minutes will be reduces
-   to 10, and the hour incremented. This allows the caller to do
-   arithmetic on times without worrying about overflow or
-   underflow. */
-struct icaltimetype icaltime_normalize(struct icaltimetype t);
-
-/* Return the day of the year of the given time */
-short icaltime_day_of_year(struct icaltimetype t);
-
-/* Create a new time, given a day of year and a year. */
-struct icaltimetype icaltime_from_day_of_year(short doy,  short year);
-
-/* Return the day of the week of the given time. Sunday is 0 */
-short icaltime_day_of_week(struct icaltimetype t);
-
-/* Return the day of the year for the Sunday of the week that the
-   given time is within. */
-short icaltime_start_doy_of_week(struct icaltimetype t);
-
-/* Return the week number for the week the given time is within */
-short icaltime_week_number(struct icaltimetype t);
-
-/* Return -1, 0, or 1 to indicate that a<b, a==b or a>b */
-int icaltime_compare(struct icaltimetype a,struct icaltimetype b);
-
-/* like icaltime_compare, but only use the date parts. */
-int icaltime_compare_date_only(struct icaltimetype a, struct icaltimetype b);
-
-/* Return the number of days in the given month */
-short icaltime_days_in_month(short month,short year);
-
-/** convert tt, of timezone tzid, into a utc time. Does nothing if the
-   time is already UTC.  */
-struct icaltimetype icaltime_convert_to_zone(struct icaltimetype tt,
-           icaltimezone *zone);
-
-
-
-/***********************************************************************
-  Duration Routines 
-***********************************************************************/
-
-
-struct icaldurationtype
-{
-	int is_neg;
-	unsigned int days;
-	unsigned int weeks;
-	unsigned int hours;
-	unsigned int minutes;
-	unsigned int seconds;
-};
-
-struct icaldurationtype icaldurationtype_from_int(int t);
-struct icaldurationtype icaldurationtype_from_string(const char*);
-int icaldurationtype_as_int(struct icaldurationtype duration);
-char* icaldurationtype_as_ical_string(struct icaldurationtype d);
-struct icaldurationtype icaldurationtype_null_duration();
-int icaldurationtype_is_null_duration(struct icaldurationtype d);
-
-struct icaltimetype  icaltime_add(struct icaltimetype t,
-				  struct icaldurationtype  d);
-
-struct icaldurationtype  icaltime_subtract(struct icaltimetype t1,
-					   struct icaltimetype t2);
-
-
-/***********************************************************************
-  Period Routines 
-***********************************************************************/
-
-
-struct icalperiodtype 
-{
-	struct icaltimetype start;
-	struct icaltimetype end;
-	struct icaldurationtype duration;
-};
-
-struct icalperiodtype icalperiodtype_from_string (const char* str);
-
-const char* icalperiodtype_as_ical_string(struct icalperiodtype p);
-struct icalperiodtype icalperiodtype_null_period();
-int icalperiodtype_is_null_period(struct icalperiodtype p);
-int icalperiodtype_is_valid_period(struct icalperiodtype p);
-
-/***********************************************************************
- * timezone handling routines
-***********************************************************************/
-
-/** Returns a single builtin timezone, given its Olson city name. */
-icaltimezone* icaltimezone_get_builtin_timezone	(const char *location);
-
-/** Returns the UTC timezone. */
-icaltimezone* icaltimezone_get_utc_timezone	(void);
-
-/***********************************************************************
-  Storage Routines
-***********************************************************************/
-
-/** 
- * @brief options for opening an icalfileset.
- *
- * These options should be passed to the icalset_new() function
- */
-
-struct icalfileset_options {
-  int          flags;		/**< flags for open() O_RDONLY, etc  */
-  mode_t       mode;		/**< file mode */
-  icalcluster  *cluster;	/**< use this cluster to initialize data */
-};
-
-icalset* icalfileset_new(const char* path);
-icalset* icalfileset_new_reader(const char* path);
-icalset* icalfileset_new_writer(const char* path);
-
-icalset* icalfileset_init(icalset *set, const char *dsn, void* options);
-
-/* icalfileset* icalfileset_new_from_cluster(const char* path, icalcluster *cluster); */
-
-icalcluster* icalfileset_produce_icalcluster(const char *path);
-
-void icalfileset_free(icalset* cluster);
-
-const char* icalfileset_path(icalset* cluster);
-
-/* Mark the cluster as changed, so it will be written to disk when it
-   is freed. Commit writes to disk immediately. */
-void icalfileset_mark(icalset* set);
-icalerrorenum icalfileset_commit(icalset* set); 
-
-icalerrorenum icalfileset_add_component(icalset* set,
-					icalcomponent* child);
-
-icalerrorenum icalfileset_remove_component(icalset* set,
-					   icalcomponent* child);
-
-int icalfileset_count_components(icalset* set,
-				 int kind);
-
-/**
- * Restrict the component returned by icalfileset_first, _next to those
- * that pass the gauge. _clear removes the gauge 
- */
-icalerrorenum icalfileset_select(icalset* set, icalgauge* gauge);
-
-/** clear the gauge **/
-void icalfileset_clear(icalset* set);
-
-/** Get and search for a component by uid **/
-icalcomponent* icalfileset_fetch(icalset* set, const char* uid);
-int icalfileset_has_uid(icalset* set, const char* uid);
-icalcomponent* icalfileset_fetch_match(icalset* set, icalcomponent *c);
-
-
-/**
- *  Modify components according to the MODIFY method of CAP. Works on the
- *  currently selected components. 
- */
-icalerrorenum icalfileset_modify(icalset* set, 
-				 icalcomponent *oldcomp,
-			       icalcomponent *newcomp);
-
-/* Iterate through components. If a gauge has been defined, these
-   will skip over components that do not pass the gauge */
-
-icalcomponent* icalfileset_get_current_component (icalset* cluster);
-icalcomponent* icalfileset_get_first_component(icalset* cluster);
-icalcomponent* icalfileset_get_next_component(icalset* cluster);
-
-/* External iterator for thread safety */
-icalsetiter icalfileset_begin_component(icalset* set, int kind, icalgauge* gauge);
-icalcomponent * icalfilesetiter_to_next(icalset* set, icalsetiter *iter);
-icalcomponent* icalfileset_form_a_matched_recurrence_component(icalsetiter* itr);
-
-/***********************************************************************
-  Gauge Routines
-***********************************************************************/
-
-icalgauge* icalgauge_new_from_sql(char* sql, int expand);
-
-int icalgauge_get_expand(icalgauge* gauge);
-
-void icalgauge_free(icalgauge* gauge);
-
-/* Pending Implementation */
-/* char* icalgauge_as_sql(icalcomponent* gauge); */
-
-void icalgauge_dump(icalgauge* gauge);
-
-
-/** @brief Return true if comp matches the gauge.
- *
- * The component must be in
- * cannonical form -- a VCALENDAR with one VEVENT, VTODO or VJOURNAL
- * sub component 
- */
-int icalgauge_compare(icalgauge* g, icalcomponent* comp);
-
-/* Pending Implementation */
-/** Clone the component, but only return the properties 
- *  specified in the gauge */
-/* icalcomponent* icalgauge_new_clone(icalgauge* g, icalcomponent* comp); */
-
-
diff --git a/libical/src/python/Makefile.am b/libical/src/python/Makefile.am
deleted file mode 100644
index e221fa91c1..0000000000
--- a/libical/src/python/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-
-lib_LTLIBRARIES = libLibicalWrap.la
-
-libLibicalWrap_la_SOURCES = LibicalWrap.c
-
-INCLUDES =				\
-	-I$(top_builddir)		\
-	-I$(top_srcdir)/src		\
-	-I$(top_builddir)/src		\
-	-I$(top_srcdir)/src/libical	\
-	-I$(top_builddir)/src/libical	\
-	-I$(top_srcdir)/src/libicalss	\
-	$(PY_CFLAGS) 	
-
-LDADD =  ../libical/libical.la ../libicalss/libicalss.la
-
-all: LibicalWrap.so
-
-LibicalWrap.c:  LibicalWrap.i
-	swig -python  -o LibicalWrap.c LibicalWrap.i 
-
-# This part should be done with libtool, but I don't know how to do
-# it. Libtool needs to generate a shared library in this directory
-# regardless of the value of AM_DISABLE_SHARED
-LibicalWrap.so: LibicalWrap.c 
-	ld -shared -o LibicalWrap.so LibicalWrap.o ../libical/.libs/libical.a  ../libicalss/.libs/libicalss.a 
-
-CLEANFILES = LibicalWrap.c LibicalWrap_wrap.doc  Libical.pyc LibicalWrap.so
-
-EXTRA_DIST = 		\
-Libical.py 		\
-LibicalWrap.i 		\
-python-binding.txt 	\
-test.py			\
-Attendee.py 		\
-Collection.py		\
-Component.py		\
-DerivedProperties.py	\
-Duration.py		\
-Error.py		\
-Gauge.py		\
-Period.py		\
-Property.py		\
-Store.py  		\
-Time.py			\
-ChangeLog
-
-
diff --git a/libical/src/python/Period.py b/libical/src/python/Period.py
deleted file mode 100644
index e8d9b3ed40..0000000000
--- a/libical/src/python/Period.py
+++ /dev/null
@@ -1,216 +0,0 @@
-#!/usr/bin/env python 
-# -*- Mode: python -*-
-#======================================================================
-# FILE: Period.py
-# CREATOR: eric 
-#
-# DESCRIPTION:
-#   
-#
-#  $Id$
-#  $Locker$
-#
-# (C) COPYRIGHT 2001, Eric Busboom <eric@softwarestudio.org>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>  
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either: 
-#
-#    The LGPL as published by the Free Software Foundation, version
-#    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-#
-#  Or:
-#
-#    The Mozilla Public License Version 1.0. You may obtain a copy of
-#    the License at http://www.mozilla.org/MPL/
-#===========================================================
-
-from LibicalWrap import *
-from Property import Property
-from types import DictType, StringType, IntType
-from Time import Time
-from Duration import Duration
-
-class Period(Property):
-    """Represent a span of time"""
-    def __init__(self,arg,name='FREEBUSY'):
-        """ """
-
-        Property.__init__(self, type = name)
-
-        self.pt=None
-        
-        #icalerror_clear_errno()
-        e1=icalerror_supress("MALFORMEDDATA")
-        e2=icalerror_supress("BADARG")
-
-        if isinstance(arg, DictType):
-            
-
-            es=icalerror_supress("MALFORMEDDATA")
-            self.pt = icalperiodtype_from_string(arg['value'])
-            icalerror_restore("MALFORMEDDATA",es)
-
-            Property.__init__(self, ref=arg['ref'])
-        else:
-            if isinstance(arg, StringType):
-
-                self.pt = icalperiodtype_from_string(arg)
-
-            else:
-                self.pt = icalperiodtype_null_period()
-
-            Property.__init__(self,type=name)
-                
-        icalerror_restore("MALFORMEDDATA",e1)
-        icalerror_restore("BADARG",e2)
-
-
-        if self.pt == None or icalperiodtype_is_null_period(self.pt):
-            raise Property.ConstructorFailedError("Failed to construct Period")
-
-        
-        try:
-            self._update_value()
-        except Property.UpdateFailedError:
-            raise Property.ConstructorFailedError("Failed to construct Period")
-
-    def _end_is_duration(self):        
-        dur = icalperiodtype_duration_get(self.pt)
-        if not icaldurationtype_is_null_duration(dur):
-            return 1
-        return 0
-
-    def _end_is_time(self):
-        end = icalperiodtype_end_get(self.pt)
-        if not icaltime_is_null_time(end):
-            return 1
-        return 0
-
-    def _update_value(self):
-
-        self.value(icalperiodtype_as_ical_string(self.pt),"PERIOD")
-
-
-    def valid(self):
-        "Return true if this is a valid period"
-
-        return not icalperiodtype_is_null_period(self.dur)
-
-    def start(self,v=None):
-        """
-        Return or set start time of the period. The start time may be
-        expressed as an RFC2445 format string or an instance of Time.
-        The return value is an instance of Time
-        """
-
-        if(v != None):
-            if isinstance(t,Time):
-                t = v
-            elif isinstance(t,StringType) or isinstance(t,IntType):
-                t = Time(v,"DTSTART")
-            else:
-                raise TypeError
-
-            icalperiodtype_start_set(self.pt,t.tt)
-
-            self._update_value()
-                
-        
-        return Time(icaltime_as_timet(icalperiodtype_start_get(self.pt)),
-                    "DTSTART")
-
-    def end(self,v=None):
-        """
-        Return or set end time of the period. The end time may be
-        expressed as an RFC2445 format string or an instance of Time.
-        The return value is an instance of Time.
-
-        If the Period has a duration set, but not an end time, this
-        method will caluculate the end time from the duration.  """
-
-        if(v != None):
-            
-            if isinstance(t,Time):
-                t = v
-            elif isinstance(t,StringType) or isinstance(t,IntType):
-                t = Time(v)
-            else:
-                raise TypeError
-
-            if(self._end_is_duration()):
-                start = icaltime_as_timet(icalperiodtype_start_get(self.pt))
-                dur = t.utc_seconds()-start;
-                icalperiodtype_duration_set(self.pt,
-                                            icaldurationtype_from_int(dur))
-            else:
-                icalperiodtype_end_set(self.pt,t.tt)
-                
-            self._update_value()
-
-        if(self._end_is_time()):
-            rt = Time(icaltime_as_timet(icalperiodtype_end_get(self.pt)),
-                      'DTEND')
-            rt.timezone(self.timezone())
-            return rt
-        elif(self._end_is_duration()):
-            start = icaltime_as_timet(icalperiodtype_start_get(self.pt))
-            dur = icaldurationtype_as_int(icalperiodtype_duration_get(self.pt))
-            rt = Time(start+dur,'DTEND')
-            rt.timezone(self.timezone())
-            return rt
-        else:
-            return Time({},'DTEND')
-
-
-
-    def duration(self,v=None):
-        """
-        Return or set the duration of the period. The duration may be
-        expressed as an RFC2445 format string or an instance of Duration.
-        The return value is an instance of Duration.
-
-        If the period has an end time set, but not a duration, this
-        method will calculate the duration from the end time.  """
-
-        if(v != None):
-            
-            if isinstance(t,Duration):
-                d = v
-            elif isinstance(t,StringType) or isinstance(t,IntType):
-                d = Duration(v)
-            else:
-                raise TypeError
-
-            if(self._end_is_time()):
-                start = icaltime_as_timet(icalperiodtype_start_get(self.pt))
-                end = start + d.seconds()
-
-                icalperiodtype_end_set(self.pt,icaltime_from_timet(end,0))
-            else:
-                icalperiodtype_duration_set(self.pt,d.dur)
-                
-        if(self._end_is_time()):
-            start =icaltime_as_timet(icalperiodtype_start_get(self.pt))
-            end = icaltime_as_timet(icalperiodtype_end_get(self.pt))
-
-            print "End is time " + str(end-start)
-
-            return Duration(end-start,"DURATION")
-
-        elif(self._end_is_duration()):
-            dur = icaldurationtype_as_int(
-                icalperiodtype_duration_get(self.pt))
-
-            return Duration(dur,"DURATION")
-        else:
-
-
-            return Duration(0,"DURATION")
-
-
-    def timezone(self,v=None):
-        """ Return or set the timezone string for this time """
-        if (v != None):
-            self['TZID'] = v
-        return  self['TZID']
diff --git a/libical/src/python/Property.py b/libical/src/python/Property.py
deleted file mode 100644
index 80c5864855..0000000000
--- a/libical/src/python/Property.py
+++ /dev/null
@@ -1,268 +0,0 @@
-#!/usr/bin/env python 
-# -*- Mode: python -*-
-#======================================================================
-# FILE: Property.py
-# CREATOR: eric 
-#
-# DESCRIPTION:
-#   
-#
-#  $Id$
-#  $Locker$
-#
-# (C) COPYRIGHT 2001, Eric Busboom <eric@softwarestudio.org>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>  
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either: 
-#
-#    The LGPL as published by the Free Software Foundation, version
-#    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-#
-#  Or:
-#
-#    The Mozilla Public License Version 1.0. You may obtain a copy of
-#    the License at http://www.mozilla.org/MPL/
-#======================================================================
-
-from LibicalWrap import *
-import re
-import base64
-from string import index, upper, split
-from types import StringType
-
-#def icalerror_supress(arg): 
-#    pass
-
-#def icalerror_restore(a,b):
-#    pass
-
-def error_type():
-    error = icalerror_perror()
-    return error[:index(error,':')]
-
-def test_enum(prop,enum):
-
-    kind =  icalproperty_string_to_kind(prop)
-    e = icalproperty_string_to_enum(enum)
-    
-    t = icalproperty_enum_belongs_to_property(kind,e)      
-
-    if t == 1:
-        return 1
-    
-    return None
-
-
-class Property:
-    """ Represent any iCalendar Property.
-
-    Usage:
-    Property(dict)
-
-    Where:
-    dict is a dictionary with keys of 'name', 'value_type', and 'value'.
-    In addition, parameter:parameter value entries may be included.
-    """
-
-    class ConstructorFailedError(Exception):
-        "Failed to construct a property"
-
-    class UpdateFailedError(Exception):
-        "Failed to update the value of a property"
-        
-
-    def __init__(self, type = None, ref = None):
-
-
-        assert(ref == None or isinstance(ref,StringType))
-        assert(type == None or isinstance(type,StringType))
-
-        self._ref = None
-        
-        if ref != None:
-            self._ref = ref
-        elif type != None:
-            kind  = icalproperty_string_to_kind(type)
-            self._ref = icalproperty_new(kind)
-
-	    if type.find("X-") == 0:
-		    icalproperty_set_x_name(self._ref, type)
-
-        if self._ref == None or self._ref == 'NULL':
-            raise Property.ConstructorFailedError("Failed to construct Property")
-            
-        self._deleted = 0;
-
-
-        # Initialize all of the required keys
-
-
-    def __del__(self):
-
-        self._deleted = 1;
-
-        if not self._deleted and \
-           self.ref() and \
-           icalproperty_get_parent(self.ref()) == 'NULL':
-            
-            icalproperty_free(self.ref())
-            
-    def name(self,v=None):
-        """ Return the name of the property """
-        return icalproperty_get_name(self._ref)
-
-    def ref(self,v=None):
-        """ Return the internal reference to the libical icalproperty """
-        if(v != None):
-
-            if not self._deleted and self._ref and \
-               icalproperty_get_parent(self._ref) == 'NULL':
-                
-                icalproperty_free(self._ref)
-
-            self._ref = v
-
-        return self._ref
-
-
-    def value(self,v=None, kind = None):
-        """ Return the RFC2445 representation of the value """
-
-        if(v != None):
-            
-            if kind != None:
-                # Get the default kind of value for this property 
-                default_kind = icalvalue_kind_to_string(icalproperty_kind_to_value_kind(icalproperty_string_to_kind(self.name())))
-
-                if(kind != default_kind):
-                    self.__setitem__('VALUE',kind)
-                vt = kind
-            elif self.__getitem__('VALUE'):
-                vt = self.__getitem__('VALUE')
-                print "###########", self
-            else:
-                vt = 'NO' # Use the kind of the existing value
-
-
-            icalerror_clear_errno()
-
-            #e1=icalerror_supress("MALFORMEDDATA")
-            if (self.name().find("X-") == 0) and type(v) is StringType:
-                 v = icallangbind_quote_as_ical(v)
-                 v = icallangbind_quote_as_ical(v)
-
-            icalproperty_set_value_from_string(self._ref,str(v),vt)
-            #icalerror_restore("MALFORMEDDATA",e1)
-
-            if error_type() != "NO":
-                raise Property.UpdateFailedError(error_type())
-
-            s = icalproperty_get_value_as_string(self._ref)
-
-        return icalproperty_get_value_as_string(self._ref)
-
-    def parameters(self):
-        """
-	Return a list of parameters
-        """
-
-        params = [] 
-
-	p = icallangbind_get_first_parameter(self._ref) 
-	
-	while p != None:
-		kv = split(icalparameter_as_ical_string(p),'=',2)
-		params.append(kv[0])
-		p = icallangbind_get_next_parameter(self._ref)
-
-	return params
-
-    def as_ical_string(self):
-        "Return the property in iCalendar text format."
-        return icalproperty_as_ical_string(self._ref)
-
-    def __getitem__(self,key):
-        """ Return property values by name """
-        key = upper(key)
-        str = icalproperty_get_parameter_as_string(self._ref,key)
-        
-        if(str == 'NULL'): return None
-
-        return str
-
-    def __setitem__(self,key,value):
-        """ Set Property Values by Name """
-        key = upper(key)
-
-        icalproperty_set_parameter_from_string(self._ref,key,value)
-
-        return self.__getitem__(key)
-
-    def __delitem__(self,key):
-        """ Remove Property Values by Name """
-        key = upper(key)
-
-	if self.__getitem__(key):
-		icalproperty_remove_parameter_by_name(self._ref,key)
-
-    def __str__(self):
-
-        str = self.as_ical_string()
-        return re.sub('\r?\n ?','',str)
-
-    def __cmp__(self, other):
-        s_str = str(self)
-        o_str = str(other)
-
-        return cmp(s_str,o_str)
-
-
-class RecurrenceSet: 
-    """
-    Represents a set of event occurrences. This
-    class controls a component's RRULE, EXRULE, RDATE and EXDATE
-    properties and can produce from them a set of occurrences. 
-    """
-
-    def __init__(self):
-        pass
-
-    def include(self, **params): 
-        """ 
-        Include a date or rule to the set. 
-
-        Use date= or pass in a
-        Time instance to include a date. Included dates will add an
-        RDATE property or will remove an EXDATE property of the same
-        date.
-
-        Use rule= or pass in a string to include a rule. Included
-        rules with either add a RRULE property or remove an EXRULE
-        property.
-
-        """
-        pass
-
-    def exclude(self, **params): 
-        """ 
-        Exclude date or rule to the set. 
-
-        Use date= or pass in a Time instance to exclude a
-        date. Excluded dates will add an EXDATE property or will remove
-        an RDATE property of the same date.
-
-        Use rule= or pass in a string to exclude a rule. Excluded
-        rules with either add an EXRULE property or remove an RRULE
-        property.
-
-        """
-        pass
-        
-    def occurrences(self, count=None):
-        """
-        Return 'count' occurrences as a tuple of Time instances.
-        """
-        pass
-
-
diff --git a/libical/src/python/Store.py b/libical/src/python/Store.py
deleted file mode 100644
index 00b5b0c2d0..0000000000
--- a/libical/src/python/Store.py
+++ /dev/null
@@ -1,181 +0,0 @@
-#!/usr/bin/env python 
-# -*- Mode: python -*-
-#======================================================================
-# FILE: Store.py
-# CREATOR: eric 
-#
-# DESCRIPTION:
-#   
-#
-#  $Id$
-#  $Locker$
-#
-# (C) COPYRIGHT 2001, Eric Busboom <eric@softwarestudio.org>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>  
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either: 
-#
-#    The LGPL as published by the Free Software Foundation, version
-#    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-#
-#  Or:
-#
-#    The Mozilla Public License Version 1.0. You may obtain a copy of
-#    the License at http://www.mozilla.org/MPL/
-#======================================================================
-
-from LibicalWrap import *
-from Error import LibicalError
-from Component import Component, CloneComponent
-from Gauge import Gauge
-
-class Store:
-    """ 
-    Base class for several component storage methods 
-    """
-
-    class AddFailedError(LibicalError):
-        "Failed to add a property to the file store"
-        
-    class ConstructorFailedError(LibicalError):
-        "Failed to create a Store "
-    
-    def __init__(self):
-        pass
-
-    def path(self):
-        pass
-    
-    def mark(self):
-        pass
-    
-    def commit(self): 
-        pass
-    
-    def add_component(self, comp):
-        pass
-    
-    def remove_component(self, comp):
-        pass
-    
-    def count_components(self, kind):
-        pass
-    
-    def select(self, gauge):
-        pass
-    
-    def clearSelect(self):
-        pass
-    
-    def fetch(self, uid):
-        pass
-    
-    def fetchMatch(self, comp):
-        pass
-    
-    def modify(self, oldc, newc):
-        pass
-    
-    def current_component(self):
-        pass
-    
-    def first_component(self):
-        pass
-    
-    def next_component(self):
-        pass
-
-
-class FileStore(Store):
-
-    def __init__(self, file):
-        e1=icalerror_supress("FILE")
-        self._ref = icalfileset_new(file)
-        icalerror_restore("FILE",e1)
-
-        if self._ref == None or self._ref == 'NULL':
-            raise  Store.ConstructorFailedError(file)
-
-    def __del__(self):
-        icalfileset_free(self._ref)
-
-    def path(self):
-        return icalfileset_path(self._ref)
-
-    def mark(self):
-        icalfileset_mark(self._ref)
-
-    def commit(self): 
-        icalfileset_commit(self._ref)
-
-    def add_component(self, comp):
-        if not isinstance(comp,Component):
-            raise Store.AddFailedError("Argument is not a component")
-            
-        error = icalfileset_add_component(self._ref,comp.ref())
-
-    def remove_component(self, comp):
-        if not isinstance(comp,Component):
-            raise Store.AddFailedError("Argument is not a component")
-
-        error = icalfileset_remove_component(self._ref,comp.ref())
-
-    def count_components(self, kind):
-	_kind = icalcomponent_string_to_kind(kind)
-
-	return icalfileset_count_components(self._ref, _kind)
-
-    def select(self, gauge):
-	error = icalfileset_select(self._ref, gauge.ref())
-
-    def clearSelect(self):
-	icalfileset_clear(self._ref)
-
-    def fetch(self, uid):
-	comp_ref = icalfileset_fetch(self._ref, uid)
-
-        if comp_ref == None:
-            return None
-
-        return CloneComponent(comp_ref)
-
-    def fetchMatch(self, comp):
-        if not isinstance(comp,Component):
-            raise Store.AddFailedError("Argument is not a component")
-            
-        comp_ref = icalfileset_fetch_match(self._ref,comp.ref())
-
-        if comp_ref == None:
-            return None
-
-        return CloneComponent(comp_ref)
-
-    def modify(self, oldc, newc):
-	pass
-
-    def current_component(self):
-        comp_ref = icalfileset_get_current_component(self._ref)
-
-        if comp_ref == None:
-            return None
-
-        return CloneComponent(comp_ref)
-
-    def first_component(self):
-        comp_ref = icalfileset_get_first_component(self._ref)
-
-        if comp_ref == None:
-            return None
-
-        return CloneComponent(comp_ref)
-
-    def next_component(self):
-        
-        comp_ref = icalfileset_get_next_component(self._ref)
-
-        if comp_ref == None:
-            return None
-
-        return CloneComponent(comp_ref)
-
diff --git a/libical/src/python/Time.py b/libical/src/python/Time.py
deleted file mode 100644
index 673607d7b4..0000000000
--- a/libical/src/python/Time.py
+++ /dev/null
@@ -1,215 +0,0 @@
-#!/usr/bin/env python 
-# -*- Mode: python -*-
-#======================================================================
-# FILE: Time.py
-# CREATOR: eric 
-#
-# DESCRIPTION:
-#   
-#
-#  $Id$
-#  $Locker$
-#
-# (C) COPYRIGHT 2001, Eric Busboom <eric@softwarestudio.org>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>  
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either: 
-#
-#    The LGPL as published by the Free Software Foundation, version
-#    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-#
-#  Or:
-#
-#    The Mozilla Public License Version 1.0. You may obtain a copy of
-#    the License at http://www.mozilla.org/MPL/
-#======================================================================
-
-from LibicalWrap import *
-from Property import Property
-from types import DictType, StringType, IntType, FloatType
-from Duration import Duration
-
-class Time(Property):
-    """ Represent iCalendar DATE, TIME and DATE-TIME """
-    def __init__(self, arg, name="DTSTART", zone=None):
-        """ 
-        Create a new Time from a string or number of seconds past the 
-        POSIX epoch
-
-        Time("19970325T123000Z")  Construct from an iCalendar string
-        Time(8349873494)          Construct from seconds past POSIX epoch
-        
-        """
-        e1=icalerror_supress("MALFORMEDDATA")
-        e2=icalerror_supress("BADARG")
-
-        if isinstance(arg, DictType):
-            # Dictionary -- used for creating from Component
-            self.tt = icaltime_from_string(arg['value'])
-            Property.__init__(self, ref=arg['ref'])
-        else:
-            if isinstance(arg, StringType):
-                # Create from an iCal string
-                self.tt = icaltime_from_string(arg)
-            elif isinstance(arg, IntType) or   \
-                 isinstance(arg, FloatType): 
-                # Create from seconds past the POSIX epoch
-		if zone:
-                	self.tt = icaltime_from_timet_with_zone(int(arg),0,icaltimezone_get_builtin_timezone(zone))
-		else:
-                	self.tt = icaltime_from_timet_with_zone(int(arg),0,icaltimezone_get_utc_timezone())
-            elif isinstance(arg, Time):
-                # Copy an instance
-                self.tt = arg.tt
-            else:
-                self.tt = icaltime_null_time()
-
-            Property.__init__(self,type=name)
-
-        icalerror_restore("MALFORMEDDATA",e1)
-        icalerror_restore("BADARG",e2)
-
-        if icaltime_is_null_time(self.tt):
-            raise Property.ConstructorFailedError("Failed to construct a Time")
-
-        try:
-            self._update_value()
-        except Property.UpdateFailedError:
-            raise Property.ConstructorFailedError("Failed to construct a Time")
-
-    def _update_value(self):
-        self.tt = icaltime_normalize(self.tt)
-        self.value(icaltime_as_ical_string(self.tt),"DATE-TIME")
-
-    def valid(self):
-        " Return true if this is a valid time "
-        return not icaltime_is_null_time(self.tt)
-
-    def utc_seconds(self,v=None):
-        """ Return or set time in seconds past POSIX epoch"""
-        if (v!=None):
-	    tz = icaltimezone_get_builtin_timezone(self.timezone())
-            self.tt = icaltime_from_timet_with_zone(v,0,tz)
-            self._update_value()
-
-        return icaltime_as_timet(self.tt)
-
-    def is_utc(self):
-        """ Return a boolean indicating if time is in UTC """
-        return icaltime_is_utc(self.tt)
-
-    def is_date(self):
-        """ Return a boolean indicating if time is actually a date """
-        return icaltime_is_date(self.tt)
-
-    def timezone(self,v=None):
-        """ Return, set (if none) or alter the timezone for this time """
-	
-	origtz = icaltime_get_tzid(self.tt)
-
-	if (v != None):
-            assert(isinstance(v,StringType) )
-	    if (v == "UTC"):
-                tz = icaltimezone_get_utc_timezone()
-		del self['TZID']
-            else:
-	    	tz = icaltimezone_get_builtin_timezone(v)
-
-            if not origtz:
-	        self.tt = icaltime_set_timezone(self.tt, tz)
-            else:
-	        self.tt = icaltime_convert_to_zone(self.tt,tz)
-
-	    if (icaltime_get_tzid(self.tt) != "UTC"):
-            	self['TZID'] = icaltime_get_tzid(self.tt)
-
-        self._update_value()
-	return icaltime_get_tzid(self.tt)
-
-    def second(self,v=None):
-        """ Get or set the seconds component of this time """
-        if(v != None):
-            icaltimetype_second_set(self.tt,v)
-            self._update_value()
-        return icaltimetype_second_get(self.tt)
-
-    def minute(self,v=None):
-        """ Get or set the minute component of this time """
-        if(v != None):
-            icaltimetype_minute_set(self.tt,v)
-            self._update_value()
-        return icaltimetype_minute_get(self.tt)
-
-    def hour(self,v=None):
-        """ Get or set the hour component of this time """
-        if(v != None):
-            icaltimetype_hour_set(self.tt,v)
-            self._update_value()
-        return icaltimetype_hour_get(self.tt)
-
-    def day(self,v=None):
-        """ Get or set the month day component of this time """
-        if(v != None):
-            icaltimetype_day_set(self.tt,v)
-            self._update_value()
-        return icaltimetype_day_get(self.tt)
-
-    def month(self,v=None):
-        """ Get or set the month component of this time. January is month 1 """
-        if(v != None):
-            icaltimetype_month_set(self.tt,v)
-            self._update_value()
-        return icaltimetype_month_get(self.tt)
-
-    def year(self,v=None):
-        """ Get or set the year component of this time """
-        if(v != None):
-            icaltimetype_year_set(self.tt,v)
-            self._update_value()
-
-        return icaltimetype_year_get(self.tt)
-
-
-    def __cmp__(self,other):
-
-        if other == None:
-            return cmp(self.utc_seconds(),None)
-
-        return cmp(self.utc_seconds(),other.utc_seconds())
-
-
-    def __add__(self,o):
-
-        other = Duration(o,"DURATION")      
-
-        if not other.valid():
-            return Duration(0,"DURATION")
-  
-        seconds = self.utc_seconds() + other.seconds()
-    
-        new = Time(seconds,self.name(),self.timezone())
-
-        return new
-
-    def __radd_(self,o):
-        return self.__add__(o)
-    
-
-    def __sub__(self,o):
-
-        
-        if isinstance(o,Time):
-            # Subtract a time from this time and return a duration
-            seconds = self.utc_seconds() - other.utc_seconds()
-            return Duration(seconds)
-        elif isinstance(o,Duration):
-            # Subtract a duration from this time and return a time
-            other = Duration(o)
-            if(not other.valid()):
-                return Time()
-
-            seconds = self.utc_seconds() - other.seconds()
-            return Time(seconds)
-        else:
-            raise TypeError, "subtraction with Time reqires Time or Duration"
diff --git a/libical/src/python/littlefile.txt b/libical/src/python/littlefile.txt
deleted file mode 100644
index cba0891115..0000000000
--- a/libical/src/python/littlefile.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-This is just a small file to test mime encoding.
-
-There isn't much here at all.
diff --git a/libical/src/python/python-binding.txt b/libical/src/python/python-binding.txt
deleted file mode 100644
index 7f925e246f..0000000000
--- a/libical/src/python/python-binding.txt
+++ /dev/null
@@ -1,434 +0,0 @@
-
-Classes for python binding to libical
-(Indentation indicates inheritance)
-
-	Component
-		Event
-		JournalEntry
-		Todo
-		FreeBusy
-		Timezone
-		Alarm
-			AudioAlarm
-			EmailAlarm
-			ProcedureAlarm
-			DisplayAlarm
-
-	Property
-		Attendee
-		Organizer
-		Status
-		Error
-
-	Time
-	Period
-	Date
-	RecurrenceSet
-
-	Timezone
-	TimezonePhase
-
-	Store
-		FileStore
-		DirStore
-		CAPStore
-		HeapStore
-		MySQLStore
-
-
-
-Component is the central class in the design. The component can be
-though of as a container for child components and properties, or as
-representation of a specific kind of iCal object. The first
-interface offers general property and component accessors, and the
-second treats some types of objects in a special way. 
-
-The general interface offers simple manipulators for child property
-and components, and it only works with immediate children. So, given
-the Component:
-
-	BEGIN:VCALENDAR
-	METHOD:PUBLISH
-	BEGIN:VEVENT
-	BEGIN:VALARM
-	COMMENT: An Alarm
-	END:VALARM
-	END:VEVENT
-	END:VCALENDAR
-
-A caller would have to descend three levels to access the COMMENT
-property in the alarm, but only one to access the METHOD property. 
-
-Libical is almost entirely dedicated to the general interface; it
-includes all of the *get_first_*, *_next_next_*, *_add_* and *_remove_*
-routines. 
-
-The specific interface works with derived classes of Property and
-Component. In this interface, the caller could get the COMMENT in the
-alarm in the example in two steps. First the caller would ask the
-Event object for its alarms, then then the caller would ask the first
-Alarm object for its comment. 
-
-The Specific interface is part of the
-derived classes of Component. This interface names all of the types of 
-properties and components that can be accessed from the derived
-component type. 
-
-In libical, the specific interface is primarily the "convenience
-routines in icalcomponent.h, such as: 
-
-
-	struct icaltimetype icalcomponent_get_dtend(icalcomponent* comp);
-	void icalcomponent_set_dtend(icalcomponent* comp, struct icaltimetype v);
-
-	void icalcomponent_set_duration(icalcomponent* comp, 
-				struct icaldurationtype v);
-	struct icaldurationtype icalcomponent_get_duration(icalcomponent* comp);
-
-These routines are smarter and do more work than the general
-interface. From the general interface, you can set the DTEND
-property of a component by creating the property and adding it to a
-component. But, if the component already has a DURATION property, then 
-this is an error -- a component can't have both. 
-
-icalcomponent_set_dtend determines if the component already has a
-DURATION. If it does, it substracts the dtstart time from the new
-dtend time and sets the duration to that. Otherwise, it creates aor
-changes the DTEND. 
-
-Also, icalcomponent_set_duration works the same regardless if the
-component is a VCALENDAR or a VEVENT. If it is a VCALENDAR, the
-routine descends into the VEVENT before making any changes. If it is
-allready a VEVENT ( or VTODO or VJOURNAL ) the routine just makes the
-changes. With icalcomponent_add_property, you need to do this check
-yourself. 
-
-( There should probably be a class between Component
-and Event ,JournalEntry and Todo that names all of the properties and
-components. Then Event, JournalEntry and Todo would remove the
-accessors that did not apply to them. )
-	
-Parameters are accessed as dictionaries from Property or as attributes
-of a derived class of Property. Both the names and the values of the
-parameters are strings.
-
-The Store hierarchy is a interface to various ways to store iCal
-components. Each of these has the same interface as its corresponding
-libical module:
-
-	FileStore icalfileset	Store iCal components in a single file
-	DirStore  icaldirset	Use multiple files, one per month of
-				DTSTART
-	CAPStore		Access components in a CAP server
-	HeapStore		Components stored in memory
-	MySQLStore		Components stored in a MySQL
-				database. 
-
-The only iCal value objects that will be implemented as Python classes 
-are Time, Duration and Period. RecurrenceSet handles recurrence
-rules. It replaces the properties RRULE, RDATE, EXRULE and EXDATE. 
-
-(Not all of the libical modules are implemented )
-
-
-How to Use the library
-----------------------
-
-The most common usecases will be something like this: 
-
-1)Caller opens a Store object on a file, server or database. The
-caller retrieves one or more component. Some of the components will be 
-booked on the user's calendar. Other components will be messages that
-other users have sent, like requests for meetings. 
-
-2) The caller will use the Specific interface ( using methods specific 
-to each property ) to example the component and decide what to do with 
-it. 
-
-3) Rarely, the caller will access the general interface to do things
-that the specific interface has not implemented or cannot manage
-well. 
-
-4) Caller may create a new component, using a combination of the
-general and specific interfaces. The caller may send the message to
-another user via mail, or may submit it to the user's CAP server with
-the CAPStore class. 
-
-	
-Following are the methods in each of the classes. 
-
-Component
-	Construct from string
-	Output string in ical form
-	
-	Get a Property by type
-	Get a set of Properties by type
-	Remove a Property by reference
-
-	Get a Component by type
-	Get a set of Components by type
-	Remove a Component  by reference
-
-	Validate the component ( insert properties for errors )
-	Count error properties
-	Remove error properties
-	Convert error properties into REQUEST-STATUS properties
-
-Event, JournalEntry, Todo
-	
-	Construct from string
-	Output string in ical form
-
-	There are get/set accessors for every property. These are
-	listed in a later section
-
-
-FreeBusy
-
-	Construct from string
-	Construct from arguments 
-	Output string in ical form
-
-	Accessors for the following properties. See below for return
-	types for these properties:
-
-	method
-	prodid
-	attendee
-	dtstamp
-	dtstart
-	freebusy
-	organizer
-	uid
-	comment
-	contact
-	request-status
-	url
-	duration
-	sequence
-
-TimezonePhase
-
-	Construct from string
-	Construct from arguments 
-	Output string in ical form
-
-	Accessors for the following properties. See below for return
-	types for these properties:
-
-	tzname
-	offsetto
-	offsetfrom
-	rrule
-	rdate
-	comment
-
-TimeZone
-
-	Construct from string
-	Construct from arguments 
-	Output string in ical form
-
-	Accessors for the following properties. See below for return
-	types for these properties:
-
-	tzid
-	last-modified
-	tzurl
-	standard (returns TimezonePhase)
-	daylight (returns TimezonePhase)
-
-
-Property
-	
-	Construct from string
-	Construct from arguments
-	Output string in ical form
-
-	Dictionary access to parameters
-
-	Get/set value
-
-Attendee
-
-	Construct from string
-	Construct from arguments
-	Output string in ical form
-
-	Access to the following properties and parameters:
-	cuid
-	cutype
-	member
-	role
-	rsvp
-	delto
-	delfrom
-	sentby
-	cn
-	dir
-	language
-
-Organizer
-
-	Access to the following properties:
-	common_name
-	dir
-	sentby
-	language
-
-
-Time
-Date
-Period
-
-	Same interfaces as libical modules. 
-
-RecurenceSet
-	I don't know -- need to think about it more. 
-
-Store
-	Similar methods to the icalset modules. 
-
-
-RFC2445 Properties
-
-This is a list of all of the RFC2445 properties and their associated
-VALUE type.
-
-
-Property	     Value
-----------------------------
-CALSCALE             TEXT		
-METHOD		     TEXT
-PRODID               TEXT
-VERSION              TEXT
-CATEGORIES           TEXT
-CLASS                TEXT
-COMMENT              TEXT
-DESCRIPTION          TEXT
-LOCATION             TEXT
-PERCENT-COMPLETE     INTEGER
-PRIORITY             INTEGER
-RESOURCES            TEXT
-STATUS               STATUS
-SUMMARY              TEXT
-COMPLETED            DATE-TIME
-FREEBUSY             PERIOD
-TRANSP               TEXT
-TZNAME               TEXT
-TZOFFSETFROM         UTC-OFFSET
-TZOFFSETTO           UTC-OFFSET
-TZURL                URI
-TZID                 TEXT
-ATTENDEE             CAL-ADDRESS
-CONTACT              TEXT
-ORGANIZER            CAL-ADDRESS
-RELATED-TO           TEXT
-URL                  URI
-UID                  TEXT
-EXRULE               RECUR
-RRULE                RECUR
-ACTION               TEXT
-REPEAT               INTEGER
-CREATED              DATE-TIME
-DTSTAMP              DATE-TIME
-LAST-MODIFIED        DATE-TIME
-SEQUENCE             INTEGER
-X         	     TEXT
-REQUEST-STATUS       STRING             
-ATTACH               URL, BINARY
-GEO                  FLOAT
-DTEND                DATE-TIME
-DUE                  DATE-TIME
-DTSTART              DATE-TIME
-RECURRENCE-ID        DATE-TIME
-EXDATE               DATE-TIME
-RDATE                DATE-TIME, PERIOD
-TRIGGER              DATE-TIME, DURATION
-DURATION	     DURATION 
-
-Some of the properties can appear multiple times in a component, other 
-can appear only once. For a particular component, the number of times
-a property can apper may also change with the METHOD property
-associated with the component. This list shows which properties can
-appear multiple times for some ( but not all ) combinations of
-component type and METHOD value: 
-
-ATTACH
-ATTENDEE
-CATEGORIES
-COMMENT
-CONTACT
-EXDATE
-EXRULE
-FREEBUSY
-NONE
-RDATE
-RELATEDTO
-REQUESTSTATUS
-RESOURCES
-RRULE
-TZNAME
-TZURL
-X          
-
-
-This is a list of the value types and their associated python return
-types. A lowercased return type is a python builtin, and an
-uppercase-first-letter is a class in the library:
-
-
-Value			Return Type
------------------------------------
-BINARY			file
-BOOLEAN			number
-CAL-ADDRESS		string
-DATE			Time
-DATE-TIME		Time
-DURATION		Duration
-FLOAT			number
-GEO			tuple
-INTEGER			number
-METHOD			string
-PERIOD			Period
-RECUR			RecurrenceSet
-TEXT			string
-TIME			Time
-URI			string
-UTC-OFFSET		number
-STATUS			string
-X			string
-
-
-I suspect that the Component class should use the three previous
-tables to create the property accessor methods on the fly. If the
-method generation system is general enough, we could also use it for
-other classes, such as Alarm, Timezone, Attendee, Organizer and
-Freebusy. 
-
-
-Memory Handling
----------------
-
-One of the things that made the perl binding to libcal difficult was
-that if a Component (in perl) returns a reference to a child Component
-(in perl), the child Component (in perl) will contain a reference to a
-libical component. When the caller is done with the child component in
-perl, the caller just drops it and lets perl reclaim the memory.
-
-The destructor for Component needs to free the libical component that
-it holds a reference to, but the child's libical component is still
-being used by libical. So perl frees the libical component and later,
-libical tries to reference freed memory.
-
-The situation is actually a little better than that, because libical
-will throw an error when you try to free a component that is still
-attached to a parent. 
-
-So, the perl library has to be able to determine when the destructor
-should free a libical component or not. The perl library calls
-icalcomponent_get_parent(), and if is it non-zero, it does not free
-the component.
-
-It is not hard, just more code, and something to watch out for. 
-
diff --git a/libical/src/python/test.py b/libical/src/python/test.py
deleted file mode 100644
index 4047e78c95..0000000000
--- a/libical/src/python/test.py
+++ /dev/null
@@ -1,603 +0,0 @@
-#!/usr/bin/env python 
-# -*- Mode: python -*-
-#======================================================================
-# FILE: test.py
-# CREATOR: eric 
-#
-# DESCRIPTION:
-#   
-#
-#  $Id$
-#  $Locker$
-#
-# (C) COPYRIGHT 2001, Eric Busboom <eric@softwarestudio.org>
-# (C) COPYRIGHT 2001, Patrick Lewis <plewis@inetarena.com>  
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either: 
-#
-#    The LGPL as published by the Free Software Foundation, version
-#    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-#
-#  Or:
-#
-#    The Mozilla Public License Version 1.0. You may obtain a copy of
-#    the License at http://www.mozilla.org/MPL/
-#======================================================================
-
-import LibicalWrap
-from Libical import *
-
-def error_type():
-    error = icalerror_perror()
-    return error[:index(error,':')]
-
-comp_str = """
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//ABC Corporation//NONSGML My Product//EN
-METHOD:REQUEST
-BEGIN:VEVENT
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MAILTO:employee-A@host.com
-COMMENT: When in the course of writting comments and nonsense text\, it 
- becomes necessary to insert a newline
-DTSTART:19972512T120000
-DTSTART:19970101T120000Z
-DTSTART:19970101
-DURATION:P3DT4H25M
-FREEBUSY:19970101T120000/19970101T120000
-FREEBUSY:19970101T120000/PT3H
-FREEBUSY:19970101T120000/PT3H
-END:VEVENT
-END:VCALENDAR"""
-
-
-def test_property():
-
-    print "--------------------------- Test Property ----------------------"
-
-
-    liw = LibicalWrap
-    icalprop = liw.icalproperty_new_from_string("ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MAILTO:employee-A@host.com")
-
-    print liw.icalproperty_as_ical_string(icalprop)
-
-    p = Property(ref=icalprop)
-
-    print p.name()
-    print
-    print "Parameters:"
-    for param in p.parameters():
-	    print "  ", param, " = ", p[param]
-    print
-    print p['ROLE']
-    
-    p['ROLE'] = 'INDIVIDUAL'
-
-    print p['ROLE']
-
-    p['ROLE'] = 'GROFROMBLATZ'
-
-    print p['ROLE']
-
-    print
-
-    p['X-MAN-FAVOURITE'] = 'Wolverine'
-    p['X-FILES-FAVOURITE'] = 'Mulder'
-
-    print p['X-MAN-FAVOURITE']
-
-    assert(p['X-MAN-FAVOURITE'] == 'Wolverine')
-    assert(p['X-FILES-FAVOURITE'] == 'Mulder')
-    assert(p['X-FILES-FAVOURITE'] != 'Scully')
-
-    print p.value()
-    p.value("mailto:Bob@bob.com")
-    print p.value()
-
-
-    print p.as_ical_string()
-    del p['ROLE']
-    del p['X-MAN-FAVOURITE']
-    
-    print p.as_ical_string()
-
-
-    try:
-        p = Property()
-    except Property.ConstructorFailedError:
-        pass
-    else:
-        assert(0)
-
-    # X Property
-    p = Property("X-COMMENT")
-
-    p.value("This is a sentence, with punctuation; indeed: it is")
-    print p
-
-    p.value("This is not approved by the Ministry of Silly Walks")
-    print p
-
-
-    assert(test_enum('METHOD','PUBLISH'))
-    assert(not test_enum('METHOD','FOO'))
-
-    assert(test_enum('ACTION','AUDIO'))
-    assert(not test_enum('ACTION','OPAQUE'))
-
-def test_time():
-    "Test routine"
-
-    print"-------------------Test Time  --------------------------------"
-
-    t = Time("19970325T123010Z",'DTSTART')
-    
-    assert(t.year() == 1997)
-    assert(t.month() == 3)
-    assert(t.day() == 25)
-    assert(t.hour() == 12)
-    assert(t.minute() == 30)
-    assert(t.second() == 10)
-    assert(t.is_utc())
-    assert(not t.is_date())
-    
-    print t
-
-    t.timezone("America/Los_Angeles")
-    print str(t)
-    print t.timezone()
-    #assert(str(t)=='DTSTART;TZID=America/Los_Angeles:19970325T123010')
-    assert(str(t)=='DTSTART;TZID=/softwarestudio.org/Olson_20010626_2/America/Los_Angeles:19970325T043010')
-
-    t.second(t.second()+80)
-
-    t.timezone("UTC")
-    assert(t.minute() == 31)
-    assert(t.second() == 30)
-
-    d = Duration(3600,"DURATION")
-    t2 = t + d
-
-    print t2
-    assert(t2.hour() == 13)
-
-    t2 = t - d
-
-    print t2
-    assert(isinstance(t2,Time))
-    assert(t2.hour() == 11)
-
-    # test int args
-    t = Time(2)
-    print t
- 
-    # test float args
-    t = Time(2.5)
-    print t
-
-def test_period():    
-
-    print"-------------------Test Period--------------------------------"
-
-    p = Period("19970101T180000Z/19970101T233000Z")
-
-    print p
-    
-    assert(str(p) == 'FREEBUSY:19970101T180000Z/19970101T233000Z')
-
-    print p.start()
-    assert(str(p.start()) == 'DTSTART:19970101T180000Z')
-
-    print p.end()
-    assert(str(p.end()) == 'DTEND:19970101T233000Z')
-
-    print p.duration()
-    assert(str(p.duration()) == 'DURATION:PT5H30M')
-    p = None
-
-    p = Period("19970101T180000Z/PT5H30M")
-    print p
-
-    print p.start()
-    assert(str(p.start()) == 'DTSTART:19970101T180000Z')
-
-    print p.end()
-    assert(str(p.end()) == 'DTEND:19970101T233000Z')
-
-    print p.duration()
-    assert(str(p.duration()) == 'DURATION:PT5H30M')
-
-
-def test_duration():
-
-    print "-------------- Test Duration ----------------"
-
-    # Ical string
-
-    d = Duration("P3DT4H25M")
-
-    print str(d)
-
-    assert(str(d) == "DURATION:P3DT4H25M")
-
-    print d.seconds()
-
-    assert(d.seconds() == 275100)
-
-    # seconds
-
-    d = Duration(-275100)
-           
-    print str(d)
-
-    assert(str(d) == "DURATION:-P3DT4H25M")
-
-    print d.seconds()
-
-    assert(d.seconds() == -275100)
-
-    #error
-
-    try:
-        d = Duration("P10WT7M")
-        print str(d)
-        assert(0)
-    except: pass
-
-    try:
-        d = Duration("Pgiberish")
-        print str(d)
-        assert(0)
-    except:
-        pass
-
-
-
-def test_attach():
-
-    file = open('littlefile.txt')
-    attachProp = Attach(file)
-    file.close()
-    attachProp.fmttype('text/ascii')
-    print "\n" + attachProp.name()
-    print attachProp.value_type()
-    print attachProp.fmttype()
-    attachProp['fmttype']=None
-    print "Calling value()"
-    print attachProp.value()
-    print "Calling asIcalString()"
-    print attachProp.as_ical_string()
-
-
-def test_component():
-
-    print "------------------- Test Component ----------------------"
-
-
-    c = NewComponent(comp_str);
-
-    props = c.properties()
-    
-    for p in props: 
-        print p.as_ical_string()
-    
-    inner = c.components()[0]
-
-    print inner
-    print type(inner)
-
-
-    props = inner.properties()
-    
-    for p in props: 
-        print p.as_ical_string()
-        
-    dtstart = inner.properties('DTSTART')[0]
-        
-    print dtstart
-    
-    print "\n Orig hour: ", dtstart.hour()
-    assert(dtstart.hour() == 12)
-
-    dtstart.hour(dtstart.hour() + 5)
-
-    print "\n New hour: ", dtstart.hour()
-    assert(dtstart.hour() == 17)
-
-    attendee = inner.properties('ATTENDEE')[0]
-    
-    print attendee
-
-    t = Time("20011111T123030")
-    t.name('DTEND')
-
-    inner.add_property(t)
-
-
-    print c
-
-    dtstart1 = inner.properties('DTSTART')[0]
-    dtstart2 = inner.properties('DTSTART')[0]
-    dtstart3 = inner.property('DTSTART')
-
-    assert(dtstart1 is dtstart2)
-    assert(dtstart1 == dtstart2)
-
-    assert(dtstart1 is dtstart3)
-    assert(dtstart1 == dtstart3)
-
-
-    p = Property(type="SUMMARY");
-    p.value("This is a summary")
-
-    inner.properties().append(p)
-
-    print inner.as_ical_string()
-
-    p = inner.properties("SUMMARY")[0]
-    assert(p!=None);
-    print str(p)
-    assert(str(p) == "SUMMARY:This is a summary")
-
-    inner.properties()[:] = [p]
-
-    print inner.as_ical_string()
-
-    # test sequence 
-    event = Event()
-
-    try:
-       event.sequence("foo")
-    except TypeError:
-       pass
-
-    event.sequence(-1)
-    print event.sequence()
-
-    event.sequence(1)
-    event.sequence(88)
-    print event.sequence()
-    
-def test_event():
-    print "------------ Event Class ----------------------"
-
-    event = Event()
-
-    event.method('REQUEST')
-    event.version('2.0')
-
-    event.created("20010313T123000Z")
-    print "created =", event.created()
-    assert (event.created() == Time("20010313T123000Z"))
-
-    event.organizer("MAILTO:j_doe@nowhere.com")
-    org = event.organizer()
-    print org.cn()
-    org.cn('Jane Doe')
-    assert (isinstance(org, Organizer))
-    print "organizer =", event.organizer()
-    assert (event.organizer().value() == "MAILTO:j_doe@nowhere.com")
-
-    event.dtstart("20010401T183000Z")
-    print "dtstart =", event.dtstart()
-    assert (event.dtstart()== Time("20010401T183000Z"))
-
-    dtend = Time('20010401T190000Z', 'DTEND')
-    event.dtend(dtend)
-    assert (event.dtend() ==dtend )
-    assert (event.dtend() == Time('20010401T190000Z'))
-    
-    att = Attendee()
-    att.value('jsmith@nothere.com')
-    event.attendees(('ef_hutton@listenup.com', att))
-    
-    event.x_properties('X-TEST',('foo', 'bar'))
-    event.x_properties('X-TEST2',('foo, biz', 'bar, biz'))
-
-    inner = event.components()[0]
-    for e in inner.properties('X-TEST'):
-        print " ", e.as_ical_string()
-
-    assert(len(event.x_properties('X-TEST'))==2)
-
-    event.description("A short description.  Longer ones break things. Really. What does it break. The code is supposed to handle realy long lines, longer, in fact, than any sane person would create except by writting a random text generator or by excerpting text from a less sane person. Actually, it did \"break\" and I had to remove an \n assert to fix it.")
-    event.status('TeNtAtIvE')
-    
-    print event.as_ical_string()
-
-    
-def test_derivedprop():
-    
-    print "------------ Derived Properties -----------------"
-    
-    p = RDate("20011111T123030")
-
-    print str(p)
-
-
-    p = RDate("19970101T120000/19970101T123000")
-
-    print str(p)
-
-    try:
-        p = RDate("P3DT4H25M")
-        print str(p)
-        assert(0)
-    except: pass
-
-    
-    p = Trigger("P3DT4H25M")
-
-    print str(p)
-
-    p = Trigger("20011111T123030")
-
-    print str(p)
-
-    try:
-        p = Trigger("19970101T120000/19970101T123000")
-        print str(p)
-        assert(0)
-    except: pass
-
-def test_gauge():
-    print "------------ Gauge -----------------"
-    event = Event()
-
-    event.method('REQUEST')
-    event.version('2.0')
-    event.created("20010313T123000Z")
-    event.organizer("MAILTO:j_doe@nowhere.com")
-    org = event.organizer()
-    org.cn('Jane Doe')
-    event.dtstart("20010401T183000Z")
-    dtend = Time('20010401T190000Z', 'DTEND')
-    event.dtend(dtend)
-    event.description("A short description.")
-    event.status('TeNtAtIvE')
-    
-    print event.as_ical_string()
-
-    gauge = Gauge(sql="SELECT * FROM VEVENT WHERE DTSTART > '20010401T180000Z'")
-
-    assert(gauge.compare(event) == 1)
-
-    gauge = Gauge(sql="SELECT * FROM VEVENT WHERE DTSTART > '20010401T190000Z'")
-
-    assert(gauge.compare(event) == 0)
-
-def do_test_store(storeobj=None, *args):
-    assert(storeobj != None)
-    store = storeobj(*args)
-    assert(store != None)
-
-    print ">------------ ",
-    print store.__class__,
-    print "Store -----------------"
-
-
-    # create fileset
-
-    event = Event()
-
-    event.method('REQUEST')
-    event.version('2.0')
-    event.created("20010313T123000Z")
-    event.organizer("MAILTO:j_doe@nowhere.com")
-    event.dtstart("20010401T183000Z")
-    event.duration('PT3H')
-
-    event.description("A short description.")
-
-    # for i = 1 to 10
-    #  copy event
-    #  munge uid and increment month
-    for i in range(1,11):
-	newevent = event.clone()
-	newevent.uid("%d@localhost" % (i,))
-	newevent.dtstart().month( newevent.dtstart().month() + i )
-
-	#print ne
-	store.add_component(newevent)
-
-    # commit
-    store.commit()
-    assert(store.count_components("VCALENDAR") == 10)
-    # free
-    del(store)
-
-    # open again
-    store = storeobj(*args)
-    # assert count of components = 10
-    assert(store.count_components("VCALENDAR") == 10)
-
-    # print them out
-    # fetch by uid
-    n7 = store.fetch("7@localhost")
-    print n7
-    # fetch by match
-
-    n7m = store.fetchMatch(n7)
-    assert(str(n7) == str(n7m))
-
-    # modify in memory
-    n7.uid("42@localhost")
-    del(store)
-    del(n7)
-
-    store = storeobj(*args)
-    assert(store.fetch("42@localhost") == None)
-    n7 = store.fetch("7@localhost")
-    n7.uid("42@localhost")
-    store.mark()
-    store.commit()
-    del(store)
-    store = storeobj(*args)
-    assert(store.fetch("7@localhost") == None)
-
-    # fetch by gauge
-
-    gauge = Gauge(sql="SELECT * FROM VEVENT WHERE DTSTART > '20010601T000000Z' AND DTSTART < '20010901T000000Z'")
-
-    store.select(gauge)
-
-    count = 0
-
-    c = store.first_component()
-    while c != None:
-	    print c.uid()
-	    print c.dtstart()
-	    print
-	    count = count + 1
-	    c = store.next_component()
-
-    store.clearSelect()
-
-    assert(count == 3)
-
-    # remove all of them
-    c = store.first_component()
-    while c != None:
-	    print c.uid()
-	    store.remove_component(c)
-	    c = store.first_component()
-
-    assert(store.count_components("VCALENDAR") == 0)
-    store.commit()
-    assert(store.count_components("VCALENDAR") == 0)
-    # print them out
-    # assert count of components = 0
-
-
-def test_store():
-    print "------------ Store -----------------"
-    do_test_store(FileStore,"filesetout.ics")
-
-def run_tests():
-    test_property()
-
-    test_time()
-
-    test_period()
-
-    test_component()
-
-    test_duration()
-
-    test_derivedprop()
-
-    test_event()
-
-    #test_attach()
-
-    test_gauge()
-    
-    test_store()
-
-
-
-
-if __name__ == "__main__":
-    run_tests()
-
diff --git a/libical/src/test/.cvsignore b/libical/src/test/.cvsignore
deleted file mode 100644
index eca96994ab..0000000000
--- a/libical/src/test/.cvsignore
+++ /dev/null
@@ -1,16 +0,0 @@
-Makefile
-Makefile.in
-.deps
-.libs
-*.lo
-*.la
-copycluster
-regression
-parser
-storage
-stow
-recur
-testmime
-testvcal
-process
-testclassify
diff --git a/libical/src/test/2445.ics b/libical/src/test/2445.ics
deleted file mode 100644
index 71cf45e750..0000000000
--- a/libical/src/test/2445.ics
+++ /dev/null
@@ -1,326 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//hacksw/handcal//NONSGML v1.0//EN
-BEGIN:VEVENT
-DTSTAMP:19970901T1300Z
-DTSTART:19970714T170000Z
-DTEND:19970715T035959Z
-SUMMARY:Bastille Day Party
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VEVENT
-UID:19970901T130000Z-123401@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19970903T163000Z
-DTEND:19970903T190000Z
-SUMMARY:Annual Employee Review
-CLASS:PRIVATE
-CATEGORIES:BUSINESS,HUMAN RESOURCES
-END:VEVENT
-
-BEGIN:VEVENT
-UID:19970901T130000Z-123402@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19970401T163000Z
-DTEND:19970402T010000Z
-SUMMARY:Laurel is in sensitivity awareness class.
-CLASS:PUBLIC
-CATEGORIES:BUSINESS,HUMAN RESOURCES
-TRANSP:TRANSPARENT
-END:VEVENT
-
-BEGIN:VEVENT
-UID:19970901T130000Z-123403@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19971102
-SUMMARY:Our Blissful Anniversary
-CLASS:CONFIDENTIAL
-CATEGORIES:ANNIVERSARY,PERSONAL,SPECIAL OCCASION
-RRULE:FREQ=YEARLY
-END:VEVENT
-
-BEGIN:VTODO
-UID:19970901T130000Z-123404@host.com
-DTSTAMP:19970901T1300Z
-DTSTART:19970415T133000Z
-DUE:19970416T045959Z
-SUMMARY:1996 Income Tax Preparation
-CLASS:CONFIDENTIAL
-CATEGORIES:FAMILY,FINANCE
-PRIORITY:1
-STATUS:NEEDS-ACTION
-END:VTODO
-BEGIN:VJOURNAL
-UID:19970901T130000Z-123405@host.com
-DTSTAMP:19970901T1300Z
-DTSTART;VALUE=DATE:19970317
-SUMMARY:Staff meeting minutes
-DESCRIPTION:1. Staff meeting: Participants include Joe\, Lisa
-  and Bob. Aurora project plans were reviewed. There is currently
-  no budget reserves for this project. Lisa will escalate to
-  management. Next meeting on Tuesday.\n
-  2. Telephone Conference: ABC Corp. sales representative called
-  to discuss new printer. Promised to get us a demo by Friday.\n
-  3. Henry Miller (Handsoff Insurance): Car was totaled by tree.
-  Is looking into a loaner car. 654-2323 (tel).
-END:VJOURNAL
-BEGIN:VFREEBUSY
-ORGANIZER:MAILTO:jane_doe@host1.com
-ATTENDEE:MAILTO:john_public@host2.com
-DTSTART:19971015T050000Z
-DTEND:19971016T050000Z
-DTSTAMP:19970901T083000Z
-END:VFREEBUSY
-BEGIN:VFREEBUSY
-ORGANIZER:MAILTO:jane_doe@host1.com
-ATTENDEE:MAILTO:john_public@host2.com
-DTSTAMP:19970901T100000Z
-FREEBUSY;VALUE=PERIOD:19971015T050000Z/PT8H30M,
- 19971015T160000Z/PT5H30M,19971015T223000Z/PT6H30M
-URL:http://host2.com/pub/busy/jpublic-01.ifb
-COMMENT:This iCalendar file contains busy time information for
-  the next three months.
-END:VFREEBUSY
-BEGIN:VFREEBUSY
-ORGANIZER:jsmith@host.com
-DTSTART:19980313T141711Z
-DTEND:19980410T141711Z
-FREEBUSY:19980314T233000Z/19980315T003000Z
-FREEBUSY:19980316T153000Z/19980316T163000Z
-FREEBUSY:19980318T030000Z/19980318T040000Z
-URL:http://www.host.com/calendar/busytime/jsmith.ifb
-END:VFREEBUSY
-BEGIN:VTIMEZONE
-TZID:US-Eastern
-LAST-MODIFIED:19870101T000000Z
-BEGIN:STANDARD
-DTSTAMP:19970901T130000Z
-DTSTART:19971026T020000
-RDATE:19971026T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19971026T020000
-RDATE:19970406T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VTIMEZONE
-TZID:US-Eastern
-LAST-MODIFIED:19870101T000000Z
-TZURL:http://zones.stds_r_us.net/tz/US-Eastern
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VTIMEZONE
-TZID:US--Fictitious-Eastern
-LAST-MODIFIED:19870101T000000Z
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4;UNTIL=19980404T070000Z
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VTIMEZONE
-TZID:US--Fictitious-Eastern
-LAST-MODIFIED:19870101T000000Z
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4;UNTIL=19980404T070000Z
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-BEGIN:DAYLIGHT
-DTSTART:19990424T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=4
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VALARM
-TRIGGER;VALUE=DATE-TIME:19970317T133000Z
-REPEAT:4
-DURATION:PT15M
-ACTION:AUDIO
-ATTACH;FMTTYPE=audio/basic:ftp://host.com/pub/sounds/bell-01.aud
-END:VALARM
-BEGIN:VALARM
-TRIGGER:-PT30M
-REPEAT:2
-DURATION:PT15M
-ACTION:DISPLAY
-DESCRIPTION:Breakfast meeting with executive\n
- team at 8:30 AM EST.
-END:VALARM
-BEGIN:VALARM
-TRIGGER:-P2D
-ACTION:EMAIL
-ATTENDEE:MAILTO:john_doe@host.com
-SUMMARY:*** REMINDER: SEND AGENDA FOR WEEKLY STAFF MEETING ***
-DESCRIPTION:A draft agenda needs to be sent out to the attendees
-  to the weekly managers meeting (MGR-LIST). Attached is a
-  pointer the document template for the agenda file.
-ATTACH;FMTTYPE=application/binary:http://host.com/templates/agen
- da.doc
-END:VALARM
-BEGIN:VALARM
-TRIGGER;VALUE=DATE-TIME:19980101T050000Z
-REPEAT:23
-DURATION:PT1H
-ACTION:PROCEDURE
-ATTACH;FMTTYPE=application/binary:ftp://host.com/novo-
- procs/felizano.exe
-END:VALARM
-BEGIN:VCALENDAR
-PRODID:-//RDU Software//NONSGML HandCal//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:US-Eastern
-BEGIN:STANDARD
-DTSTART:19981025T020000
-RDATE:19981025T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19990404T020000
-RDATE:19990404T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:19980309T231000Z
-UID:guid-1.host1.com
-ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:
- MAILTO:employee-A@host.com
-DESCRIPTION:Project XYZ Review Meeting
-CATEGORIES:MEETING
-CLASS:PUBLIC
-CREATED:19980309T130000Z
-SUMMARY:XYZ Project Review
-DTSTART;TZID=US-Eastern:19980312T083000
-DTEND;TZID=US-Eastern:19980312T093000
-LOCATION:1CP Conference Room 4350
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-METHOD:PUBLISH
-VERSION:2.0
-PRODID:-//ABC Corporation//NONSGML My Product//EN
-BEGIN:VEVENT
-DTSTAMP:19970324T1200Z
-SEQUENCE:0
-UID:uid3@host1.com
-ORGANIZER:MAILTO:jdoe@host1.com
-DTSTART:19970324T123000Z
-DTEND:19970324T210000Z
-CATEGORIES:MEETING,PROJECT
-CLASS:PUBLIC
-SUMMARY:Calendaring Interoperability Planning Meeting
-DESCRIPTION:Discuss how we can test c&s interoperability\n
- using iCalendar and other IETF standards.
-LOCATION:LDB Lobby
-ATTACH;FMTTYPE=application/postscript:ftp://xyzCorp.com/pub/
- conf/bkgrnd.ps
-END:VEVENT
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//ABC Corporation//NONSGML My Product//EN
-BEGIN:VTODO
-DTSTAMP:19980130T134500Z
-SEQUENCE:2
-UID:uid4@host1.com
-ORGANIZER:MAILTO:unclesam@us.gov
-ATTENDEE;PARTSTAT=ACCEPTED:MAILTO:jqpublic@host.com
-DUE:19980415T235959
-STATUS:NEEDS-ACTION
-SUMMARY:Submit Income Taxes
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER:19980403T120000
-ATTACH;FMTTYPE=audio/basic:http://host.com/pub/audio-
- files/ssbanner.aud
-REPEAT:4
-DURATION:PT1H
-END:VALARM
-END:VTODO
-END:VCALENDAR
-
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//ABC Corporation//NONSGML My Product//EN
-BEGIN:VJOURNAL
-DTSTAMP:19970324T120000Z
-UID:uid5@host1.com
-ORGANIZER:MAILTO:jsmith@host.com
-STATUS:DRAFT
-CLASS:PUBLIC
-CATEGORIES:Project Report, XYZ, Weekly Meeting
-DESCRIPTION:Project xyz Review Meeting Minutes\n
- Agenda\n1. Review of project version 1.0 requirements.\n2.
- Definition
- of project processes.\n3. Review of project schedule.\n
- Participants: John Smith\, Jane Doe\, Jim Dandy\n-It was
-  decided that the requirements need to be signed off by
-  product marketing.\n-Project processes were accepted.\n
- -Project schedule needs to account for scheduled holidays
-  and employee vacation time. Check with HR for specific
-  dates.\n-New schedule will be distributed by Friday.\n-
- Next weeks meeting is cancelled. No meeting until 3/23.
-END:VJOURNAL
-END:VCALENDAR
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//RDU Software//NONSGML HandCal//EN
-BEGIN:VFREEBUSY
-ORGANIZER:MAILTO:jsmith@host.com
-DTSTART:19980313T141711Z
-DTEND:19980410T141711Z
-FREEBUSY:19980314T233000Z/19980315T003000Z
-FREEBUSY:19980316T153000Z/19980316T163000Z
-FREEBUSY:19980318T030000Z/19980318T040000Z
-URL:http://www.host.com/calendar/busytime/jsmith.ifb
-END:VFREEBUSY
-END:VCALENDAR
diff --git a/libical/src/test/2446.ics b/libical/src/test/2446.ics
deleted file mode 100644
index e69de29bb2..0000000000
--- a/libical/src/test/2446.ics
+++ /dev/null
diff --git a/libical/src/test/Makefile.am b/libical/src/test/Makefile.am
deleted file mode 100644
index e1824b064c..0000000000
--- a/libical/src/test/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-if WITH_CXX_BINDINGS
-cxx_inc=-DWITH_CXX_BINDINGS
-cxx_libs=../libical/libical-evolution_cxx.la
-regression_cxx = regression-cxx.cpp
-else
-cxx_inc=
-cxx_libs=
-regression_cxx = 
-AM_CXX=@CC@
-endif
-
-if WITH_BDB4
-bdb4_inc=-DWITH_BDB -I@BDB_DIR@/include
-bdb4_libs=@BDB_DIR_LIB@/@BDB_LIB@
-else
-bdb4_inc=
-bdb4_libs=
-endif
-
-noinst_PROGRAMS = copycluster regression parser stow recur testmime testvcal process
-
-LDADD =  ../libicalss/libicalss-evolution.la ../libicalvcal/libicalvcal-evolution.la $(cxx_libs) ../libical/libical-evolution.la $(bdb4_libs)
-
-LIBS = @PTHREAD_LIBS@
-
-INCLUDES = 				\
-	-I$(top_srcdir)			\
-	-I$(top_srcdir)/src		\
-	$(cxx_inc) $(bdb4_inc)
-
-TESTS=regression
-copycluster_SOURCES = copycluster.c
-regression_SOURCES = 		\
-	regression.c		\
-	regression.h		\
-	regression-component.c	\
-	regression-classify.c	\
-	regression-utils.c	\
-	regression-recur.c	\
-	regression-storage.c	\
-	$(regression_cxx)
-
-parser_SOURCES = icaltestparser.c
-stow_SOURCES = stow.c
-testvcal_SOURCES = testvcal.c
-recur_SOURCES = recur.c 
-testmime_SOURCES = testmime.c
-process_SOURCES = process.c
diff --git a/libical/src/test/copycluster.c b/libical/src/test/copycluster.c
deleted file mode 100644
index 6894de9d36..0000000000
--- a/libical/src/test/copycluster.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: copycluster.c
-  CREATOR: eric 15 January 2000
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000 Eric Busboom
- http://www.softwarestudio.org
-
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
- ======================================================================*/
-
-#include <stdio.h> /* for printf */
-#include <errno.h>
-#include <string.h> /* For strerror */
-#include <signal.h> /* for signal */
-#include <unistd.h> /* for alarm */
-#include <stdlib.h> /* for exit */
-
-#include <libical/ical.h>
-#include <libicalss/icalss.h>
-
-static void sig_alrm(int i){
-    fprintf(stderr,"Could not get lock on file\n");
-    exit(1);
-}
-/* This program copies a file that holds iCal components to an other file. */
-
-
-void usage(char* arg0) {
-    printf("usage: %s cluster-file1 cluster-file2\n",arg0);
-}
-
-int main(int c, char *argv[]){
-
-    icalset *clusterin, *clusterout;
-    icalcomponent *itr;
-    int count=0;
-    int tostdout = 0;
-
-    if(c < 2 || c > 3){
-	usage(argv[0]);
-	exit(1);
-    }
-
-    if (c == 2){
-	tostdout = 1;
-    }
-
-
-    /*icalerror_set_error_state(ICAL_PARSE_ERROR, ICAL_ERROR_NONFATAL);*/
-
-    signal(SIGALRM,sig_alrm);
-
-    alarm(10);
-    clusterin = icalfileset_new(argv[1]);
-    alarm(0);
-
-    if (clusterin == 0){
-	printf("Could not open input cluster \"%s\"\n",argv[1]);
-	if(icalerrno!= ICAL_NO_ERROR){
-          printf("Error: %s\n",icalerror_strerror(icalerrno));
-        }
-	exit(1);
-    }
-
-    if (!tostdout){
-        alarm(10);
-	clusterout = icalfileset_new(argv[2]);
-	alarm(0);
-	if (clusterout == 0){
-	    printf("Could not open output cluster \"%s\"\n",argv[2]);
-	    exit(1);
-	}
-    }
-
-
-    for (itr = icalset_get_first_component(clusterin);
-	 itr != 0;
-	 itr = icalset_get_next_component(clusterin)){
-
-        icalerror_set_error_state(ICAL_BADARG_ERROR, ICAL_ERROR_NONFATAL);
-	icalrestriction_check(itr);
-        icalerror_set_error_state(ICAL_BADARG_ERROR, ICAL_ERROR_DEFAULT);
-
-	if (itr != 0){
-
-	    if(tostdout){
-
-		printf("--------------\n%s\n",icalcomponent_as_ical_string(itr));
-
-	    } else {
-
-		icalfileset_add_component(clusterout,
-					  icalcomponent_new_clone(itr));
-	    }
-	    
-	    count++;
-
-	} else {
-	    printf("Got NULL component");
-	}
-    }
-
-
-    printf("Transfered %d components\n",count);
-
-    icalset_free(clusterin);
-
-    if (!tostdout){
-	icalfileset_mark(clusterout);
-	icalset_free(clusterout);
-    }
-
-     return 0;
-}
-
-
diff --git a/libical/src/test/findobj.c b/libical/src/test/findobj.c
deleted file mode 100644
index eb565afa7a..0000000000
--- a/libical/src/test/findobj.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: findobj.c
-  CREATOR: eric 11 February 2000
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000 Eric Busboom
- http://www.softwarestudio.org
-
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
- ======================================================================*/
-
-#include <stdio.h> /* for printf */
-#include <errno.h>
-#include <string.h> /* For strerror */
-
-#include <libical/ical.h>
-#include <libicalss/icalss.h>
-
-/* This program finds an object stored in a calendar */
-
-void usage(char* arg0) {
-    printf("usage: %s calendar-dir uid\n",arg0);
-}
-
-int main(int c, char *argv[]){
-
-    icalcalendar *cal;
-    icaldirset *booked;
-    icalcomponent *itr;
-
-    if(c < 2 || c > 3){
-	usage(argv[0]);
-	exit(1);
-    }
-
-    cal = icalcalendar_new(argv[1]);
-
-    if(cal == 0){
-	fprintf(stderr,"%s: error in opening calendar \"%s\": %s. errno is \"%s\"\n",
-		argv[0],argv[1],icalerror_strerror(icalerrno),
-		strerror(errno));
-    }
-
-    booked = icalcalendar_get_booked(cal);
-
-    itr = icaldirset_fetch(booked,argv[2]);
-
-
-    if(itr != 0){
-	printf("%s",icalcomponent_as_ical_string(itr));
-    }
-
-    return 0;
-}
-
diff --git a/libical/src/test/icaltestparser.c b/libical/src/test/icaltestparser.c
deleted file mode 100644
index 9992979a3a..0000000000
--- a/libical/src/test/icaltestparser.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: icaltestparser.c
-  CREATOR: eric 20 June 1999
-  
-  $Id$
-  $Locker$
-    
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
-
-  The original author is Eric Busboom
-  The original code is icaltestparser.c
-
- 
- (C) COPYRIGHT 1999 The Software Studio. 
- http://www.softwarestudio.org
-
- ======================================================================*/
-
-#include <stdio.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <libical/ical.h>
-
-#include <stdlib.h>
-
-char str[] = "BEGIN:VCALENDAR\
-PRODID:\"-//RDU Software//NONSGML HandCal//EN\"\
-VERSION:2.0\
-BEGIN:VTIMEZONE\
-TZID:US-Eastern\
-BEGIN:STANDARD\
-DTSTART:19990404T020000\
-RDATE:19990u404xT020000\
-TZOFFSETFROM:-0500\
-TZOFFSETTO:-0400\
-END:STANDARD\
-BEGIN:DAYLIGHT\
-DTSTART:19990404T020000\
-RDATE:19990404T020000\
-TZOFFSETFROM:-0500\
-TZOFFSETTO:-0400\
-TZNAME:EDT\
-Dkjhgri:derhvnv;\
-BEGIN:dfkjh\
-END:dfdfkjh\
-END:DAYLIGHT\
-END:VTIMEZONE\
-BEGIN:VEVENT\
-GEO:Bongo\
-DTSTAMP:19980309T231000Z\
-UID:guid-1.host1.com\
-ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com\
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP\
- :MAILTO:employee-A@host.com\
-DESCRIPTION:Project XYZ Review Meeting\
-CATEGORIES:MEETING\
-CLASS:PUBLIC\
-CREATED:19980309T130000Z\
-SUMMARY:XYZ Project Review\
-DTSTART;TZID=US-Eastern:19980312T083000\
-DTEND;TZID=US-Eastern:19980312T093000\
-LOCATION:1CP Conference Room 4350\
-END:VEVENT\
-END:VCALENDAR\
-";
-
-extern int yydebug;
-
-/* Have the parser fetch data from stdin */
-
-char* read_stream(char *s, size_t size, void *d)
-{
-  char *c = fgets(s,size, (FILE*)d);
-
-  return c;
-
-}
-
-
-
-int main(int argc, char* argv[])
-{
-
-    char* line; 
-    FILE* stream;
-    icalcomponent *c; 
-    icalparser *parser = icalparser_new();
-
-    stream = fopen(argv[1],"r");
-
-    assert(stream != 0);
-
-    icalparser_set_gen_data(parser,stream);
-
-    do{
-    
-	line = icalparser_get_line(parser,read_stream);
-
-	c = icalparser_add_line(parser,line);
-
-
-	if (c != 0){
-	    /*icalcomponent_convert_errors(c);*/
-	    printf("%s",icalcomponent_as_ical_string(c));
-	    printf("\n---------------\n");
-	    icalcomponent_free(c);
-	}
-
-    } while ( line != 0);
-
-    return 0;
- }
diff --git a/libical/src/test/itip.ics b/libical/src/test/itip.ics
deleted file mode 100644
index 9a71660a75..0000000000
--- a/libical/src/test/itip.ics
+++ /dev/null
@@ -1,14 +0,0 @@
-
-BEGIN:VCALENDAR
-METHOD:REPLY
-PRODID:-//ACME/DesktopCalendar//EN
-VERSION:2.0
-BEGIN:VEVENT
-ORGANIZER:mailto:a@example.com
-ATTENDEE:mailto:eric@agony.busboom.org
-DTSTART:19970701T200000Z
-DTSTAMP:19970611T190000Z
-SUMMARY:ST. PAUL SAINTS -VS- DULUTH-SUPERIOR DUKES
-UID:0981234-1234234-23@example.com
-END:VEVENT
-END:VCALENDAR
diff --git a/libical/src/test/outgoing.ics b/libical/src/test/outgoing.ics
deleted file mode 100644
index 9f9fd3fd69..0000000000
--- a/libical/src/test/outgoing.ics
+++ /dev/null
@@ -1,544 +0,0 @@
-BEGIN:VCALENDAR
-METHOD
- :REPLY
-VERSION
- :2.0
-PRODID
- :-//SoftwareStudio//NONSGML libical 0.21 //EN
-BEGIN:VEVENT
-DTSTAMP
- :20001121T170735Z
-UID
- :calsrv.example.com-873970198738703@example.com
-ORGANIZER
- :Mailto:bob@cal.softwarestudio.org
-SUMMARY
- : Overlap  1
-SEQUENCE
- :0
-COMMENT
- :I can make it to this meeting
-ATTENDEE
- ;ROLE=CHAIR
- ;CUTYPE=INDIVIDUAL
- ;CN=Alice
- ;PARTSTAT=ACCEPTED
- :Mailto:alice@cal.softwarestudio.org
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD
- :REPLY
-VERSION
- :2.0
-PRODID
- :-//SoftwareStudio//NONSGML libical 0.21 //EN
-BEGIN:VEVENT
-DTSTAMP
- :20001121T170735Z
-UID
- :calsrv.example.com-873970198738704@example.com
-ORGANIZER
- :Mailto:bob@cal.softwarestudio.org
-SUMMARY
- :Overlap  2
-SEQUENCE
- :0
-COMMENT
- :I can make it to this meeting
-ATTENDEE
- ;ROLE=CHAIR
- ;CUTYPE=INDIVIDUAL
- ;CN=Alice
- ;PARTSTAT=ACCEPTED
- :Mailto:alice@cal.softwarestudio.org
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD
- :REPLY
-VERSION
- :2.0
-PRODID
- :-//SoftwareStudio//NONSGML libical 0.21 //EN
-BEGIN:VEVENT
-DTSTAMP
- :20001121T170735Z
-UID
- :calsrv.example.com-873970198738705@example.com
-ORGANIZER
- :Mailto:bob@cal.softwarestudio.org
-SUMMARY
- :Overlap  3
-SEQUENCE
- :0
-COMMENT
- :I can make it to this meeting
-ATTENDEE
- ;ROLE=CHAIR
- ;CUTYPE=INDIVIDUAL
- ;CN=Alice
- ;PARTSTAT=ACCEPTED
- :Mailto:alice@cal.softwarestudio.org
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD
- :REPLY
-VERSION
- :2.0
-PRODID
- :-//SoftwareStudio//NONSGML libical 0.21 //EN
-BEGIN:VEVENT
-DTSTAMP
- :20001121T170953Z
-UID
- :calsrv.example.com-873970198738703@example.com
-ORGANIZER
- :Mailto:bob@cal.softwarestudio.org
-SUMMARY
- : Overlap  1
-SEQUENCE
- :0
-COMMENT
- :I can make it to this meeting
-ATTENDEE
- ;ROLE=CHAIR
- ;CUTYPE=INDIVIDUAL
- ;CN=Alice
- ;PARTSTAT=ACCEPTED
- :Mailto:alice@cal.softwarestudio.org
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD
- :REPLY
-VERSION
- :2.0
-PRODID
- :-//SoftwareStudio//NONSGML libical 0.21 //EN
-BEGIN:VEVENT
-DTSTAMP
- :20001121T170953Z
-UID
- :calsrv.example.com-873970198738704@example.com
-ORGANIZER
- :Mailto:bob@cal.softwarestudio.org
-SUMMARY
- :Overlap  2
-SEQUENCE
- :0
-COMMENT
- :I can make it to this meeting
-ATTENDEE
- ;ROLE=CHAIR
- ;CUTYPE=INDIVIDUAL
- ;CN=Alice
- ;PARTSTAT=ACCEPTED
- :Mailto:alice@cal.softwarestudio.org
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD
- :REPLY
-VERSION
- :2.0
-PRODID
- :-//SoftwareStudio//NONSGML libical 0.21 //EN
-BEGIN:VEVENT
-DTSTAMP
- :20001121T170953Z
-UID
- :calsrv.example.com-873970198738705@example.com
-ORGANIZER
- :Mailto:bob@cal.softwarestudio.org
-SUMMARY
- :Overlap  3
-SEQUENCE
- :0
-COMMENT
- :I can make it to this meeting
-ATTENDEE
- ;ROLE=CHAIR
- ;CUTYPE=INDIVIDUAL
- ;CN=Alice
- ;PARTSTAT=ACCEPTED
- :Mailto:alice@cal.softwarestudio.org
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD
- :REPLY
-VERSION
- :2.0
-PRODID
- :-//SoftwareStudio//NONSGML libical 0.21 //EN
-BEGIN:VEVENT
-DTSTAMP
- :20001121T171147Z
-UID
- :calsrv.example.com-873970198738703@example.com
-ORGANIZER
- :Mailto:bob@cal.softwarestudio.org
-SUMMARY
- : Overlap  1
-SEQUENCE
- :0
-COMMENT
- :Unfortunately\, I have another commitment that conflicts with this 
- meeting. I am delegating my attendance to Bob. 
-ATTENDEE
- ;ROLE=CHAIR
- ;CUTYPE=INDIVIDUAL
- ;CN=Alice
- ;PARTSTAT=DELEGATED
- ;DELEGATED-TO=bob@cal.softwarestudio.org
- :Mailto:alice@cal.softwarestudio.org
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-X-LIC-NOTE
- : Overlap with Slot 2\, 1300 to 1400\, should be counterproposed
-METHOD
- :REQUEST
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :Mailto:bob@cal.softwarestudio.org
-ATTENDEE
- ;ROLE=CHAIR
- ;CUTYPE=INDIVIDUAL
- ;CN=Alice
- :Mailto:alice@cal.softwarestudio.org
-ATTENDEE
- ;RSVP=TRUE
- ;CUTYPE=INDIVIDUAL
- ;CN=B
- :Mailto:B@example.com
-DTSTAMP
- :19970611T040000Z
-DTSTART
- :19970701T070000
-DTEND
- :19970701T080000
-SUMMARY
- :Overlap  2
-UID
- :calsrv.example.com-873970198738704@example.com
-SEQUENCE
- :0
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD
- :REPLY
-VERSION
- :2.0
-PRODID
- :-//SoftwareStudio//NONSGML libical 0.21 //EN
-BEGIN:VEVENT
-DTSTAMP
- :20001121T171147Z
-UID
- :calsrv.example.com-873970198738705@example.com
-ORGANIZER
- :Mailto:bob@cal.softwarestudio.org
-SUMMARY
- :Overlap  3
-SEQUENCE
- :0
-COMMENT
- :I can't make it to this meeting
-ATTENDEE
- ;ROLE=CHAIR
- ;CUTYPE=INDIVIDUAL
- ;CN=Alice
- ;PARTSTAT=DECLINED
- :Mailto:alice@cal.softwarestudio.org
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD
- :REPLY
-VERSION
- :2.0
-PRODID
- :-//SoftwareStudio//NONSGML libical 0.21 //EN
-BEGIN:VEVENT
-DTSTAMP
- :20001121T171154Z
-UID
- :calsrv.example.com-873970198738703@example.com
-ORGANIZER
- :Mailto:bob@cal.softwarestudio.org
-SUMMARY
- : Overlap  1
-SEQUENCE
- :0
-COMMENT
- :Unfortunately\, I have another commitment that conflicts with this 
- meeting. I am delegating my attendance to Bob. 
-ATTENDEE
- ;ROLE=CHAIR
- ;CUTYPE=INDIVIDUAL
- ;CN=Alice
- ;PARTSTAT=DELEGATED
- ;DELEGATED-TO=bob@cal.softwarestudio.org
- :Mailto:alice@cal.softwarestudio.org
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-X-LIC-NOTE
- : Overlap with Slot 2\, 1300 to 1400\, should be counterproposed
-METHOD
- :REQUEST
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :Mailto:bob@cal.softwarestudio.org
-ATTENDEE
- ;ROLE=CHAIR
- ;CUTYPE=INDIVIDUAL
- ;CN=Alice
- :Mailto:alice@cal.softwarestudio.org
-ATTENDEE
- ;RSVP=TRUE
- ;CUTYPE=INDIVIDUAL
- ;CN=B
- :Mailto:B@example.com
-DTSTAMP
- :19970611T040000Z
-DTSTART
- :19970701T070000
-DTEND
- :19970701T080000
-SUMMARY
- :Overlap  2
-UID
- :calsrv.example.com-873970198738704@example.com
-SEQUENCE
- :0
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD
- :REPLY
-VERSION
- :2.0
-PRODID
- :-//SoftwareStudio//NONSGML libical 0.21 //EN
-BEGIN:VEVENT
-DTSTAMP
- :20001121T171154Z
-UID
- :calsrv.example.com-873970198738705@example.com
-ORGANIZER
- :Mailto:bob@cal.softwarestudio.org
-SUMMARY
- :Overlap  3
-SEQUENCE
- :0
-COMMENT
- :I can't make it to this meeting
-ATTENDEE
- ;ROLE=CHAIR
- ;CUTYPE=INDIVIDUAL
- ;CN=Alice
- ;PARTSTAT=DECLINED
- :Mailto:alice@cal.softwarestudio.org
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD
- :REPLY
-VERSION
- :2.0
-PRODID
- :-//SoftwareStudio//NONSGML libical 0.21 //EN
-BEGIN:VEVENT
-DTSTAMP
- :20001121T144324Z
-UID
- :calsrv.example.com-873970198738703@example.com
-ORGANIZER
- :Mailto:bob@cal.softwarestudio.org
-SUMMARY
- : Overlap  1
-SEQUENCE
- :0
-COMMENT
- :Unfortunately\, I have another commitment that conflicts with this 
- meeting. I am delegating my attendance to Bob. 
-ATTENDEE
- ;ROLE=CHAIR
- ;CUTYPE=INDIVIDUAL
- ;CN=Alice
- ;PARTSTAT=DELEGATED
- ;DELEGATED-TO=bob@cal.softwarestudio.org
- :Mailto:alice@cal.softwarestudio.org
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-X-LIC-NOTE
- : Overlap with Slot 2\, 1300 to 1400\, should be counterproposed
-METHOD
- :REQUEST
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :Mailto:bob@cal.softwarestudio.org
-ATTENDEE
- ;ROLE=CHAIR
- ;CUTYPE=INDIVIDUAL
- ;CN=Alice
- :Mailto:alice@cal.softwarestudio.org
-ATTENDEE
- ;RSVP=TRUE
- ;CUTYPE=INDIVIDUAL
- ;CN=B
- :Mailto:B@example.com
-DTSTAMP
- :19970611T040000Z
-DTSTART
- :19970701T230000
-DTEND
- :19970702T000000
-SUMMARY
- :Overlap  2
-UID
- :calsrv.example.com-873970198738704@example.com
-SEQUENCE
- :0
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD
- :REPLY
-VERSION
- :2.0
-PRODID
- :-//SoftwareStudio//NONSGML libical 0.21 //EN
-BEGIN:VEVENT
-DTSTAMP
- :20001121T144324Z
-UID
- :calsrv.example.com-873970198738705@example.com
-ORGANIZER
- :Mailto:bob@cal.softwarestudio.org
-SUMMARY
- :Overlap  3
-SEQUENCE
- :0
-COMMENT
- :I can't make it to this meeting
-ATTENDEE
- ;ROLE=CHAIR
- ;CUTYPE=INDIVIDUAL
- ;CN=Alice
- ;PARTSTAT=DECLINED
- :Mailto:alice@cal.softwarestudio.org
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD
- :REPLY
-VERSION
- :2.0
-PRODID
- :-//SoftwareStudio//NONSGML libical 0.21 //EN
-BEGIN:VEVENT
-DTSTAMP
- :20001121T144412Z
-UID
- :calsrv.example.com-873970198738703@example.com
-ORGANIZER
- :Mailto:bob@cal.softwarestudio.org
-SUMMARY
- : Overlap  1
-SEQUENCE
- :0
-COMMENT
- :Unfortunately\, I have another commitment that conflicts with this 
- meeting. I am delegating my attendance to Bob. 
-ATTENDEE
- ;ROLE=CHAIR
- ;CUTYPE=INDIVIDUAL
- ;CN=Alice
- ;PARTSTAT=DELEGATED
- ;DELEGATED-TO=bob@cal.softwarestudio.org
- :Mailto:alice@cal.softwarestudio.org
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-X-LIC-NOTE
- : Overlap with Slot 2\, 1300 to 1400\, should be counterproposed
-METHOD
- :REQUEST
-VERSION
- :2.0
-BEGIN:VEVENT
-ORGANIZER
- :Mailto:bob@cal.softwarestudio.org
-ATTENDEE
- ;ROLE=CHAIR
- ;CUTYPE=INDIVIDUAL
- ;CN=Alice
- :Mailto:alice@cal.softwarestudio.org
-ATTENDEE
- ;RSVP=TRUE
- ;CUTYPE=INDIVIDUAL
- ;CN=B
- :Mailto:B@example.com
-DTSTAMP
- :19970611T040000Z
-DTSTART
- :19970701T230000
-DTEND
- :19970702T000000
-SUMMARY
- :Overlap  2
-UID
- :calsrv.example.com-873970198738704@example.com
-SEQUENCE
- :0
-STATUS
- :CONFIRMED
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD
- :REPLY
-VERSION
- :2.0
-PRODID
- :-//SoftwareStudio//NONSGML libical 0.21 //EN
-BEGIN:VEVENT
-DTSTAMP
- :20001121T144412Z
-UID
- :calsrv.example.com-873970198738705@example.com
-ORGANIZER
- :Mailto:bob@cal.softwarestudio.org
-SUMMARY
- :Overlap  3
-SEQUENCE
- :0
-COMMENT
- :I can't make it to this meeting
-ATTENDEE
- ;ROLE=CHAIR
- ;CUTYPE=INDIVIDUAL
- ;CN=Alice
- ;PARTSTAT=DECLINED
- :Mailto:alice@cal.softwarestudio.org
-END:VEVENT
-END:VCALENDAR
diff --git a/libical/src/test/process.c b/libical/src/test/process.c
deleted file mode 100644
index 605a83eee7..0000000000
--- a/libical/src/test/process.c
+++ /dev/null
@@ -1,407 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: process.c
-  CREATOR: eric 11 February 2000
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000 Eric Busboom
- http://www.softwarestudio.org
-
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
- ======================================================================*/
-
-#include <stdio.h> /* for printf */
-#include <errno.h>
-#include <string.h> /* For strerror */
-#include <stdlib.h> /* for free */
-
-#include <libical/ical.h>
-#include <libicalss/icalss.h>
-
-void send_message(icalcomponent *reply,const char* this_user)
-{
-    printf("From: %s\n\n%s\n",this_user,icalcomponent_as_ical_string(reply));
-    
-
-}
-
-
-int main(int argc, char* argv[])
-{
-    icalcomponent *c, *next_c;
-    int i=0;
-    const char *class_string;
-    int dont_remove;
-    
-    icalset* f = icalset_new_file("../../test-data/process-incoming.ics");
-    icalset* trash = icalset_new_file("trash.ics");
-    icalset* cal = icalset_new_file("../../test-data/process-calendar.ics");
-    icalset* out = icalset_new_file("outgoing.ics");
-
-    const char* this_user = "alice@cal.softwarestudio.org";
-
-    assert(f!= 0);
-    assert(cal!=0);
-    assert(trash!=0);
-    assert(out!=0);
-
-
-    /* Foreach incoming message */
-    for(c=icalset_get_first_component(f);c!=0;c = next_c){
-	
-	icalproperty_xlicclass class;
-	icalcomponent *match;
-	icalcomponent *inner; 
-	icalcomponent *reply = 0;
-
-	assert(c!=0);
-
-	inner = icalcomponent_get_first_real_component(c);
-
-	i++;
-	reply = 0;
-	dont_remove = 0;
-
-	if(inner == 0){
-	    printf("Bad component, no inner\n %s\n",
-		   icalcomponent_as_ical_string(c));
-	    continue;
-	}
-
-	/* Find a booked component that is matched to the incoming
-	   message, based on the incoming component's UID, SEQUENCE
-	   and RECURRENCE-ID*/
-
-	match = icalset_fetch_match(cal,c);
-
-	class = icalclassify(c,match,this_user);
-
-	class_string = icalproperty_enum_to_string(class);
-
-	/* Print out the notes associated with the incoming component
-           and the matched component in the */
-	{
-	    const char *c_note=0;
-	    const char *m_note=0;
-	    icalproperty *p;
-
-	    for(p = icalcomponent_get_first_property(c,ICAL_X_PROPERTY);
-		p!= 0;
-		p = icalcomponent_get_next_property(c,ICAL_X_PROPERTY)){
-
-		if(strcmp(icalproperty_get_x_name(p),"X-LIC-NOTE")==0){
-		    c_note = icalproperty_get_x(p);
-		}
-	    }
-	   
-	    if (match != 0){
-		for(p = icalcomponent_get_first_property(match,
-							 ICAL_X_PROPERTY);
-		    p!= 0;
-		    p = icalcomponent_get_next_property(match,
-							ICAL_X_PROPERTY)){
-		    if(strcmp(icalproperty_get_x_name(p),"X-LIC-NOTE")==0){
-			m_note = icalproperty_get_x(p);
-		    }
-		}
-	    }
-		
-	    if(c_note != 0){
-		printf("Incoming: %s\n",c_note);
-	    }
-	    if(m_note != 0){
-		printf("Match   : %s\n",m_note);
-	    }		
-	}
-
-	/* Main processing structure */
-
-	switch (class){
-	    case ICAL_XLICCLASS_NONE: { 
-		char temp[1024];
-		/* Huh? Return an error to sender */
-		icalrestriction_check(c);
-		icalcomponent_convert_errors(c);
-
-		snprintf(temp,1024,"I can't understand the component you sent. \n Here is the component you sent, possibly with error messages:\n %s",icalcomponent_as_ical_string(c));
-
-		reply = icalmessage_new_error_reply(
-		    c,
-		    this_user,
-		    temp,
-		    "",
-		    ICAL_UNKNOWN_STATUS
-		    );
-		    
-			   
-
-		break; 
-	    }
-	    case ICAL_XLICCLASS_PUBLISHNEW: { 
-		
-		/* Don't accept published events from anyone but
-		   self. If self, fall through to ICAL_XLICCLASS_REQUESTNEW */
-
-		
-
-	    }
-	    case ICAL_XLICCLASS_REQUESTNEW: { 
-		
-		/* Book the new component if it does not overlap
-		   anything. If the time is busy and the start time is
-		   an even modulo 4, delegate to
-		   bob@cal.softwarestudio.org. If the time is busy and
-		   is 1 modulo 4, counterpropose for the first
-		   available free time. Otherwise, deline the meeting */
-
-		icalcomponent *overlaps;
-		overlaps = icalclassify_find_overlaps(cal,c);
-
-		if(overlaps == 0){
-		    /* No overlaps, book the meeting */
-/*		    icalset_add_component(cal,icalcomponent_new_clone(c));*/
-
-		    /* Return a reply */
-		    reply = icalmessage_new_accept_reply(c,this_user,
-				  	 "I can make it to this meeting");
-
-		    icalset_add_component(out,reply);
-		  
-		} else {
-		    /* There was a conflict, so delegate, counterpropose
-		       or decline it */
-		    struct icaltimetype dtstart 
-			= icalcomponent_get_dtstart(c);
-		  
-		    if(dtstart.hour%4 == 0){  
-			/* Delegate the meeting */
-			reply = icalmessage_new_delegate_reply(c, 
-			  this_user,
-            		  "bob@cal.softwarestudio.org",
-			  "Unfortunately, I have another commitment that \
-conflicts with this meeting. I am delegating my attendance to Bob. ");
-
-			icalset_add_component(out,reply);
-		      
-		    } else if (dtstart.hour%4 == 1) {
-			/* Counter propose to next available time */
-			icalcomponent *newc;
-			struct icalperiodtype next_time;
-
-			icalspanlist *spanl = 
-			    icalspanlist_new(cal,dtstart,
-					     icaltime_null_time());
-
-			next_time = icalspanlist_next_free_time(
-			   spanl,icalcomponent_get_dtstart(c));
-
-			newc = icalcomponent_new_clone(c);
-			
-			icalcomponent_set_dtstart(newc,next_time.start);
-			
-
-			/* Hack, the duration of the counterproposed
-                           meeting may be longer than the free time
-                           available */
-			icalcomponent_set_duration(newc,
-			     icalcomponent_get_duration(c));
-			
-			reply = icalmessage_new_counterpropose_reply(c, 
-								     newc,
-								     this_user,
-			   "Unfortunately, I have another commitment that \
-conflicts with this meeting. I am proposing a time that works better for me.");
-		      
-			icalset_add_component(out,reply);
-
-		    } else {
-			/* Decline the meeting */
-		      
-			reply = icalmessage_new_decline_reply(c,
-							      this_user,
-					  "I can't make it to this meeting");
-
-			icalset_add_component(out,reply);
-
-		    }
-
-		  
-		}
-		break; 
-	    }
-	    case ICAL_XLICCLASS_PUBLISHFREEBUSY: {
-		/* Store the busy time information in a file named after
-		   the sender */
-		break;
-	    }
-	    
-	    case ICAL_XLICCLASS_PUBLISHUPDATE: { 
-		/* Only accept publish updates from self. If self, fall
-		   throught to ICAL_XLICCLASS_REQUESTUPDATE */
-	    }
-
-	    case ICAL_XLICCLASS_REQUESTUPDATE: { 
-		/* always accept the changes */
-		break; 
-	    }
-	  
-	    case ICAL_XLICCLASS_REQUESTRESCHEDULE: { 
-		/* Use same rules as REQUEST_NEW */
-		icalcomponent *overlaps;
-		overlaps = icalclassify_find_overlaps(cal,c);
-
-		break; 
-	    }
-	    case ICAL_XLICCLASS_REQUESTDELEGATE: { 
-	      
-		break; 
-	    }
-	    case ICAL_XLICCLASS_REQUESTNEWORGANIZER: { 
-		break; 
-	    }
-	    case ICAL_XLICCLASS_REQUESTFORWARD: { 
-		break; 
-	    }
-	    case ICAL_XLICCLASS_REQUESTSTATUS: { 
-		break; 
-	    }
-
-	    case ICAL_XLICCLASS_REQUESTFREEBUSY: { 
-		break; 
-	    }
-	    case ICAL_XLICCLASS_REPLYACCEPT: { 
-		/* Change the PARTSTAT of the sender */
-		break; 
-	    }
-	    case ICAL_XLICCLASS_REPLYDECLINE: { 
-		/* Change the PARTSTAT of the sender */
-		break; 
-	    }
-	    case ICAL_XLICCLASS_REPLYCRASHERACCEPT: { 
-		/* Add the crasher to the ATTENDEE list with the
-		   appropriate PARTSTAT */
-		break; 
-	    }
-	    case ICAL_XLICCLASS_REPLYCRASHERDECLINE: { 
-		/* Add the crasher to the ATTENDEE list with the
-		   appropriate PARTSTAT */
-		break; 
-	    }
-	    case ICAL_XLICCLASS_ADDINSTANCE: { 
-		break; 
-	    }
-	    case ICAL_XLICCLASS_CANCELEVENT: { 
-		/* Remove the component */
-		break; 
-	    }
-	    case ICAL_XLICCLASS_CANCELINSTANCE: { 
-		break; 
-	    }
-	    case ICAL_XLICCLASS_CANCELALL: { 
-		/* Remove the component */	      
-		break; 
-	    }
-	    case ICAL_XLICCLASS_REFRESH: { 
-		/* Resend the latest copy of the request */
-		break; 
-	    }
-	    case ICAL_XLICCLASS_COUNTER: { 
-		break; 
-	    }
-	    case ICAL_XLICCLASS_DECLINECOUNTER: { 
-		break; 
-	    }
-	    case ICAL_XLICCLASS_MALFORMED: { 
-		/* Send back an error */
-		break; 
-	    } 
-	    case ICAL_XLICCLASS_OBSOLETE: { 
-		printf(" ** Got an obsolete component:\n%s",
-		       icalcomponent_as_ical_string(c));
-		/* Send back an error */
-		break; 
-	    } 
-	    case ICAL_XLICCLASS_MISSEQUENCED: { 
-		printf(" ** Got a missequenced component:\n%s",
-		       icalcomponent_as_ical_string(c));
-		/* Send back an error */
-		break; 
-	    }
-	    case ICAL_XLICCLASS_UNKNOWN: { 
-		printf(" ** Don't know what to do with this component:\n%s",
-		       icalcomponent_as_ical_string(c));
-		/* Send back an error */
-		break; 
-	    }
-            case ICAL_XLICCLASS_X:
-            case ICAL_XLICCLASS_REPLYDELEGATE:
-            default: {
-            }
-	}
-
-#if(0)
-	if (reply != 0){	
-	    
-	    /* Don't send the reply if the RSVP parameter indicates not to*/
-	    icalcomponent *reply_inner;
-	    icalproperty *attendee;
-	    icalparameter *rsvp;
-	    
-	    reply_inner = icalcomponent_get_first_real_component(reply);
-	    attendee = icalcomponent_get_first_property(reply_inner,
-							ICAL_ATTENDEE_PROPERTY);
-	    rsvp = icalproperty_get_first_parameter(attendee,
-						    ICAL_RSVP_PARAMETER);
-	    
-	    if(rsvp == 0 || icalparameter_get_rsvp(rsvp) == 1){
-		icalrestriction_check(reply);
-		send_message(reply,this_user);
-	    }
-	    
-	    icalcomponent_free(reply);
-	}
-#endif 
-
-	if(reply !=0){
-	    printf("%s\n",icalcomponent_as_ical_string(reply));
-	}
-	
-	next_c =   icalset_get_next_component(f);
-	
-	if(dont_remove == 0){
-	    /*icalset_remove_component(f,c);
-	      icalset_add_component(trash,c);*/
-	}
-    }
-
-#if (0)
-        
-    for(c = icalset_get_first_component(out);
-	c!=0;
-	c = icalset_get_next_component(out)){
-	
-	printf("%s",icalcomponent_as_ical_string(c));
-
-    }
-#endif
-
-    icalset_free(f);
-    icalset_free(trash);
-    icalset_free(cal);
-    icalset_free(out);
-
-    return 0;
-}
-
-
diff --git a/libical/src/test/recur.c b/libical/src/test/recur.c
deleted file mode 100644
index 0b490c0513..0000000000
--- a/libical/src/test/recur.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: recur.c
-  CREATOR: ebusboom 8jun00
-  
-  DESCRIPTION:
-
-  Test program for expanding recurrences. Run as:
-
-     ./recur ../../test-data/recur.txt
-
-  
-  (C) COPYRIGHT 1999 Eric Busboom 
-  http://www.softwarestudio.org
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
- 
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and
-  limitations under the License.
-
-  ======================================================================*/
-
-#include <assert.h>
-#include <string.h> /* for strdup */
-#include <stdlib.h> /* for malloc */
-#include <stdio.h> /* for printf */
-#include <time.h> /* for time() */
-#include <signal.h> /* for signal */
-#ifndef WIN32
-#include <unistd.h> /* for alarm */
-#endif
-
-#include <libical/ical.h>
-#include <libicalss/icalss.h>
-
-#ifdef WIN32
-#define snprintf	_snprintf
-#define strcasecmp	stricmp
-#endif
-
-static void sig_alrm(int i){
-    fprintf(stderr,"Could not get lock on file\n");
-    exit(1);
-}
-
-static void recur_callback(icalcomponent *comp,
-			   struct icaltime_span *span,
-			   void *data)
-{
-  printf("cb: %s", ctime(&span->start));
-  printf("    %s\n", ctime(&span->end));
-
-}
-
-int main(int argc, char *argv[])
-{
-    icalset *cin;
-    struct icaltimetype next;
-    icalcomponent *itr;
-    icalproperty *desc, *dtstart, *rrule;
-    struct icalrecurrencetype recur;
-    icalrecur_iterator* ritr;
-    time_t tt;
-    char* file; 
-	
-    icalerror_set_error_state(ICAL_PARSE_ERROR, ICAL_ERROR_NONFATAL);
-	
-#ifndef WIN32
-    signal(SIGALRM,sig_alrm);
-#endif
-	
-    if (argc <= 1){
-		file = "../../test-data/recur.txt";
-    } else if (argc == 2){
-		file = argv[1];
-    } else {
-		fprintf(stderr,"usage: recur [input file]\n");
-		exit(1);
-    }
-	
-#ifndef WIN32
-    alarm(300); /* to get file lock */
-#endif
-    cin = icalfileset_new(file);
-#ifndef WIN32
-    alarm(0);
-#endif
-	
-    if(cin == 0){
-		fprintf(stderr,"recur: can't open file %s\n",file);
-		exit(1);
-    }
-	
-	
-    for (itr = icalfileset_get_first_component(cin);
-	itr != 0;
-	itr = icalfileset_get_next_component(cin)){
-		
-      struct icaltimetype start = icaltime_from_timet(1,0);
-      struct icaltimetype end = icaltime_today();
-
-
-
-		desc = icalcomponent_get_first_property(itr,ICAL_DESCRIPTION_PROPERTY);
-		dtstart = icalcomponent_get_first_property(itr,ICAL_DTSTART_PROPERTY);
-		rrule = icalcomponent_get_first_property(itr,ICAL_RRULE_PROPERTY);
-		
-		if (desc == 0 || dtstart == 0 || rrule == 0){
-			printf("\n******** Error in input component ********\n");
-			printf("The following component is malformed:\n %s\n",
-				icalcomponent_as_ical_string(itr));
-			continue;
-		}
-		
-		printf("\n\n#### %s\n",icalproperty_get_description(desc));
-		printf("#### %s\n",icalvalue_as_ical_string(icalproperty_get_value(rrule)));
-		recur = icalproperty_get_rrule(rrule);
-		start = icalproperty_get_dtstart(dtstart);
-		
-		ritr = icalrecur_iterator_new(recur,start);
-		
-		tt = icaltime_as_timet(start);
-		
-		printf("#### %s\n",ctime(&tt ));
-
-		icalrecur_iterator_free(ritr);
-		
-		for(ritr = icalrecur_iterator_new(recur,start),
-			next = icalrecur_iterator_next(ritr); 
-		!icaltime_is_null_time(next);
-		next = icalrecur_iterator_next(ritr)){
-			
-			tt = icaltime_as_timet(next);
-			
-			printf("  %s",ctime(&tt ));		
-			
-		}
-		icalrecur_iterator_free(ritr);
-
-      icalcomponent_foreach_recurrence(itr, start, end, 
-				       recur_callback, NULL);
-      
-
-		
-    }
-
-	icalset_free(cin);
-
-	icaltimezone_free_builtin_timezones();
-	
-	icalmemory_free_ring();
-	
-	free_zone_directory();
-	
-    return 0;
-}
diff --git a/libical/src/test/regression-classify.c b/libical/src/test/regression-classify.c
deleted file mode 100644
index 7af64499f3..0000000000
--- a/libical/src/test/regression-classify.c
+++ /dev/null
@@ -1,187 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: regression-classify.c
-  CREATOR: eric 11 February 2000
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000 Eric Busboom
- http://www.softwarestudio.org
-
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
- ======================================================================*/
-#include <stdio.h> /* for printf */
-#include <errno.h>
-#include <string.h> /* For strerror */
-
-#include <libical/ical.h>
-#include <libicalss/icalss.h>
-#include "regression.h"
-
-extern int VERBOSE;
-
-/* Get a note about the purpose of the property*/
-static const char* get_note(icalcomponent *c)
-{
-    icalproperty *p;
-    const char* note = 0;
-
-    if(c != 0){
-        for(p = icalcomponent_get_first_property(c,ICAL_X_PROPERTY);
-            p!= 0;
-            p = icalcomponent_get_next_property(c,ICAL_X_PROPERTY)){
-            if(strcmp(icalproperty_get_x_name(p),"X-LIC-NOTE")==0){
-            note = icalproperty_get_x(p);
-            }
-        }
-    } 
-    
-    if(note == 0){
-        note = "None";
-    }
-    
-    return note;
-}
-
-/* Get the expected result about the purpose of the property*/
-
-static const char* get_expect(icalcomponent *c)
-{
-    icalproperty *p;
-    const char* note = 0;
-
-    if(c != 0){
-        for(p = icalcomponent_get_first_property(c,ICAL_X_PROPERTY);
-            p!= 0;
-            p = icalcomponent_get_next_property(c,ICAL_X_PROPERTY)){
-            if(strcmp(icalproperty_get_x_name(p),"X-LIC-EXPECT")==0){
-            note = icalproperty_get_x(p);
-            }
-        }
-    } 
-    
-    if(note == 0){
-        note = "None";
-    }
-    
-    return note;
-}
-
-void test_classify(void)
-{
-    icalcomponent *c,*match; 
-    int i=0;
-    int error_count = 0;
-    /* Open up the two storage files, one for the incomming components, 
-       one for the calendar */
-    icalset* incoming = icalset_new_file("../../test-data/incoming.ics");
-    icalset* cal = icalset_new_file("../../test-data/calendar.ics");
-    icalset* f = icalset_new_file("../../test-data/classify.ics");
-
-    ok("opening file classify.ics", (f!=0));
-    ok("opening file calendar.ics", (cal!=0));
-    ok("opening file incoming.ics", (incoming!=0));
-
-    /* some basic tests.. */
-    if (f) {
-      c = icalset_get_first_component(f);
-      match = icalset_get_next_component(f);
-    
-      ok("test two vcalendars for SEQUENCE with icalclassify()",
-	 (icalclassify(c,match,"A@example.com") == ICAL_XLICCLASS_REQUESTRESCHEDULE));
-      
-      icalset_free(f);
-    }
-
-    assert(incoming!= 0);
-    assert(cal!=0);
-
-    /* Iterate through all of the incoming components */
-    for(c=icalset_get_first_component(incoming);c!=0;
-	c=icalset_get_next_component(incoming)){
-	
-	icalproperty_xlicclass class;
-	icalcomponent *match = 0;
-        const char* this_uid;
-	const char* this_note = get_note(c);
-	const char* expected_result = get_expect(c);
-	const char* actual_result;
-	const char* match_note;
-	char msg[128];
-
-	i++;
-
-        /* Check this component against the restrictions imposed by
-           iTIP. An errors will be inserted as X-LIC-ERROR properties
-           in the component. The Parser will also insert errors if it
-           cannot parse the component */
-        icalcomponent_check_restrictions(c);
-
-        /* If there are any errors, print out the component */
-	
-	error_count = icalcomponent_count_errors(c);
-	sprintf(msg, "%s - parsing", this_note);
-	int_is(msg, error_count, 0);
-
-	if (error_count !=0) {
-	  if (VERBOSE) printf("----- Component has errors ------- \n%s-----------------\n",
-			      icalcomponent_as_ical_string(c));
-        }
-
-        /* Use one of the icalcomponent convenience routines to get
-           the UID. This routine will save you from having to use
-           icalcomponent_get_inner(),
-           icalcomponent_get_first_property(), checking the return
-           value, and then calling icalproperty_get_uid. There are
-           several other convenience routines for DTSTART, DTEND,
-           DURATION, SUMMARY, METHOD, and COMMENT */
-	this_uid = icalcomponent_get_uid(c);
-
-        if(this_uid != 0){
-            /* Look in the calendar for a component with the same UID
-               as the incomming component. We should reall also be
-               checking the RECURRENCE-ID. Another way to do this
-               operation is to us icalset_find_match(), which does use
-               the RECURRENCE-ID. */
-            match = icalset_fetch(cal,this_uid);
-        }
-
-	
-        /* Classify the incoming component. The third argument is the
-           calid of the user who owns the calendar. In a real program,
-           you would probably switch() on the class.*/
-	class = icalclassify(c,match,"A@example.com");
-	/** eventually test this too.. **/
-        match_note = get_note(match);
-	actual_result = icalproperty_enum_to_string(class);
-	sprintf(msg, "expecting %s", expected_result);
-	is(msg, expected_result, actual_result);
-
-	if (VERBOSE) printf("Test %d\n\
-Incoming:      %s\n\
-Matched:       %s\n\
-Classification: %s\n\n",
-               i,this_note,get_note(match),
-               icalproperty_enum_to_string(class));	
-    }
-
-	icalset_free(incoming);
-	icalset_free(cal);
-
-}
-
-
diff --git a/libical/src/test/regression-component.c b/libical/src/test/regression-component.c
deleted file mode 100644
index 5494bdd779..0000000000
--- a/libical/src/test/regression-component.c
+++ /dev/null
@@ -1,580 +0,0 @@
-#include <libical/ical.h>
-#include "regression.h"
-
-#include <string.h>
-extern int VERBOSE;
-
-void create_simple_component(void)
-{
-
-    icalcomponent* calendar;
-    icalproperty *version, *bogus;
-      
-    /* Create calendar and add properties */
-    calendar = icalcomponent_new(ICAL_VCALENDAR_COMPONENT);
-
-    ok("create vcalendar component", (calendar!=NULL));
-
-    icalcomponent_add_property(
-	calendar,
-	icalproperty_new_version("2.0")
-	);
-    
-    version = icalcomponent_get_first_property(calendar,ICAL_VERSION_PROPERTY);
-    ok("version property added", (version!=NULL));
-
-    bogus = icalcomponent_get_first_property(calendar,ICAL_DTSTART_PROPERTY);
-    ok("bogus dtstart not found", (bogus == NULL));
-
-    if (VERBOSE && calendar)
-      printf("%s\n",icalcomponent_as_ical_string(calendar));
-
-    icalcomponent_free(calendar);
-}
-
-
-static char* create_new_component_str = 
-"BEGIN:VCALENDAR\n"
-"VERSION:2.0\n"
-"PRODID:-//RDU Software//NONSGML HandCal//EN\n"
-"BEGIN:VTIMEZONE\n"
-"TZID:America/New_York\n"
-"BEGIN:DAYLIGHT\n"
-"DTSTART:20020606T212449\n"
-"RDATE;VALUE=PERIOD:20020606T212449/20020607T012809\n"
-"TZOFFSETFROM:-0500\n"
-"TZOFFSETTO:-0400\n"
-"TZNAME:EST\n"
-"END:DAYLIGHT\n"
-"BEGIN:STANDARD\n"
-"DTSTART:20020606T212449\n"
-"RDATE;VALUE=PERIOD:20020606T212449/20020607T012809\n"
-"TZOFFSETFROM:-0400\n"
-"TZOFFSETTO:-0500\n"
-"TZNAME:EST\n"
-"END:STANDARD\n"
-"END:VTIMEZONE\n"
-"BEGIN:VEVENT\n"
-"DTSTAMP:20020606T212449\n"
-"UID:guid-1.host1.com\n"
-"ORGANIZER;ROLE=CHAIR:mrbig@host.com\n"
-"ATTENDEE;ROLE=REQ-PARTICIPANT;RSVP=TRUE;CUTYPE=GROUP:employee-A@host.com\n"
-"DESCRIPTION:Project XYZ Review Meeting\n"
-"CATEGORIES:MEETING\n"
-"CLASS:PRIVATE\n"
-"CREATED:20020606T212449\n"
-"SUMMARY:XYZ Project Review\n"
-"DTSTART;TZID=America/New_York:20020606T212449\n"
-"DTEND;TZID=America/New_York:20020606T212449\n"
-"LOCATION:1CP Conference Room 4350\n"
-"END:VEVENT\n"
-"END:VCALENDAR\n";
-
-
-/* Create a new component */
-void create_new_component()
-{
-    icalcomponent* calendar;
-    icalcomponent* timezone;
-    icalcomponent* tzc;
-    icalcomponent* event;
-    struct icaltimetype atime = icaltime_from_timet( 1023398689, 0);
-    struct icaldatetimeperiodtype rtime;
-    icalproperty* property;
-    char *calendar_as_string;
-
-    rtime.period.start = icaltime_from_timet( 1023398689,0);
-    rtime.period.end = icaltime_from_timet( 1023409689,0);
-    rtime.period.end.hour++;
-    rtime.time = icaltime_null_time();
-
-    /* Create calendar and add properties */
-    calendar = icalcomponent_new(ICAL_VCALENDAR_COMPONENT);
-
-    
-    icalcomponent_add_property(
-	calendar,
-	icalproperty_new_version("2.0")
-	);
-    
-    icalcomponent_add_property(
-	calendar,
-	icalproperty_new_prodid("-//RDU Software//NONSGML HandCal//EN")
-	);
-    
-    /* Create a timezone object and add it to the calendar */
-
-    timezone = icalcomponent_new(ICAL_VTIMEZONE_COMPONENT);
-
-    icalcomponent_add_property(
-	timezone,
-	icalproperty_new_tzid("America/New_York")
-	);
-
-    /* Add a sub-component of the timezone */
-    tzc = icalcomponent_new(ICAL_XDAYLIGHT_COMPONENT);
-
-    icalcomponent_add_property(
-	tzc, 
-	icalproperty_new_dtstart(atime)
-	);
-
-    icalcomponent_add_property(
-	tzc, 
-	icalproperty_new_rdate(rtime)
-	);
-	    
-    icalcomponent_add_property(
-	tzc, 
-	icalproperty_new_tzoffsetfrom(-5*3600)
-	);
-
-    icalcomponent_add_property(
-	tzc, 
-	icalproperty_new_tzoffsetto(-4*3600)
-	);
-
-    icalcomponent_add_property(
-	tzc, 
-	icalproperty_new_tzname("EST")
-	);
-
-    icalcomponent_add_component(timezone,tzc);
-
-    icalcomponent_add_component(calendar,timezone);
-
-    /* Add a second subcomponent */
-    tzc = icalcomponent_new(ICAL_XSTANDARD_COMPONENT);
-
-    icalcomponent_add_property(
-	tzc, 
-	icalproperty_new_dtstart(atime)
-	);
-
-    icalcomponent_add_property(
-	tzc, 
-	icalproperty_new_rdate(rtime)
-	);
-	    
-    icalcomponent_add_property(
-	tzc, 
-	icalproperty_new_tzoffsetfrom(-4*3600)
-	);
-
-    icalcomponent_add_property(
-	tzc, 
-	icalproperty_new_tzoffsetto(-5*3600)
-	);
-
-    icalcomponent_add_property(
-	tzc, 
-	icalproperty_new_tzname("EST")
-	);
-
-    icalcomponent_add_component(timezone,tzc);
-
-    /* Add an event */
-
-    event = icalcomponent_new(ICAL_VEVENT_COMPONENT);
-
-    icalcomponent_add_property(
-	event,
-	icalproperty_new_dtstamp(atime)
-	);
-
-    icalcomponent_add_property(
-	event,
-	icalproperty_new_uid("guid-1.host1.com")
-	);
-
-    /* add a property that has parameters */
-    property = icalproperty_new_organizer("mrbig@host.com");
-    
-    icalproperty_add_parameter(
-	property,
-	icalparameter_new_role(ICAL_ROLE_CHAIR)
-	);
-
-    icalcomponent_add_property(event,property);
-
-    /* add another property that has parameters */
-    property = icalproperty_new_attendee("employee-A@host.com");
-    
-    icalproperty_add_parameter(
-	property,
-	icalparameter_new_role(ICAL_ROLE_REQPARTICIPANT)
-	);
-
-    icalproperty_add_parameter(
-	property,
-	icalparameter_new_rsvp(ICAL_RSVP_TRUE)
-	);
-
-    icalproperty_add_parameter(
-	property,
-	icalparameter_new_cutype(ICAL_CUTYPE_GROUP)
-	);
-
-    icalcomponent_add_property(event,property);
-
-
-    /* more properties */
-
-    icalcomponent_add_property(
-	event,
-	icalproperty_new_description("Project XYZ Review Meeting")
-	);
-
-    icalcomponent_add_property(
-	event,
-	icalproperty_new_categories("MEETING")
-	);
-
-    icalcomponent_add_property(
-	event,
-	icalproperty_new_class(ICAL_CLASS_PRIVATE)
-	);
-    
-    icalcomponent_add_property(
-	event,
-	icalproperty_new_created(atime)
-	);
-
-    icalcomponent_add_property(
-	event,
-	icalproperty_new_summary("XYZ Project Review")
-	);
-
-
-    property = icalproperty_new_dtstart(atime);
-    
-    icalproperty_add_parameter(
-	property,
-	icalparameter_new_tzid("America/New_York")
-	);
-
-    icalcomponent_add_property(event,property);
-
-
-    property = icalproperty_new_dtend(atime);
-    
-    icalproperty_add_parameter(
-	property,
-	icalparameter_new_tzid("America/New_York")
-	);
-
-    icalcomponent_add_property(event,property);
-
-    icalcomponent_add_property(
-	event,
-	icalproperty_new_location("1CP Conference Room 4350")
-	);
-
-    icalcomponent_add_component(calendar,event);
-    
-    calendar_as_string = icalcomponent_as_ical_string(calendar);
-
-    is("build large, complex component", 
-       calendar_as_string,
-       create_new_component_str);
-
-    if (VERBOSE && calendar)
-      printf("%s\n",icalcomponent_as_ical_string(calendar));
-
-
-    if (calendar)
-      icalcomponent_free(calendar);
-
-}
-
-/* Create a new component, using the va_args list */
-
-void create_new_component_with_va_args()
-{
-
-    icalcomponent* calendar;
-    struct icaltimetype atime = icaltime_from_timet( time(0),0);
-    struct icaldatetimeperiodtype rtime;
-    
-    rtime.period.start = icaltime_from_timet( time(0),0);
-    rtime.period.end = icaltime_from_timet( time(0),0);
-    rtime.period.end.hour++;
-    rtime.time = icaltime_null_time();
-
-    calendar = 
-	icalcomponent_vanew(
-	    ICAL_VCALENDAR_COMPONENT,
-	    icalproperty_new_version("2.0"),
-	    icalproperty_new_prodid("-//RDU Software//NONSGML HandCal//EN"),
-	    icalcomponent_vanew(
-		ICAL_VTIMEZONE_COMPONENT,
-		icalproperty_new_tzid("America/New_York"),
-		icalcomponent_vanew(
-		    ICAL_XDAYLIGHT_COMPONENT,
-		    icalproperty_new_dtstart(atime),
-		    icalproperty_new_rdate(rtime),
-		    icalproperty_new_tzoffsetfrom(-4.0),
-		    icalproperty_new_tzoffsetto(-5.0),
-		    icalproperty_new_tzname("EST"),
-		    0
-		    ),
-		icalcomponent_vanew(
-		    ICAL_XSTANDARD_COMPONENT,
-		    icalproperty_new_dtstart(atime),
-		    icalproperty_new_rdate(rtime),
-		    icalproperty_new_tzoffsetfrom(-5.0),
-		    icalproperty_new_tzoffsetto(-4.0),
-		    icalproperty_new_tzname("EST"),
-		    0
-		    ),
-		0
-		),
-	    icalcomponent_vanew(
-		ICAL_VEVENT_COMPONENT,
-		icalproperty_new_dtstamp(atime),
-		icalproperty_new_uid("guid-1.host1.com"),
-		icalproperty_vanew_organizer(
-		    "mrbig@host.com",
-		    icalparameter_new_role(ICAL_ROLE_CHAIR),
-		    0
-		    ),
-		icalproperty_vanew_attendee(
-		    "employee-A@host.com",
-		    icalparameter_new_role(ICAL_ROLE_REQPARTICIPANT),
-		    icalparameter_new_rsvp(ICAL_RSVP_TRUE),
-		    icalparameter_new_cutype(ICAL_CUTYPE_GROUP),
-		    0
-		    ),
-		icalproperty_new_description("Project XYZ Review Meeting"),
-		icalproperty_new_categories("MEETING"),
-		icalproperty_new_class(ICAL_CLASS_PUBLIC),
-		icalproperty_new_created(atime),
-		icalproperty_new_summary("XYZ Project Review"),
-		icalproperty_vanew_dtstart(
-		    atime,
-		    icalparameter_new_tzid("America/New_York"),
-		    0
-		    ),
-		icalproperty_vanew_dtend(
-		    atime,
-		    icalparameter_new_tzid("America/New_York"),
-		    0
-		    ),
-		icalproperty_new_location("1CP Conference Room 4350"),
-		0
-		),
-	    0
-	    );
-
-    ok("creating a complex vcalendar", (calendar != NULL));
-    if (VERBOSE && calendar)
-      printf("%s\n",icalcomponent_as_ical_string(calendar));
-
-    icalcomponent_free(calendar);
-
-}
-
-static void print_span(int c, struct icaltime_span span ){
-  printf("span-->%d, %d\n", (int)span.start, (int)span.end);
-    if (span.start == 0)
-	printf("#%02d start: (empty)\n",c);
-    else 
-	printf("#%02d start: %s\n",c,ical_timet_string(span.start));
-
-    if (span.end == 0)
-	printf("    end  : (empty)\n");
-    else 
-	printf("    end  : %s\n",ical_timet_string(span.end));
-
-}
-
-/** Test icalcomponent_get_span()
- *
- */
-void test_icalcomponent_get_span()
-{
-    time_t tm1 = 973378800; /*Sat Nov  4 23:00:00 UTC 2000,
-			      Sat Nov  4 15:00:00 PST 2000 */
-    time_t tm2 = 973382400; /*Sat Nov  5 00:00:00 UTC 2000 
-			      Sat Nov  4 16:00:00 PST 2000 */
-    struct icaldurationtype dur;
-    struct icaltime_span span;
-    icalcomponent *c;
-    icaltimezone *azone, *bzone; 
-    int	tnum = 0;
-
-    /** test 0
-     *	Direct assigning time_t means they will be interpreted as UTC
-     */
-    span.start = tm1;
-    span.end = tm2;
-    if (VERBOSE) print_span(tnum++,span);
-
-    /** test 1
-     *	We specify times in a timezone, the returned span is in UTC
-     */
-    azone = icaltimezone_get_builtin_timezone("America/Los_Angeles");
-    c = icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-		icalproperty_vanew_dtstart(
-		    icaltime_from_timet_with_zone(tm1,0,azone),
-		    icalparameter_new_tzid("America/Los_Angeles"),0),
-		icalproperty_vanew_dtend(
-		    icaltime_from_timet_with_zone(tm2,0,azone),
-		    icalparameter_new_tzid("America/Los_Angeles"),0),
-	    0
-	    );
-
-    span = icalcomponent_get_span(c);
-    if (VERBOSE) print_span(tnum++,span);
-    int_is("America/Los_Angeles", span.start, 973407600);
-    icalcomponent_free(c);
-
-    /** test 2
-     *	We specify times as floating, the returned span is in UTC
-     *	with no conversion applied - so result should be as test 0
-     */
-    c = icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    icalproperty_vanew_dtstart(icaltime_from_timet(tm1,0),0),
-	    icalproperty_vanew_dtend(icaltime_from_timet(tm2,0),0),
-	    0
-	    );
-
-    span = icalcomponent_get_span(c);
-    if (VERBOSE) print_span(tnum++,span);
-    int_is("floating time", span.start, tm1);
-
-    icalcomponent_free(c);
-
-    /** test 3
-     *	We specify times in a timezone, the returned span is in UTC
-     */
-    azone = icaltimezone_get_builtin_timezone("America/New_York");
-    c = icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-		icalproperty_vanew_dtstart(
-		    icaltime_from_timet_with_zone(tm1,0,azone),
-		    icalparameter_new_tzid("America/New_York"),0),
-		icalproperty_vanew_dtend(
-		    icaltime_from_timet_with_zone(tm2,0,azone),
-		    icalparameter_new_tzid("America/New_York"),0),
-	    0
-	    );
-
-    span = icalcomponent_get_span(c);
-    if (VERBOSE) print_span(tnum++,span);
-    int_is("America/New_York", span.start, 973396800);
-
-    icalcomponent_free(c);
-
-    /** test 4
-     *	We specify times in two different timezones, the returned span
-     *	is in UTC
-     */
-    azone = icaltimezone_get_builtin_timezone("America/New_York");
-    bzone = icaltimezone_get_builtin_timezone("America/Los_Angeles");
-    c = icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-		icalproperty_vanew_dtstart(
-		    icaltime_from_timet_with_zone(tm1,0,azone),
-		    icalparameter_new_tzid("America/New_York"),0),
-		icalproperty_vanew_dtend(
-		    icaltime_from_timet_with_zone(tm2,0,bzone),
-		    icalparameter_new_tzid("America/Los_Angeles"),0),
-	    0
-	    );
-
-    span = icalcomponent_get_span(c);
-    if (VERBOSE) print_span(tnum++,span);
-    int_is("America/New_York", span.start, 973396800);
-    
-    icalcomponent_free(c);
-
-    /** test 5
-     *	We specify start time in a timezone and a duration, the returned span
-     *	is in UTC
-     */
-    azone = icaltimezone_get_builtin_timezone("America/Los_Angeles");
-    memset(&dur,0,sizeof(dur));
-    dur.minutes = 30;
-    c = icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-		icalproperty_vanew_dtstart(
-		    icaltime_from_timet_with_zone(tm1,0,azone),
-		    icalparameter_new_tzid("America/Los_Angeles"),0),
-	    icalproperty_new_duration(dur),
-
-	    0
-	    );
-
-    span = icalcomponent_get_span(c);
-    if (VERBOSE) print_span(tnum++,span);
-    int_is("America/Los_Angeles w/ duration", span.end, 973409400);
-
-    icalcomponent_free(c);
-
-    icalerror_errors_are_fatal = 0;
-    /** test 6
-     *	We specify only start time, should return a null span with no error
-     */
-    c = icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-		icalproperty_new_dtstart(icaltime_from_timet(tm1,0)),
-	    0
-	    );
-
-    span = icalcomponent_get_span(c);
-    if (VERBOSE) print_span(tnum++,span);
-    int_is("null span", span.start, 0);
-    icalcomponent_free(c);
-
-    /** test 7
-     *	We specify start and end date
-     */
-    c = icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-		icalproperty_new_dtstart(icaltime_from_timet(tm1,1)),
-		icalproperty_new_dtend(icaltime_from_timet(tm1,1)),
-	    0
-	    );
-
-    span = icalcomponent_get_span(c);
-    if (VERBOSE) print_span(tnum++,span);
-    int_is("UTC", span.start, 973296000);
-    icalcomponent_free(c);
-
-    /** test 8
-     *	We specify start and end date
-     */
-    c = icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-		icalproperty_new_dtstart(icaltime_from_timet(tm1,1)),
-		icalproperty_new_dtend(icaltime_from_timet(tm2,1)),
-	    0
-	    );
-
-    span = icalcomponent_get_span(c);
-    int_is("UTC #2", span.start, 973296000);
-    if (VERBOSE) print_span(tnum++,span);
-
-    icalcomponent_free(c);
-
-    /** test 9
-     *	We specify start date
-     */
-    c = icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-		icalproperty_new_dtstart(icaltime_from_timet(tm1,1)),
-	    0
-	    );
-
-    span = icalcomponent_get_span(c);
-    if (VERBOSE) print_span(tnum++,span);
-    int_is("start date only", span.end, 973382399);
-
-    icalcomponent_free(c);
-
-    /* assert(icalerrno == ICAL_MALFORMEDDATA_ERROR); */
-    icalerror_errors_are_fatal = 1;
-}
diff --git a/libical/src/test/regression-cxx.cpp b/libical/src/test/regression-cxx.cpp
deleted file mode 100644
index e7605b8531..0000000000
--- a/libical/src/test/regression-cxx.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include "icalparameter_cxx.h"
-#include "icalproperty_cxx.h"
-#include "vcomponent.h"
-#include "regression.h"
-
-char content[] = "BEGIN:VCALENDAR\n\
-VERSION:2.1\n\
-BEGIN:VEVENT\n\
-UID:abcd12345\n\
-DTSTART:20020307T180000Z\n\
-DTEND:20020307T190000Z\n\
-SUMMARY:Important Meeting\n\
-END:VEVENT\n\
-END:VCALENDAR";
-
-void test_cxx(void)
-{
-    ICalProperty            *summProp  = new ICalProperty(ICAL_SUMMARY_PROPERTY);
-    ICalProperty            *startProp = new ICalProperty(ICAL_DTSTART_PROPERTY);
-    ICalProperty            *endProp   = new ICalProperty(ICAL_DTEND_PROPERTY);
-    ICalProperty	    *locationProp = new ICalProperty(ICAL_LOCATION_PROPERTY);
-    ICalProperty            *descProp = new ICalProperty(ICAL_DESCRIPTION_PROPERTY);
-
-    ok("Valid SUMMARY     Property", (summProp != 0));
-    ok("Valid DTSTART     Property", (startProp != 0));
-    ok("Valid DTEND       Property", (endProp != 0));
-    ok("Valid LOCATION    Property", (locationProp != 0));
-    ok("Valid DESCRIPTION Property", (descProp != 0));
-
-    struct icaltimetype     starttime  = icaltime_from_string("20011221T180000Z");   // UTC time ends in Z
-    struct icaltimetype     endtime    = icaltime_from_string("20020101T080000Z");   // UTC time ends in Z
-
-    summProp->set_summary("jon said: change dir to c:\\rest\\test\\nest to get the file called <foo.dat>\nthis should be in the next line.");
-    startProp->set_dtstart(starttime);
-    endProp->set_dtend(endtime);
-    locationProp->set_location("SF, California; Seattle, Washington");
-    descProp->set_description("The best cities on the west coast, hit 'NO' if you don't agree!\n");
-
-    VEvent *vEvent = new VEvent();
-
-    ok("Create a new VEvent", (vEvent!=0));
-
-    vEvent->add_property(summProp);
-    vEvent->add_property(startProp);
-    vEvent->add_property(endProp);
-    vEvent->add_property(locationProp);
-    vEvent->add_property(descProp);
- 
-    // 
-    is ("vEvent->get_summary()", 
-	vEvent->get_summary(), 
-	"jon said: change dir to c:\\rest\\test\\nest to get the file called <foo.dat>\nthis should be in the next line.");
-
-    is ("vEvent->get_dtstart()",
-	icaltime_as_ical_string(vEvent->get_dtstart()),
-	"20011221T180000Z");
-
-    is ("vEvent->get_dtend()",
-	icaltime_as_ical_string(vEvent->get_dtend()),
-	"20020101T080000Z");
-
-    ok ("vEvent->as_ical_string()",
-	(vEvent->as_ical_string() != 0));
-
-    if (VERBOSE) {
-      printf("Summary: %s\n", vEvent->get_summary());
-      printf("DTSTART: %s\n",  icaltime_as_ical_string(vEvent->get_dtstart()));
-      printf("DTEND: %s\n",   icaltime_as_ical_string(vEvent->get_dtend()));
-      printf("LOCATION: %s\n", vEvent->get_location());
-      printf("DESCRIPTION: %s\n", vEvent->get_description());
-      
-      printf("vcomponent: %s", vEvent->as_ical_string());
-    }
-
-    VComponent ic(icalparser_parse_string((const char*)content));
-    ok("Parsing component", (ic.is_valid()));
-
-    if (VERBOSE)
-      printf("%s\n", ic.as_ical_string());
-
-    // component is wrapped within BEGIN:VCALENDAR END:VCALENDAR
-    // we need to unwrap it.
-
-    VEvent* sub_ic = dynamic_cast<VEvent*>(ic.get_first_component(ICAL_VEVENT_COMPONENT));
-
-    int_is("Getting VEvent subcomponent", 
-       sub_ic->isa(),
-       ICAL_VEVENT_COMPONENT);
-
-    while (sub_ic != NULL) {
-      if (VERBOSE)
-	printf("subcomponent: %s\n", sub_ic->as_ical_string());
-      
-      sub_ic = dynamic_cast<VEvent*>(ic.get_next_component(ICAL_VEVENT_COMPONENT));
-    }
-
-    VCalendar* cal = new VCalendar();
-    VAgenda* vAgenda = new VAgenda();
-
-    ok("Create a new VCalendar object", (cal != 0));
-    ok("Create a new VAgenda object", (vAgenda != 0));
-
-    ICalProperty* prop = new ICalProperty(ICAL_OWNER_PROPERTY);
-    prop->set_owner("fred@flintstone.net");
-    vAgenda->add_property(prop);
-
-    prop = new ICalProperty(ICAL_SUMMARY_PROPERTY);
-    prop->set_summary("CPMain");
-    vAgenda->add_property(prop);
-
-    prop = new ICalProperty(ICAL_TZID_PROPERTY);
-    prop->set_tzid("America/Los_Angeles");
-    vAgenda->add_property(prop);
-
-    cal->add_component(vAgenda);
-
-    ok("Complex VCALENDAR/VAGENDA", (cal->as_ical_string() != 0));
-
-    if (VERBOSE)
-      printf("vAgenda: %s\n", cal->as_ical_string());
-
-    int caughtException = 0;
-    try {
-      string foo = "HFHFHFHF";
-      VComponent v = VComponent(foo);
-    } catch (icalerrorenum err) {
-	    if (err == ICAL_BADARG_ERROR) {
-		    caughtException = 1;
-            }
-    }
-    int_is("Testing exception handling", caughtException, 1);
-
-}
-
diff --git a/libical/src/test/regression-recur.c b/libical/src/test/regression-recur.c
deleted file mode 100644
index 793eb402c8..0000000000
--- a/libical/src/test/regression-recur.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: regression-recur.c
-  CREATOR: ebusboom 8jun00
-  
-  DESCRIPTION:
-
-  (C) COPYRIGHT 1999 Eric Busboom 
-  http://www.softwarestudio.org
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
- 
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and
-  limitations under the License.
-
-  ======================================================================*/
-
-#include <assert.h>
-#include <string.h> /* for strdup */
-#include <stdlib.h> /* for malloc */
-#include <stdio.h>  /* for printf */
-#include <time.h>   /* for time() */
-#include <signal.h> /* for signal */
-#ifndef WIN32
-#include <unistd.h> /* for alarm */
-#endif
-
-#include <libical/ical.h>
-#include <libicalss/icalss.h>
-#include "regression.h"
-
-extern int VERBOSE;
-
-#ifdef WIN32
-#define snprintf	_snprintf
-#define strcasecmp	stricmp
-#endif
-
-
-static void sig_alrm(int i){
-    fprintf(stderr,"Could not get lock on file\n");
-    exit(1);
-}
-
-/* Get the expected result about the purpose of the property*/
-
-static int get_expected_numevents(icalcomponent *c)
-{
-    icalproperty *p;
-    const char* note = 0;
-    int num_events = 0;
-
-    if(c != 0){
-        for(p = icalcomponent_get_first_property(c,ICAL_X_PROPERTY);
-            p!= 0;
-            p = icalcomponent_get_next_property(c,ICAL_X_PROPERTY)){
-            if(strcmp(icalproperty_get_x_name(p),"X-EXPECT-NUMEVENTS")==0){
-	      note = icalproperty_get_x(p);
-            }
-        }
-    } 
-    
-    if(note != 0){
-      num_events = atoi(note);
-    }
-    
-    
-    return num_events;
-}
-
-
-
-static void recur_callback(icalcomponent *comp,
-			   struct icaltime_span *span,
-			   void *data)
-{
-  int *num_recurs = data;
-
-  if (VERBOSE) {
-    printf("recur: %s", ctime(&span->start));
-    printf("       %s", ctime(&span->end));
-  }
-  *num_recurs = *num_recurs + 1;
-}
-
-void test_recur_file()
-{
-    icalset *cin = 0;
-    struct icaltimetype next;
-    icalcomponent *itr;
-    icalproperty *desc, *dtstart, *rrule;
-    struct icalrecurrencetype recur;
-    icalrecur_iterator* ritr;
-    time_t tt;
-    char* file; 
-    int num_recurs_found = 0;
-	
-    icalerror_set_error_state(ICAL_PARSE_ERROR, ICAL_ERROR_NONFATAL);
-	
-#ifndef WIN32
-    signal(SIGALRM,sig_alrm);
-#endif
-    file = getenv("ICAL_RECUR_FILE");
-    if (!file)
-      file = "../../test-data/recur.txt";
-	
-#ifndef WIN32
-    alarm(15); /* to get file lock */
-#endif
-    cin = icalfileset_new(file);
-#ifndef WIN32
-    alarm(0);
-#endif
-	
-    ok("opening file with recurring events", (cin!=NULL));
-    assert(cin!=NULL);
-	
-    for (itr = icalfileset_get_first_component(cin);
-	itr != 0;
-	itr = icalfileset_get_next_component(cin)){
-      int badcomp = 0;
-      int expected_events = 0;
-      char msg[128];
-
-
-      struct icaltimetype start = icaltime_null_time();
-      struct icaltimetype startmin = icaltime_from_timet(1,0);
-      struct icaltimetype endmax = icaltime_null_time();
-      const char *desc_str = "malformed component";
-
-      desc = icalcomponent_get_first_property(itr,ICAL_DESCRIPTION_PROPERTY);
-      dtstart = icalcomponent_get_first_property(itr,ICAL_DTSTART_PROPERTY);
-      rrule = icalcomponent_get_first_property(itr,ICAL_RRULE_PROPERTY);
-      if (desc) {
-	desc_str = icalproperty_get_description(desc);
-      }
-      
-      ok((char*)desc_str, !(desc == 0 || dtstart == 0 || rrule == 0));
-
-      if (desc == 0 || dtstart == 0 || rrule == 0) {
-	badcomp = 1;
-	if (VERBOSE) {
-	  printf("\n******** Error in input component ********\n");
-	  printf("The following component is malformed:\n %s\n", desc_str);
-	}
-	continue;
-      }
-      if (VERBOSE) {
-	printf("\n\n#### %s\n",desc_str);
-	printf("#### %s\n",icalvalue_as_ical_string(icalproperty_get_value(rrule)));
-      }
-      
-      recur = icalproperty_get_rrule(rrule);
-      start = icalproperty_get_dtstart(dtstart);
-      
-      ritr = icalrecur_iterator_new(recur,start);
-      
-      tt = icaltime_as_timet(start);
-      
-      if (VERBOSE)
-	printf("#### %s\n",ctime(&tt ));
-      
-      icalrecur_iterator_free(ritr);
-      
-      for(ritr = icalrecur_iterator_new(recur,start),
-	    next = icalrecur_iterator_next(ritr); 
-	  !icaltime_is_null_time(next);
-	  next = icalrecur_iterator_next(ritr)){
-	
-	tt = icaltime_as_timet(next);
-	
-	if (VERBOSE)
-	  printf("  %s",ctime(&tt ));		
-	
-      }
-
-      icalrecur_iterator_free(ritr);
-      num_recurs_found = 0;
-      expected_events = get_expected_numevents(itr);
-
-      icalcomponent_foreach_recurrence(itr, startmin, endmax, 
-				       recur_callback, &num_recurs_found);
-      
-      sprintf(msg,"   expecting total of %d events", expected_events);
-      int_is(msg, num_recurs_found, expected_events);
-    }
-    
-    icalset_free(cin);
-}
diff --git a/libical/src/test/regression-storage.c b/libical/src/test/regression-storage.c
deleted file mode 100644
index ea59767014..0000000000
--- a/libical/src/test/regression-storage.c
+++ /dev/null
@@ -1,804 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: regression-storage.c
-  CREATOR: eric 03 April 1999
-  
-  DESCRIPTION:
-  
-  $Id$
-  $Locker$
-
-  (C) COPYRIGHT 1999 Eric Busboom 
-  http://www.softwarestudio.org
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
- 
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and
-  limitations under the License.
-
-  The original author is Eric Busboom
-  The original code is usecases.c
-
-    
-  ======================================================================*/
-
-#include <assert.h>
-#include <string.h> /* for strdup */
-#include <stdlib.h> /* for malloc */
-#include <stdio.h> /* for printf */
-#include <time.h> /* for time() */
-
-#include <libical/ical.h>
-#include <libicalss/icalss.h>
-#include "regression.h"
-
-#define OUTPUT_FILE "filesetout.ics"
-
-/* define sample calendar struct */
-struct calendar {
-  int ID;
-  int total_size;
-
-  /* offsets */
-  int total_size_offset;
-  int vcalendar_size_offset;
-  int vcalendar_offset;
-  int title_size_offset;
-  int title_offset;
-
-  /* data */
-  int vcalendar_size;
-  char *vcalendar;
-
-  int title_size;
-  char *title;
-
-};
-
-int vcalendar_init(struct calendar **cal, char *vcalendar, char *title);
-
-#ifdef WITH_BDB
-#include <db.h>
-
-int get_title(DB *dbp, const DBT *pkey, const DBT *pdata, DBT *skey);
-char * parse_vcalendar(const DBT *dbt) ;
-char * pack_calendar(struct calendar *cal, int size);
-struct calendar * unpack_calendar(char *str, int size);
-#endif
-
-static char str[] = "BEGIN:VCALENDAR\n\
-PRODID:\"-//RDU Software//NONSGML HandCal//EN\"\n\
-VERSION:2.0\n\
-BEGIN:VTIMEZONE\n\
-TZID:US-Eastern\n\
-BEGIN:STANDARD\n\
-DTSTART:19981025T020000\n\
-RDATE:19981025T020000\n\
-TZOFFSETFROM:-0400\n\
-TZOFFSETTO:-0500\n\
-TZNAME:EST\n\
-END:STANDARD\n\
-BEGIN:DAYLIGHT\n\
-DTSTART:19990404T020000\n\
-RDATE:19990404T020000\n\
-TZOFFSETFROM:-0500\n\
-TZOFFSETTO:-0400\n\
-TZNAME:EDT\n\
-END:DAYLIGHT\n\
-END:VTIMEZONE\n\
-BEGIN:VEVENT\n\
-DTSTAMP:19980309T231000Z\n\
-UID:guid-1.host1.com\n\
-ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com\n\
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MAILTO:employee-A@host.com\n\
-DESCRIPTION:Project XYZ Review Meeting\n\
-CATEGORIES:MEETING\n\
-CLASS:PUBLIC\n\
-CREATED:19980309T130000Z\n\
-SUMMARY:XYZ Project Review\n\
-DTSTART;TZID=US-Eastern:19980312T083000\n\
-DTEND;TZID=US-Eastern:19980312T093000\n\
-LOCATION:1CP Conference Room 4350\n\
-END:VEVENT\n\
-BEGIN:BOOGA\n\
-DTSTAMP:19980309T231000Z\n\
-X-LIC-FOO:Booga\n\
-DTSTOMP:19980309T231000Z\n\
-UID:guid-1.host1.com\n\
-END:BOOGA\n\
-END:VCALENDAR";
-
-char str2[] = "BEGIN:VCALENDAR\n\
-PRODID:\"-//RDU Software//NONSGML HandCal//EN\"\n\
-VERSION:2.0\n\
-BEGIN:VEVENT\n\
-DTSTAMP:19980309T231000Z\n\
-UID:guid-1.host1.com\n\
-ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com\n\
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MAILTO:employee-A@host.com\n\
-DESCRIPTION:Project XYZ Review Meeting\n\
-CATEGORIES:MEETING\n\
-CLASS:PUBLIC\n\
-CREATED:19980309T130000Z\n\
-SUMMARY:XYZ Project Review\n\
-DTSTART;TZID=US-Eastern:19980312T083000\n\
-DTEND;TZID=US-Eastern:19980312T093000\n\
-LOCATION:1CP Conference Room 4350\n\
-END:VEVENT\n\
-END:VCALENDAR\n\
-";
-
-
-void test_fileset_extended(void)
-{
-    icalset *cout;
-    int month = 0;
-    int count=0;
-    struct icaltimetype start, end;
-    icalcomponent *c,*clone, *itr;
-    icalsetiter iter;
-
-    start = icaltime_from_timet( time(0),0);
-    end = start;
-    end.hour++;
-
-    cout = icalfileset_new(OUTPUT_FILE);
-    ok("Opening output file", (cout != 0));
-    assert(cout!=0);
-
-    c = icalparser_parse_string(str2);
-    ok("Parsing str2", (c!=0));
-    assert(c != 0);
-
-    icalset_free(cout);
-
-    /* Add data to the file */
-
-    for(month = 1; month < 10; month++){
-	icalcomponent *event;
-	icalproperty *dtstart, *dtend;
-
-        cout = icalfileset_new(OUTPUT_FILE);
-	ok("Opening output file", (cout != 0));
-        assert(cout != 0);
-
-	start.month = month; 
-	end.month = month;
-	
-	clone = icalcomponent_new_clone(c);
-	ok("Making clone of output file", (clone!=0));
-	assert(clone !=0);
-
-	event = icalcomponent_get_first_component(clone,ICAL_VEVENT_COMPONENT);
-	ok("Getting first event from clone", (event!=0));
-	assert(event != 0);
-
-	dtstart = icalcomponent_get_first_property(event,ICAL_DTSTART_PROPERTY);
-	ok("find DTSTART", (dtstart !=0));
-	assert(dtstart!=0);
-
-	icalproperty_set_dtstart(dtstart,start);
-        
-	dtend = icalcomponent_get_first_property(event,ICAL_DTEND_PROPERTY);
-	ok("find DTEND", (dtend !=0));
-
-	assert(dtend!=0);
-
-	icalproperty_set_dtend(dtend,end);
-	
-	icalfileset_add_component(cout,clone);
-	icalfileset_commit(cout);
-
-        icalset_free(cout);
-    }
-
-    /* Print them out */
-
-    cout = icalfileset_new(OUTPUT_FILE);
-
-    ok("Opening output file", (cout != 0));
-    assert(cout != 0);
-    
-    for (iter = icalfileset_begin_component(cout, ICAL_ANY_COMPONENT, 0);
-         icalsetiter_deref(&iter) != 0; icalsetiter_next(&iter)) {
-      icalcomponent *event;
-      icalproperty *dtstart, *dtend;
-
-      itr = icalsetiter_deref(&iter);
-      count++;
-
-      event = icalcomponent_get_first_component(itr,ICAL_VEVENT_COMPONENT);
-
-      dtstart = icalcomponent_get_first_property(event,ICAL_DTSTART_PROPERTY);
-      dtend = icalcomponent_get_first_property(event,ICAL_DTEND_PROPERTY);
-      
-      if (VERBOSE)
-	printf("%d %s %s\n",count, icalproperty_as_ical_string(dtstart),
-	       icalproperty_as_ical_string(dtend));
-
-    }
-
-    /* Remove all of them */
-
-    icalset_free(cout);
-
-    cout = icalfileset_new(OUTPUT_FILE);
-    ok("Opening output file", (cout!=0));
-    assert(cout != 0);
-
-    /* need to advance the iterator first before calling remove_componenet() */
-    /* otherwise, iter will contain a "removed" component and icalsetiter_next(&iter) */
-    /* will fail. */
-
-    iter = icalfileset_begin_component(cout, ICAL_ANY_COMPONENT, 0);
-    itr = icalsetiter_deref(&iter);
-    while (itr != 0) {
-        icalsetiter_next(&iter);
-        icalfileset_remove_component(cout, itr);
-	icalcomponent_free(itr);
-        itr = icalsetiter_deref(&iter);
-    }
-    
-    icalset_free(cout);
-
-    /* Print them out again */
-
-    cout = icalfileset_new(OUTPUT_FILE);
-    ok("Opening output file", (cout != 0));
-    assert(cout != 0);
-    count =0;
-    
-    for (itr = icalfileset_get_first_component(cout);
-         itr != 0;
-         itr = icalfileset_get_next_component(cout)){
-
-      icalcomponent *event;
-      icalproperty *dtstart, *dtend;
-
-      count++;
-
-      event = icalcomponent_get_first_component(itr,ICAL_VEVENT_COMPONENT);
-
-      dtstart = icalcomponent_get_first_property(event,ICAL_DTSTART_PROPERTY);
-      dtend = icalcomponent_get_first_property(event,ICAL_DTEND_PROPERTY);
-      
-      printf("%d %s %s\n",count, icalproperty_as_ical_string(dtstart),
-             icalproperty_as_ical_string(dtend));
-
-    }
-
-    icalset_free(cout);
-    icalcomponent_free(c);
-}
-
-
-#ifdef WITH_BDB
-
-/*
-   In this example, we're storing a calendar with several components
-   under the reference id "calendar_7286" and retrieving records based
-   on title, "month_1" through "month_10".  We use a number of the 
-   "optional" arguments to specify secondary indices, sub-databases
-   (i.e. having multiple databases residing within a single Berkeley
-   DB file), and keys for storage and retrieval.
-*/
-
-void test_bdbset()
-{
-    icalset *cout;
-    int month = 0;
-    int count=0;
-    int num_components=0;
-    int szdata_len=0;
-    int ret=0;
-    char *subdb, *szdata, *szpacked_data;
-    char uid[255];
-    struct icaltimetype start, end;
-    icalcomponent *c,*clone, *itr;
-    DBT key, data;
-    DBC *dbcp;
-
-    struct calendar *cal;
-    int cal_size;
-
-    return; // for now... TODO fix these broken tests..
-
-
-
-    start = icaltime_from_timet( time(0),0);
-    end = start;
-    end.hour++;
-
-    /* Note: as per the Berkeley DB ref pages: 
-     *
-     * The database argument is optional, and allows applications to
-     * have multiple databases in a single file. Although no database
-     * argument needs to be specified, it is an error to attempt to
-     * open a second database in a file that was not initially created
-     * using a database name. 
-     *
-     */
-
-    subdb = "calendar_id";
-
-    /* open database, using subdb */
-    cout = icalbdbset_new("calendar.db", ICALBDB_EVENTS, DB_HASH, 0);
-    /*
-    sdbp = icalbdbset_secondary_open(dbp, 
-    				     DATABASE, 
-    				     "title", 
-				     get_title, 
-				     DB_HASH); 
-    */
-
-    c = icalparser_parse_string(str2);
-
-    assert(c != 0);
-
-    /* Add data to the file */
-
-    for(month = 1; month < 10; month++){
-      icalcomponent *event;
-      icalproperty *dtstart, *dtend, *location;
-
-      /* retrieve data */
-      //      cout = icalbdbset_new(dbp, sdbp, NULL);  
-      //      assert(cout != 0);
-
-      start.month = month; 
-      end.month = month;
-		
-      clone = icalcomponent_new_clone(c);
-      assert(clone !=0);
-      event = icalcomponent_get_first_component(clone,
-						ICAL_VEVENT_COMPONENT);
-      assert(event != 0);
-
-      dtstart = icalcomponent_get_first_property(event,
-						 ICAL_DTSTART_PROPERTY);
-      assert(dtstart!=0);
-      icalproperty_set_dtstart(dtstart,start);
-        
-      dtend = icalcomponent_get_first_property(event,ICAL_DTEND_PROPERTY);
-      assert(dtend!=0);
-      icalproperty_set_dtend(dtend,end);
-
-      location = icalcomponent_get_first_property(event, ICAL_LOCATION_PROPERTY);
-      assert(location!=0);
-
-#if 0
-      /* change the uid to include the month */
-      sprintf(uid, "%s_%d", icalcomponent_get_uid(clone), month);
-      icalcomponent_set_uid(clone, uid);
-#endif
-
-      icalbdbset_add_component(cout,clone);
-
-      /* commit changes */
-      icalbdbset_commit(cout);
-
-      num_components = icalcomponent_count_components(clone, ICAL_ANY_COMPONENT);
-
-      icalset_free(cout); 
-
-    }
-
-    /* try out the cursor operations */
-    memset(&key, 0, sizeof(DBT));
-    memset(&data, 0, sizeof(DBT));
-
-#if 0    
-    ret = icalbdbset_acquire_cursor(dbp, &dbcp);
-    ret = icalbdbset_get_first(dbcp, &key, &data);
-    ret = icalbdbset_get_next(dbcp, &key, &data);
-    ret = icalbdbset_get_last(dbcp, &key, &data);
-#endif
-    /* Print them out */
-
-    for(month = 1, count=0; month < 10; month++){
-      char *title;
-
-      icalcomponent *event;
-      icalproperty *dtstart, *dtend;
-
-      for (itr = icalbdbset_get_first_component(cout);
-	   itr != 0;
-	   itr = icalbdbset_get_next_component(cout)){
-
-	icalcomponent *event;
-	icalproperty *dtstart, *dtend;
-
-	count++;
-
-      event = icalcomponent_get_first_component(itr,ICAL_VEVENT_COMPONENT);
-
-      dtstart = icalcomponent_get_first_property(event,ICAL_DTSTART_PROPERTY);
-      dtend = icalcomponent_get_first_property(event,ICAL_DTEND_PROPERTY);
-      
-      printf("%d %s %s\n",count, icalproperty_as_ical_string(dtstart),
-             icalproperty_as_ical_string(dtend));
-
-      }
-      icalset_free(cout);
-    }
-
-    /* open database */
-    //    cout = icalbdbset_bdb_open("calendar.db", "title", DB_HASH, 0644);
-    /*    sdbp = icalbdbset_secondary_open(dbp, 
-				     DATABASE, 
-				     "title", 
-				     get_title, 
-				     DB_HASH); 
-    */
-    /* Remove all of them */
-    for(month = 1; month < 10; month++){
-      for (itr = icalbdbset_get_first_component(cout);
-	   itr != 0;
-	   itr = icalbdbset_get_next_component(cout)){
-	
-	icalbdbset_remove_component(cout, itr);
-      }
-
-      icalbdbset_commit(cout);
-      icalset_free(cout);
-
-    }
-
-    /* Print them out again */
-
-    for(month = 1, count=0; month < 10; month++){
-      char *title;
-
-      icalcomponent *event;
-      icalproperty *dtstart, *dtend;
-
-      for (itr = icalbdbset_get_first_component(cout);
-	   itr != 0;
-	   itr = icalbdbset_get_next_component(cout)){
-
-	icalcomponent *event;
-	icalproperty *dtstart, *dtend;
-
-	count++;
-
-      event = icalcomponent_get_first_component(itr,ICAL_VEVENT_COMPONENT);
-
-      dtstart = icalcomponent_get_first_property(event,ICAL_DTSTART_PROPERTY);
-      dtend = icalcomponent_get_first_property(event,ICAL_DTEND_PROPERTY);
-      
-      printf("%d %s %s\n",count, icalproperty_as_ical_string(dtstart),
-             icalproperty_as_ical_string(dtend));
-
-      }
-      icalset_free(cout);
-    }
-}
-#endif
-
-int vcalendar_init(struct calendar **rcal, char *vcalendar, char *title) 
-{
-  int vcalendar_size, title_size, total_size;
-  struct calendar *cal;
-
-  if(vcalendar) 
-    vcalendar_size = strlen(vcalendar);
-  else {
-    vcalendar = "";
-    vcalendar_size = strlen(vcalendar);
-  }
-
-  if(title) 
-    title_size = strlen(title);
-  else {
-    title = "";
-    title_size = strlen(title);
-  }
-
-  total_size = sizeof(struct calendar) + vcalendar_size + title_size;
-
-  if((cal = (struct calendar *)malloc(total_size))==NULL)
-    return 0;
-  memset(cal, 0, total_size);
-
-  /* offsets */
-  cal->total_size_offset     = sizeof(int);
-  cal->vcalendar_size_offset = (sizeof(int) * 7);
-  cal->vcalendar_offset      = cal->vcalendar_size_offset + sizeof(int);
-  cal->title_size_offset     = cal->vcalendar_offset + vcalendar_size;
-  cal->title_offset          = cal->title_size_offset + sizeof(int);
-
-  /* sizes */
-  cal->total_size            = total_size;
-  cal->vcalendar_size        = vcalendar_size;
-  cal->title_size            = title_size;
-
-  if (vcalendar && *vcalendar) 
-    cal->vcalendar = strdup(vcalendar);
-
-  if (title && *title)
-    cal->title     = strdup(title);
-
-  *rcal = cal;
-
-  return 0;
-}
-
-/* get_title -- extracts a secondary key (the vcalendar)
- * from a primary key/data pair */
-
-/* just create a random title for now */
-#ifdef WITH_BDB
-
-int get_title(DB *dbp, const DBT *pkey, const DBT *pdata, DBT *skey)
-{
-  icalcomponent *cl;
-  char title[255];
-
-  memset(skey, 0, sizeof(DBT)); 
-
-  cl = icalparser_parse_string((char *)pdata->data);
-  sprintf(title, "title_%s", icalcomponent_get_uid(cl));
-
-  skey->data = strdup(title);
-  skey->size = strlen(skey->data);
-  return (0); 
-}
-
-char * pack_calendar(struct calendar *cal, int size) 
-{
-  char *str;
-
-  if((str = (char *)malloc(sizeof(char) * size))==NULL)
-    return 0;
-
-  /* ID */
-  memcpy(str, &cal->ID, sizeof(cal->ID));
-
-  /* total_size */
-  memcpy(str + cal->total_size_offset,
-	 &cal->total_size,
-	 sizeof(cal->total_size));
-
-  /* vcalendar_size */
-  memcpy(str + cal->vcalendar_size_offset, 
-         &cal->vcalendar_size, 
-         sizeof(cal->vcalendar_size));
-
-  /* vcalendar */
-  memcpy(str + cal->vcalendar_offset, 
-         cal->vcalendar, 
-         cal->vcalendar_size);
-
-  /* title_size */
-  memcpy(str + cal->title_size_offset,
-	 &cal->title_size,
-	 sizeof(cal->title_size));
-
-  /* title */
-  memcpy(str + cal->title_offset,
-	 cal->title,
-	 cal->title_size);
-
-  return str;
-}
-
-struct calendar * unpack_calendar(char *str, int size)
-{
-  struct calendar *cal;
-  if((cal = (struct calendar *) malloc(size))==NULL)
-    return 0;
-  memset(cal, 0, size);
-
-  /* offsets */
-  cal->total_size_offset     = sizeof(int);
-  cal->vcalendar_size_offset = (sizeof(int) * 7);
-  cal->vcalendar_offset      = cal->vcalendar_size_offset + sizeof(int);
-
-  /* ID */
-  memcpy(&cal->ID, str, sizeof(cal->ID));
-
-  /* total_size */
-  memcpy(&cal->total_size,
-	 str + cal->total_size_offset,
-	 sizeof(cal->total_size));
-
-  /* vcalendar_size */
-  memcpy(&cal->vcalendar_size, 
-	 str + cal->vcalendar_size_offset, 
-	 sizeof(cal->vcalendar_size));
-
-  if((cal->vcalendar = (char *)malloc(sizeof(char) * 
-				      cal->vcalendar_size))==NULL)
-    return 0;
-
-  /* vcalendar */
-  memcpy(cal->vcalendar, 
-	 (char *)(str + cal->vcalendar_offset), 
-	 cal->vcalendar_size);
-
-  cal->title_size_offset     = cal->vcalendar_offset + cal->vcalendar_size;
-  cal->title_offset          = cal->title_size_offset + sizeof(int);
-
-  /* title_size */
-  memcpy(&cal->title_size,
-	 str + cal->title_size_offset,
-	 sizeof(cal->title_size));
-
-  if((cal->title = (char *)malloc(sizeof(char) *
-				  cal->title_size))==NULL)
-    return 0;
-
-  /* title*/
-  memcpy(cal->title,
-	 (char *)(str + cal->title_offset),
-	 cal->title_size);
-
-  return cal;
-}
-
-char * parse_vcalendar(const DBT *dbt) 
-{
-  char *str;
-  struct calendar *cal;
-
-  str = (char *)dbt->data;
-  cal = unpack_calendar(str, dbt->size);
-
-  return cal->vcalendar;
-}
-#endif
-
-void test_dirset_extended(void)
-{
-
-    icalcomponent *c;
-    icalgauge *gauge;
-    icalerrorenum error;
-    icalcomponent *itr;
-    icalset* cluster;
-    struct icalperiodtype rtime;
-    icalset *s = icaldirset_new("store");
-    icalset *s2 = icaldirset_new("store-new");
-    int i, count = 0;
-
-    ok("Open dirset 'store'", (s!=0));
-    assert(s != 0);
-
-    rtime.start = icaltime_from_timet( time(0),0);
-
-    cluster = icalfileset_new(OUTPUT_FILE);
-
-    ok("Open fileset to duplicate 4 times", (cluster != 0));
-    assert(cluster != 0);
-
-#define NUMCOMP 4
-
-    /* Duplicate every component in the cluster NUMCOMP times */
-
-    icalerror_clear_errno();
-
-    for (i = 1; i<NUMCOMP+1; i++){
-
-	/*rtime.start.month = i%12;*/
-	rtime.start.month = i;
-	rtime.end = rtime.start;
-	rtime.end.hour++;
-	
-	for (itr = icalfileset_get_first_component(cluster);
-	     itr != 0;
-	     itr = icalfileset_get_next_component(cluster)){
-	    icalcomponent *clone, *inner;
-	    icalproperty *p;
-
-	    inner = icalcomponent_get_first_component(itr,ICAL_VEVENT_COMPONENT);
-            if (inner == 0){
-              continue;
-            }
-
-	    /* Change the dtstart and dtend times in the component
-               pointed to by Itr*/
-
-	    clone = icalcomponent_new_clone(itr);
-	    inner = icalcomponent_get_first_component(itr,ICAL_VEVENT_COMPONENT);
-
-	    ok("Duplicating component...", 
-	       (icalerrno == ICAL_NO_ERROR)&&(inner!=0));
-
-	    assert(icalerrno == ICAL_NO_ERROR);
-	    assert(inner !=0);
-
-	    /* DTSTART*/
-	    p = icalcomponent_get_first_property(inner,ICAL_DTSTART_PROPERTY);
-	    ok("Fetching DTSTART", (icalerrno == ICAL_NO_ERROR));
-	    assert(icalerrno  == ICAL_NO_ERROR);
-
-	    if (p == 0){
-		p = icalproperty_new_dtstart(rtime.start);
-		icalcomponent_add_property(inner,p);
-	    } else {
-		icalproperty_set_dtstart(p,rtime.start);
-	    }
-
-	    ok("Adding DTSTART property", (icalerrno == ICAL_NO_ERROR));
-	    assert(icalerrno  == ICAL_NO_ERROR);
-
-	    /* DTEND*/
-	    p = icalcomponent_get_first_property(inner,ICAL_DTEND_PROPERTY);
-	    ok("Fetching DTEND property", (icalerrno == ICAL_NO_ERROR));
-	    assert(icalerrno  == ICAL_NO_ERROR);
-
-	    if (p == 0){
-		p = icalproperty_new_dtstart(rtime.end);
-		icalcomponent_add_property(inner,p);
-	    } else {
-		icalproperty_set_dtstart(p,rtime.end);
-	    }
-	    ok("Setting DTEND property", (icalerrno == ICAL_NO_ERROR));
-	    assert(icalerrno  == ICAL_NO_ERROR);
-	    
-	    if (VERBOSE)
-	      printf("\n----------\n%s\n---------\n",icalcomponent_as_ical_string(inner));
-
-	    error = icaldirset_add_component(s,
-					     icalcomponent_new_clone(itr));
-	    
-	    ok("Adding component to dirset", (icalerrno == ICAL_NO_ERROR));
-	    assert(icalerrno  == ICAL_NO_ERROR);
-	}
-
-    }
-    
-    gauge = icalgauge_new_from_sql("SELECT * FROM VEVENT WHERE VEVENT.SUMMARY = 'Submit Income Taxes' OR VEVENT.SUMMARY = 'Bastille Day Party'", 0);
-
-    ok("Creating complex Gauge", (gauge!=0));
-
-    icaldirset_select(s,gauge);
-
-    for(c = icaldirset_get_first_component(s); c != 0; 
-	c = icaldirset_get_next_component(s)){
-	
-	printf("Got one! (%d)\n", count++);
-	
-	if (c != 0){
-	    printf("%s", icalcomponent_as_ical_string(c));;
-	    if (icaldirset_add_component(s2,c) == 0){
-		printf("Failed to write!\n");
-	    }
-	    icalcomponent_free(c);
-	} else {
-	    printf("Failed to get component\n");
-	}
-    }
-
-    icalset_free(s2);
-
-    for(c = icaldirset_get_first_component(s); 
-	c != 0; 
-	c = icaldirset_get_next_component(s)){
-
-	if (c != 0){
-	    printf("%s", icalcomponent_as_ical_string(c));;
-	} else {
-	    printf("Failed to get component\n");
-	}
-
-    }
-
-    /* Remove all of the components */
-    i=0;
-    while((c=icaldirset_get_current_component(s)) != 0 ){
-	i++;
-
-	icaldirset_remove_component(s,c);
-    }
-	
-
-    icalset_free(s);
-    icalset_free(cluster);
-}
-
diff --git a/libical/src/test/regression-utils.c b/libical/src/test/regression-utils.c
deleted file mode 100644
index 685e9fe94a..0000000000
--- a/libical/src/test/regression-utils.c
+++ /dev/null
@@ -1,169 +0,0 @@
-#include <libical/ical.h>
-
-#include <stdlib.h>	/* abort() */
-#include <string.h>	/* strcmp() */
-
-static char ictt_str[1024];
-int VERBOSE = 0;
-int QUIET = 0;
-
-const char* ical_timet_string(const time_t t)
-{
-    struct tm stm = *(gmtime(&t));    
-
-    sprintf(ictt_str,"%02d-%02d-%02d %02d:%02d:%02d Z",stm.tm_year+1900,
-	    stm.tm_mon+1,stm.tm_mday,stm.tm_hour,stm.tm_min,stm.tm_sec);
-
-    return ictt_str;
-    
-}
-
-const char* ictt_as_string(struct icaltimetype t)
-{
-    const char *zone = icaltimezone_get_tzid((icaltimezone *)t.zone);
-
-    if (icaltime_is_utc(t))
-	sprintf(ictt_str,"%02d-%02d-%02d %02d:%02d:%02d Z UTC",
-	t.year,t.month,t.day, t.hour,t.minute,t.second);
-    else
-	sprintf(ictt_str,"%02d-%02d-%02d %02d:%02d:%02d %s",
-	t.year,t.month,t.day, t.hour,t.minute,t.second,
-	zone == NULL? "(floating)": zone);
-
-    return ictt_str;
-}
-
-char* icaltime_as_ctime(struct icaltimetype t)
-{
-    time_t tt;
- 
-    tt = icaltime_as_timet(t);
-    sprintf(ictt_str,"%s",ctime(&tt));
-
-    return ictt_str;
-}
-
-
-/** This variable is used to control whether we core dump on errors **/
-static int die_on_errors = 0;
-static int testnumber    = 0;
-static int failed        = 0;
-static int current_set   = 0;
-
-static struct {int set; int test;} failed_tests[1024];
-
-void die_on_errors_set(int val) {
-  die_on_errors = 1;
-}
-
-void _ok(char* test_name, int success, char *file, int linenum, char *test) {
-  testnumber++;
-
-  if (!QUIET || (QUIET && !success))
-  printf("%sok %d - %s\n", (success)?"" : "not ", testnumber, test_name);
-  if (!success) {
-    failed_tests[failed].set  = current_set;
-    failed_tests[failed].test = testnumber;
-    failed++;
-
-    printf("# test failed: \"%s\"\n", test);
-    printf("#          at: %s:%-d\n", file, linenum);
-  }
-
-  if (die_on_errors == 1 && !success) {
-    abort();
-  }
-}
-
-void _is(char* test_name, const char* str1, const char* str2, char *file, int linenum) {
-  int diff;
-  
-  if (str1 == NULL || str2 == NULL) {
-    diff = 1;
-  } else {
-    diff = strcmp(str1, str2);
-  }
-
-  if (!test_name) test_name = "()";
-
-  _ok(test_name, (diff==0), file, linenum, "");
-  
-  if (diff) {
-    printf("#      got: %s\n", str1 ? str1 : "(null)");
-    printf("# expected: %s\n", str2 ? str2 : "(null)");
-  }
-}
-
-void _int_is(char* test_name, int i1, int i2, char *file, int linenum) {
-  _ok(test_name, (i1==i2), file, linenum, "");
-  
-  if (i1!=i2) {
-    printf("#      got: %d\n", i1);
-    printf("# expected: %d\n", i2);
-  }
-}
-
-
-void verbose(int newval) {
-  VERBOSE = newval;
-}
-
-void test_start(int numtests) {
-  if (numtests) {
-    if (!QUIET)
-    printf("1..%-d\n", numtests);
-  } else {
-    if (!QUIET)
-    printf("1..\n");
-  }
-}
-
-void test_header(char *header, int set) {
-  if (!QUIET)
-  printf("########## %-40s (%d) ##########\n", header, set);
-  current_set = set;
-}
-
-void test_end(void) {
-  int pct;
-
-  if (failed) {
-    int i, oldset = 0;
-    
-    pct = ((testnumber - failed)*100)/testnumber;
-    printf("\n        Failed %d/%d tests, %2d%% okay\n", failed, testnumber, pct);
-    printf("\n        Failed tests:\n          ");
-    for (i = 0; i < failed; i++) {
-      int this_set = failed_tests[i].set;
-      char *prefix = "";
-      if (this_set != oldset) {
-	prefix = "\n          ";
-	oldset = this_set;
-      }
-      
-      printf("%s%d/%d ", prefix, this_set, failed_tests[i].test);
-    }
-    printf("\n");
-      
-  } else {
-    printf("\n        All Tests Successful.\n");
-  }
-}
-
-
-void test_run(char *test_name, 
-	      void (*test_fcn)(void), 
-	      int do_test, int headeronly) 
-{
-  static int test_set = 1;
-
-  if (headeronly || do_test == 0 || do_test == test_set)
-    test_header(test_name, test_set);
-  
-  if (!headeronly && (do_test==0 || do_test == test_set)) {
-    (*test_fcn)();
-    if (!QUIET)
-    printf("\n");
-  }
-  test_set++;
-}
diff --git a/libical/src/test/regression.c b/libical/src/test/regression.c
deleted file mode 100644
index 034764551b..0000000000
--- a/libical/src/test/regression.c
+++ /dev/null
@@ -1,3667 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: regression.c
-  CREATOR: eric 03 April 1999
-  
-  DESCRIPTION:
-  
-  $Id$
-  $Locker$
-
-  (C) COPYRIGHT 1999 Eric Busboom 
-  http://www.softwarestudio.org
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
- 
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and
-  limitations under the License.
-
-  The original author is Eric Busboom
-  The original code is regression.c
-
-    
-  ======================================================================*/
-
-#include <libical/ical.h>
-#include <libicalss/icalss.h>
-#include <libicalvcal/icalvcal.h>
-
-#include "regression.h"
-
-#include <assert.h>
-#include <string.h> /* for strdup */
-#include <stdlib.h> /* for malloc */
-#include <stdio.h> /* for printf */
-#include <time.h> /* for time() */
-#ifndef WIN32
-#include <unistd.h> /* for unlink, fork */
-#include <sys/wait.h> /* For waitpid */
-#include <sys/time.h> /* for select */
-#else
-#include <Windows.h>
-#endif
-#include <sys/types.h> /* For wait pid */
-
-#ifdef WIN32
-typedef int pid_t;
-#endif
-
-
-/* For GNU libc, strcmp appears to be a macro, so using strcmp in
- assert results in incomprehansible assertion messages. This
- eliminates the problem */
-
-int regrstrcmp(const char* a, const char* b){
-    return strcmp(a,b);
-}
-
-/* This example creates and minipulates the ical object that appears
- * in rfc 2445, page 137 */
-
-static char str[] = "BEGIN:VCALENDAR\
-PRODID:\"-//RDU Software//NONSGML HandCal//EN\"\
-VERSION:2.0\
-BEGIN:VTIMEZONE\
-TZID:America/New_York\
-BEGIN:STANDARD\
-DTSTART:19981025T020000\
-RDATE:19981025T020000\
-TZOFFSETFROM:-0400\
-TZOFFSETTO:-0500\
-TZNAME:EST\
-END:STANDARD\
-BEGIN:DAYLIGHT\
-DTSTART:19990404T020000\
-RDATE:19990404T020000\
-TZOFFSETFROM:-0500\
-TZOFFSETTO:-0400\
-TZNAME:EDT\
-END:DAYLIGHT\
-END:VTIMEZONE\
-BEGIN:VEVENT\
-DTSTAMP:19980309T231000Z\
-UID:guid-1.host1.com\
-ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com\
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MAILTO:employee-A@host.com\
-DESCRIPTION:Project XYZ Review Meeting\
-CATEGORIES:MEETING\
-CLASS:PUBLIC\
-CREATED:19980309T130000Z\
-SUMMARY:XYZ Project Review\
-DTSTART;TZID=America/New_York:19980312T083000\
-DTEND;TZID=America/New_York:19980312T093000\
-LOCATION:1CP Conference Room 4350\
-END:VEVENT\
-BEGIN:BOOGA\
-DTSTAMP:19980309T231000Z\
-X-LIC-FOO:Booga\
-DTSTOMP:19980309T231000Z\
-UID:guid-1.host1.com\
-END:BOOGA\
-END:VCALENDAR";
-
-
-
-/* Return a list of all attendees who are required. */
-   
-static char** get_required_attendees(icalcomponent* event)
-{
-    icalproperty* p;
-    icalparameter* parameter;
-
-    char **attendees;
-    int max = 10;
-    int c = 0;
-
-    attendees = malloc(max * (sizeof (char *)));
-
-    ok("event is non null", (event != 0));
-    int_is("event is a VEVENT", icalcomponent_isa(event), ICAL_VEVENT_COMPONENT);
-    
-    for(
-	p = icalcomponent_get_first_property(event,ICAL_ATTENDEE_PROPERTY);
-	p != 0;
-	p = icalcomponent_get_next_property(event,ICAL_ATTENDEE_PROPERTY)
-	) {
-	
-	parameter = icalproperty_get_first_parameter(p,ICAL_ROLE_PARAMETER);
-
-	if ( icalparameter_get_role(parameter) == ICAL_ROLE_REQPARTICIPANT) 
-	{
-	    attendees[c++] = icalmemory_strdup(icalproperty_get_attendee(p));
-
-            if (c >= max) {
-                max *= 2; 
-                attendees = realloc(attendees, max * (sizeof (char *)));
-            }
-
-	}
-    }
-
-    return attendees;
-}
-
-/* If an attendee has a PARTSTAT of NEEDSACTION or has no PARTSTAT
-   parameter, change it to TENTATIVE. */
-   
-static void update_attendees(icalcomponent* event)
-{
-    icalproperty* p;
-    icalparameter* parameter;
-
-
-    assert(event != 0);
-    assert(icalcomponent_isa(event) == ICAL_VEVENT_COMPONENT);
-    
-    for(
-	p = icalcomponent_get_first_property(event,ICAL_ATTENDEE_PROPERTY);
-	p != 0;
-	p = icalcomponent_get_next_property(event,ICAL_ATTENDEE_PROPERTY)
-	) {
-	
-	parameter = icalproperty_get_first_parameter(p,ICAL_PARTSTAT_PARAMETER);
-
-	if (parameter == 0) {
-
-	    icalproperty_add_parameter(
-		p,
-		icalparameter_new_partstat(ICAL_PARTSTAT_TENTATIVE)
-		);
-
-	} else if (icalparameter_get_partstat(parameter) == ICAL_PARTSTAT_NEEDSACTION) {
-
-	    icalproperty_remove_parameter_by_ref(p,parameter);
-	    
-	    icalparameter_free(parameter);
-
-	    icalproperty_add_parameter(
-		p,
-		icalparameter_new_partstat(ICAL_PARTSTAT_TENTATIVE)
-		);
-	}
-
-    }
-}
-
-
-void test_values()
-{
-    icalvalue *v; 
-    icalvalue *copy; 
-
-    v = icalvalue_new_caladdress("cap://value/1");
-
-    is("icalvalue_new_caladdress()", 
-       icalvalue_get_caladdress(v), "cap://value/1");
-
-    icalvalue_set_caladdress(v,"cap://value/2");
-
-    is("icalvalue_set_caladdress()",
-       icalvalue_get_caladdress(v), "cap://value/2");
-
-    is("icalvalue_as_ical_string()",
-       icalvalue_as_ical_string(v), "cap://value/2");
-
-    copy = icalvalue_new_clone(v);
-
-    is("icalvalue_new_clone()",
-       icalvalue_as_ical_string(copy), "cap://value/2");
-    icalvalue_free(v);
-    icalvalue_free(copy);
-
-
-    v = icalvalue_new_boolean(1);
-    int_is("icalvalue_new_boolean(1)", icalvalue_get_boolean(v), 1);
-    icalvalue_set_boolean(v,2);
-    ok("icalvalue_set_boolean(2)", (2 == icalvalue_get_boolean(v)));
-    is("icalvalue_as_ical_string()", icalvalue_as_ical_string(v), "2");
-
-    copy = icalvalue_new_clone(v);
-    is("icalvalue_new_clone()", icalvalue_as_ical_string(copy), "2");
-
-    icalvalue_free(v);
-    icalvalue_free(copy);
-
-
-    v = icalvalue_new_x("test");
-    is("icalvalue_new_x(test)", icalvalue_get_x(v), "test");
-    icalvalue_set_x(v, "test2");
-    is("icalvalue_set_x(test2)", icalvalue_get_x(v), "test2");
-    is("icalvalue_as_ical_string()", icalvalue_as_ical_string(v), "test2");
-
-    copy = icalvalue_new_clone(v);
-    is("icalvalue_new_clone()", icalvalue_as_ical_string(copy), "test2");
-
-    icalvalue_free(v);
-    icalvalue_free(copy);
-
-
-    v = icalvalue_new_date(icaltime_from_timet( 1023404802,0));
-    is("icalvalue_new_date()", icalvalue_as_ical_string(v), "20020606T230642");
-    icalvalue_set_date(v,icaltime_from_timet( 1023404802-3600,0));
-    is("icalvalue_set_date()",icalvalue_as_ical_string(v), "20020606T220642");
-
-    copy = icalvalue_new_clone(v);
-    is("icalvalue_new_clone()",icalvalue_as_ical_string(v), "20020606T220642");
-
-    icalvalue_free(v);
-    icalvalue_free(copy);
-
-
-    v = icalvalue_new(-1);
-
-    ok("icalvalue_new(-1), Invalid type", (v == NULL));
-
-    if (v!=0) icalvalue_free(v);
-
-    ok("ICAL_BOOLEAN_VALUE",(ICAL_BOOLEAN_VALUE == 
-           icalparameter_value_to_value_kind(ICAL_VALUE_BOOLEAN)));
-    ok("ICAL_UTCOFFSET_VALUE",(ICAL_UTCOFFSET_VALUE == 
-           icalparameter_value_to_value_kind(ICAL_VALUE_UTCOFFSET)));
-    ok("ICAL_RECUR_VALUE", (ICAL_RECUR_VALUE == 
-           icalparameter_value_to_value_kind(ICAL_VALUE_RECUR)));
-    ok("ICAL_CALADDRESS_VALUE",(ICAL_CALADDRESS_VALUE == 
-           icalparameter_value_to_value_kind(ICAL_VALUE_CALADDRESS)));
-    ok("ICAL_PERIOD_VALUE", (ICAL_PERIOD_VALUE == 
-           icalparameter_value_to_value_kind(ICAL_VALUE_PERIOD)));
-    ok("ICAL_BINARY_VALUE",(ICAL_BINARY_VALUE == 
-           icalparameter_value_to_value_kind(ICAL_VALUE_BINARY)));
-    ok("ICAL_TEXT_VALUE",(ICAL_TEXT_VALUE == 
-           icalparameter_value_to_value_kind(ICAL_VALUE_TEXT)));
-    ok("ICAL_DURATION_VALUE",(ICAL_DURATION_VALUE == 
-           icalparameter_value_to_value_kind(ICAL_VALUE_DURATION)));
-    ok("ICAL_INTEGER_VALUE",
-       (ICAL_INTEGER_VALUE == icalparameter_value_to_value_kind(ICAL_VALUE_INTEGER)));
-
-    ok("ICAL_URI_VALUE",
-       (ICAL_URI_VALUE == icalparameter_value_to_value_kind(ICAL_VALUE_URI)));
-    ok("ICAL_FLOAT_VALUE",(ICAL_FLOAT_VALUE == 
-           icalparameter_value_to_value_kind(ICAL_VALUE_FLOAT)));
-    ok("ICAL_X_VALUE",(ICAL_X_VALUE == 
-           icalparameter_value_to_value_kind(ICAL_VALUE_X)));
-    ok("ICAL_DATETIME_VALUE",(ICAL_DATETIME_VALUE == 
-           icalparameter_value_to_value_kind(ICAL_VALUE_DATETIME)));
-    ok("ICAL_DATE_TIME",(ICAL_DATE_VALUE == 
-           icalparameter_value_to_value_kind(ICAL_VALUE_DATE)));
-
-    /*    v = icalvalue_new_caladdress(0);
-
-    printf("Bad string: %p\n",v);
-
-    if (v!=0) icalvalue_free(v); */
-
-    icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR, ICAL_ERROR_NONFATAL);
-    v = icalvalue_new_from_string(ICAL_RECUR_VALUE,"D2 #0");
-    ok("illegal recur value", (v == 0));
-
-    v = icalvalue_new_from_string(ICAL_TRIGGER_VALUE,"Gonk");
-    ok("illegal trigger value", (v == 0));
-
-    v = icalvalue_new_from_string(ICAL_REQUESTSTATUS_VALUE,"Gonk");
-    ok("illegal requeststatus value", (v == 0));
-
-    icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR, ICAL_ERROR_DEFAULT);
-}
-
-
-void test_properties()
-{
-    icalproperty *prop;
-    icalparameter *param;
-
-    icalproperty *clone;
-    char test_cn_str[128] = "";
-    char *test_cn_str_good = "A Common Name 1A Common Name 2A Common Name 3A Common Name 4";
-    char *test_ical_str_good = "COMMENT;CN=A Common Name 1;CN=A Common Name 2;CN=A Common Name 3;CN=A \n Common Name 4:Another Comment\n";
-
-    prop = icalproperty_vanew_comment(
-	"Another Comment",
-	icalparameter_new_cn("A Common Name 1"),
-	icalparameter_new_cn("A Common Name 2"),
-	icalparameter_new_cn("A Common Name 3"),
-       	icalparameter_new_cn("A Common Name 4"),
-	0); 
-
-    for(param = icalproperty_get_first_parameter(prop,ICAL_ANY_PARAMETER);
-	param != 0; 
-	param = icalproperty_get_next_parameter(prop,ICAL_ANY_PARAMETER)) {
-      const char *str = icalparameter_get_cn(param);
-      if (VERBOSE) printf("Prop parameter: %s\n",icalparameter_get_cn(param));
-      strcat(test_cn_str, str);
-    }    
-    is("fetching parameters", test_cn_str, test_cn_str_good);
-
-    if (VERBOSE) printf("Prop value: %s\n",icalproperty_get_comment(prop));
-    is("icalproperty_get_comment()", 
-       icalproperty_get_comment(prop), "Another Comment");
-
-    if (VERBOSE) printf("As iCAL string:\n %s\n",icalproperty_as_ical_string(prop));
-    
-    is("icalproperty_as_ical_string()",
-       icalproperty_as_ical_string(prop), test_ical_str_good);
-    
-    clone = icalproperty_new_clone(prop);
-
-    if (VERBOSE) printf("Clone:\n %s\n",icalproperty_as_ical_string(prop));
-    is("icalproperty_new_clone()",
-       icalproperty_as_ical_string(prop), test_ical_str_good);
-    
-    icalproperty_free(clone);
-    icalproperty_free(prop);
-
-    prop = icalproperty_new(-1);
-
-    ok("test icalproperty_new() with invalid type (-1)",
-       (prop == NULL));
-
-    if (prop!=0) icalproperty_free(prop);
-}
-
-void test_utf8()
-{
-    icalproperty *prop;
-    char *utf8text = "aáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaá";
-    char *test_ical_str_good = "DESCRIPTION:\n"
-" aáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaá\n"
-" óaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóaáóa\n"
-" áóaáóaáóaáóaáóaáóaáóaáóaáóaá\n";
-
-    prop = icalproperty_new_description(utf8text);
-
-    is("icalproperty_as_ical_string()",
-       icalproperty_as_ical_string(prop), test_ical_str_good);
-    icalproperty_free(prop);
-}
-
-
-
-void test_parameters()
-{
-    icalparameter *p;
-    int i;
-    int enums[] = {ICAL_CUTYPE_INDIVIDUAL,ICAL_CUTYPE_RESOURCE,ICAL_FBTYPE_BUSY,ICAL_PARTSTAT_NEEDSACTION,ICAL_ROLE_NONPARTICIPANT,ICAL_XLICCOMPARETYPE_LESSEQUAL,ICAL_XLICERRORTYPE_MIMEPARSEERROR,-1};
-
-    char* str1 = "A Common Name";
-
-    p = icalparameter_new_cn(str1);
-
-    is("icalparameter_new_cn()", icalparameter_get_cn(p), str1);
-    is("icalparameter_as_ical_string()" ,icalparameter_as_ical_string(p),"CN=A Common Name");
-    
-    icalparameter_free(p);
-
-    p = icalparameter_new_from_string("PARTSTAT=ACCEPTED");
-    ok("PARTSTAT_PARAMETER", (icalparameter_isa(p) == ICAL_PARTSTAT_PARAMETER));
-    ok("PARTSTAT_ACCEPTED", (icalparameter_get_partstat(p) == ICAL_PARTSTAT_ACCEPTED));
- 
-    icalparameter_free(p);
-
-    p = icalparameter_new_from_string("ROLE=CHAIR");
-
-    ok("ROLE_PARAMETER", (icalparameter_isa(p) == ICAL_ROLE_PARAMETER));
-    ok("ROLE_CHAIR", (icalparameter_get_partstat(p) == ICAL_ROLE_CHAIR));
- 
-    icalparameter_free(p);
-
-    p = icalparameter_new_from_string("PARTSTAT=X-FOO");
-    ok("PARTSTAT_PARAMETER", (icalparameter_isa(p) == ICAL_PARTSTAT_PARAMETER));
-    ok("PARTSTAT_X", (icalparameter_get_partstat(p) == ICAL_PARTSTAT_X));
- 
-    icalparameter_free(p);
-
-    p = icalparameter_new_from_string("X-PARAM=X-FOO");
-    ok("X_PARAMETER", (icalparameter_isa(p) == ICAL_X_PARAMETER));
- 
-    icalparameter_free(p);
-
-
-    for (i=0;enums[i] != -1; i++){
-      if (VERBOSE) printf("%s\n",icalparameter_enum_to_string(enums[i]));
-      ok("test paramter enums", 
-	 (icalparameter_string_to_enum(icalparameter_enum_to_string(enums[i]))==enums[i]));
-    }
-}
-
-
-char *good_child = 
-"BEGIN:VEVENT\n"
-"VERSION:2.0\n"
-"DESCRIPTION:This is an event\n"
-"COMMENT;CN=A Common Name 1;CN=A Common Name 2;CN=A Common Name 3;CN=A \n"
-" Common Name 4:Another Comment\n"
-"X-LIC-ERROR;X-LIC-ERRORTYPE=COMPONENT-PARSE-ERROR:This is only a test\n"
-"END:VEVENT\n";
-
-void test_components()
-{
-    icalcomponent* c;
-    icalcomponent* child;
-
-    c = icalcomponent_vanew(
-	ICAL_VCALENDAR_COMPONENT,
-	icalproperty_new_version("2.0"),
-	icalproperty_new_prodid("-//RDU Software//NONSGML HandCal//EN"),
-	icalproperty_vanew_comment(
-	    "A Comment",
-	    icalparameter_new_cn("A Common Name 1"),
-	    0),
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    icalproperty_new_version("2.0"),
-	    icalproperty_new_description("This is an event"),
-	    icalproperty_vanew_comment(
-		"Another Comment",
-		icalparameter_new_cn("A Common Name 1"),
-		icalparameter_new_cn("A Common Name 2"),
-		icalparameter_new_cn("A Common Name 3"),
-		icalparameter_new_cn("A Common Name 4"),
-		0),
-	    icalproperty_vanew_xlicerror(
-		"This is only a test",
-		icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_COMPONENTPARSEERROR),
-		0),
-	    
-	    0
-	    ),
-	0
-	);
-
-    if (VERBOSE) 
-      printf("Original Component:\n%s\n\n",icalcomponent_as_ical_string(c));
-
-    child = icalcomponent_get_first_component(c,ICAL_VEVENT_COMPONENT);
-    
-    ok("test icalcomponent_get_first_component()",
-       (child != NULL));
-
-    if (VERBOSE)
-      printf("Child Component:\n%s\n\n",icalcomponent_as_ical_string(child));
-
-    is("test results of child component", 
-       icalcomponent_as_ical_string(child), good_child);
-
-    icalcomponent_free(c);
-}
-
-
-void test_memory()
-{
-    size_t bufsize = 256;
-    int i;
-    char *p;
-
-    char S1[] = "1) When in the Course of human events, ";
-    char S2[] = "2) it becomes necessary for one people to dissolve the political bands which have connected them with another, ";
-    char S3[] = "3) and to assume among the powers of the earth, ";
-    char S4[] = "4) the separate and equal station to which the Laws of Nature and of Nature's God entitle them, ";
-    char S5[] = "5) a decent respect to the opinions of mankind requires that they ";
-    char S6[] = "6) should declare the causes which impel them to the separation. ";
-    char S7[] = "7) We hold these truths to be self-evident, ";
-    char S8[] = "8) that all men are created equal, ";
-
-/*    char S9[] = "9) that they are endowed by their Creator with certain unalienable Rights, ";
-    char S10[] = "10) that among these are Life, Liberty, and the pursuit of Happiness. ";
-    char S11[] = "11) That to secure these rights, Governments are instituted among Men, ";
-    char S12[] = "12) deriving their just powers from the consent of the governed. "; 
-*/
-
-
-    char *f, *b1, *b2, *b3, *b4, *b5, *b6, *b7, *b8;
-
-#define BUFSIZE 1024
-
-    f = icalmemory_new_buffer(bufsize);
-    p = f;
-    b1 = icalmemory_tmp_buffer(BUFSIZE);
-    strcpy(b1, S1);
-    icalmemory_append_string(&f, &p, &bufsize, b1);
-
-    b2 = icalmemory_tmp_buffer(BUFSIZE);
-    strcpy(b2, S2);
-    icalmemory_append_string(&f, &p, &bufsize, b2);
-
-    b3 = icalmemory_tmp_buffer(BUFSIZE);
-    strcpy(b3, S3);
-    icalmemory_append_string(&f, &p, &bufsize, b3);
-
-    b4 = icalmemory_tmp_buffer(BUFSIZE);
-    strcpy(b4, S4);
-    icalmemory_append_string(&f, &p, &bufsize, b4);
-
-    b5 = icalmemory_tmp_buffer(BUFSIZE);
-    strcpy(b5, S5);
-    icalmemory_append_string(&f, &p, &bufsize, b5);
-
-    b6 = icalmemory_tmp_buffer(BUFSIZE);
-    strcpy(b6, S6);
-    icalmemory_append_string(&f, &p, &bufsize, b6);
-
-    b7 = icalmemory_tmp_buffer(BUFSIZE);
-    strcpy(b7, S7);
-    icalmemory_append_string(&f, &p, &bufsize, b7);
-
-    b8 = icalmemory_tmp_buffer(BUFSIZE);
-    strcpy(b8, S8);
-    icalmemory_append_string(&f, &p, &bufsize, b8);
-
-
-    if (VERBOSE) {
-      printf("1: %p %s \n",b1,b1);
-      printf("2: %p %s\n",b2,b2);
-      printf("3: %p %s\n",b3,b3);
-      printf("4: %p %s\n",b4,b4);
-      printf("5: %p %s\n",b5,b5);
-      printf("6: %p %s\n",b6,b6);
-      printf("7: %p %s\n",b7,b7);
-      printf("8: %p %s\n",b8,b8);
-      
-      
-      printf("Final: %s\n", f);
-      
-      printf("Final buffer size: %d\n",bufsize);
-    }
-
-    ok("final buffer size == 806", (bufsize == 806));
-
-    free(f);
-    
-    bufsize = 4;
-
-    f = icalmemory_new_buffer(bufsize);
-
-    memset(f,0,bufsize);
-    p = f;
-
-    icalmemory_append_char(&f, &p, &bufsize, 'a');
-    if (VERBOSE) printf("Char-by-Char buffer: %s\n", f);
-
-    icalmemory_append_char(&f, &p, &bufsize, 'b');
-    if (VERBOSE) printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'c');
-    if (VERBOSE) printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'd');
-    if (VERBOSE) printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'e');
-    if (VERBOSE) printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'f');
-    if (VERBOSE) printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'g');
-    if (VERBOSE) printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'h');
-    if (VERBOSE) printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'i');
-    if (VERBOSE) printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'j');
-    if (VERBOSE) printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'a');
-    if (VERBOSE) printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'b');
-    if (VERBOSE) printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'c');
-    if (VERBOSE) printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'd');
-    if (VERBOSE) printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'e');
-    if (VERBOSE) printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'f');
-    if (VERBOSE) printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'g');
-    if (VERBOSE) printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'h');
-    if (VERBOSE) printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'i');
-    if (VERBOSE) printf("Char-by-Char buffer: %s\n", f);
-    icalmemory_append_char(&f, &p, &bufsize, 'j');
-    if (VERBOSE) printf("Char-by-Char buffer: %s\n", f);
- 
-	free(f);
-  
-    for(i=0; i<100; i++){
-	f = icalmemory_tmp_buffer(bufsize);
-	
-	assert(f!=0);
-
-	memset(f,0,bufsize);
-	sprintf(f,"%d",i);
-    }
-}
-
-
-void test_dirset()
-{
-    icalcomponent *c;
-    icalgauge *gauge;
-    icalerrorenum error;
-    icalcomponent *next, *itr;
-    icalset* cluster;
-    icalset *s, *s2;
-    struct icalperiodtype rtime;
-    int i;
-    int count = 0;
-
-    mkdir("store", 0755);
-    mkdir("store-new", 0755);
-
-    s = icaldirset_new("store");
-    s2 = icaldirset_new("store-new");
-
-    ok("opening 'store' dirset", s!=NULL);
-    ok("opening 'store-new' dirset", s2!=NULL);
-
-    rtime.start = icaltime_from_timet( time(0),0);
-
-    cluster = icalfileset_new("clusterin.vcd");
-
-    if (cluster == 0){
-	printf("Failed to create cluster: %s\n",icalerror_strerror(icalerrno));
-    }
-
-#define NUMCOMP 4
-
-    /* Duplicate every component in the cluster NUMCOMP times */
-
-    icalerror_clear_errno();
-
-    for (i = 1; i<NUMCOMP+1; i++){
-
-	/*rtime.start.month = i%12;*/
-	rtime.start.month = i;
-	rtime.end = rtime.start;
-	rtime.end.hour++;
-	
-	for (itr = icalfileset_get_first_component(cluster);
-	     itr != 0;
-	     itr = icalfileset_get_next_component(cluster)){
-	    icalcomponent *clone;
-	    icalproperty *p;
-
-	    
-	    if(icalcomponent_isa(itr) != ICAL_VEVENT_COMPONENT){
-		continue;
-	    }
-
-	    
-	    /* Change the dtstart and dtend times in the component
-               pointed to by Itr*/
-
-	    clone = icalcomponent_new_clone(itr);
-	    assert(icalerrno == ICAL_NO_ERROR);
-	    assert(clone !=0);
-
-	    /* DTSTART*/
-	    p = icalcomponent_get_first_property(clone,ICAL_DTSTART_PROPERTY);
-	    assert(icalerrno  == ICAL_NO_ERROR);
-
-	    if (p == 0){
-		p = icalproperty_new_dtstart(rtime.start);
-		icalcomponent_add_property(clone,p);
-	    } else {
-		icalproperty_set_dtstart(p,rtime.start);
-	    }
-	    assert(icalerrno  == ICAL_NO_ERROR);
-
-	    /* DTEND*/
-	    p = icalcomponent_get_first_property(clone,ICAL_DTEND_PROPERTY);
-	    assert(icalerrno  == ICAL_NO_ERROR);
-
-	    if (p == 0){
-		p = icalproperty_new_dtstart(rtime.end);
-		icalcomponent_add_property(clone,p);
-	    } else {
-		icalproperty_set_dtstart(p,rtime.end);
-	    }
-	    assert(icalerrno  == ICAL_NO_ERROR);
-	    
-	    printf("\n----------\n%s\n---------\n",icalcomponent_as_ical_string(clone));
-
-	    error = icaldirset_add_component(s,clone);
-	    
-	    assert(icalerrno  == ICAL_NO_ERROR);
-	}
-    }
-    
-    gauge = icalgauge_new_from_sql("SELECT * FROM VEVENT WHERE VEVENT.SUMMARY = 'Submit Income Taxes' OR VEVENT.SUMMARY = 'Bastille Day Party'", 0);
-
-    icaldirset_select(s,gauge);
-
-    for(c = icaldirset_get_first_component(s); c != 0; c = icaldirset_get_next_component(s)){
-	printf("Got one! (%d)\n", count++);
-	
-	if (c != 0){
-	    printf("%s", icalcomponent_as_ical_string(c));;
-	    if (icaldirset_add_component(s2,c) == 0){
-		printf("Failed to write!\n");
-	    }
-	    icalcomponent_free(c);
-	} else {
-	    printf("Failed to get component\n");
-	}
-    }
-
-
-    icalset_free(s2);
-
-    for(c = icaldirset_get_first_component(s); 
-	c != 0; 
-	c =  next){
-	
-	next = icaldirset_get_next_component(s);
-
-	if (c != 0){
-	    /*icaldirset_remove_component(s,c);*/
-	    printf("%s", icalcomponent_as_ical_string(c));;
-	} else {
-	    printf("Failed to get component\n");
-	}
-    }
-
-    icalset_free(s);
-    icalset_free(cluster);
-}
-
-
-void test_compare()
-{
-    icalvalue *v1, *v2;
-
-    v1 = icalvalue_new_caladdress("cap://value/1");
-    v2 = icalvalue_new_clone(v1);
-
-    ok("compare value and clone", 
-       (icalvalue_compare(v1,v2) == ICAL_XLICCOMPARETYPE_EQUAL));
-
-    icalvalue_free(v1);
-    icalvalue_free(v2);
-
-    v1 = icalvalue_new_caladdress("A");
-    v2 = icalvalue_new_caladdress("B");
-
-    ok("test compare of A and B results in LESS",
-       (icalvalue_compare(v1,v2) == ICAL_XLICCOMPARETYPE_LESS));
-	   
-    ok("test compare of B and A results in GREATER",
-       (icalvalue_compare(v2,v1) == ICAL_XLICCOMPARETYPE_GREATER));
-
-    icalvalue_free(v1);
-    icalvalue_free(v2);
-
-    v1 = icalvalue_new_caladdress("B");
-    v2 = icalvalue_new_caladdress("A");
-
-    ok("test compare of caladdress A and B results in GREATER",
-       (icalvalue_compare(v1,v2) == ICAL_XLICCOMPARETYPE_GREATER));
-    
-    icalvalue_free(v1);
-    icalvalue_free(v2);
-
-    v1 = icalvalue_new_integer(5);
-    v2 = icalvalue_new_integer(5);
-
-    ok("test compare of 5 and 5 results in EQUAL", 
-       (icalvalue_compare(v1,v2) == ICAL_XLICCOMPARETYPE_EQUAL));
-
-    icalvalue_free(v1);
-    icalvalue_free(v2);
-
-    v1 = icalvalue_new_integer(5);
-    v2 = icalvalue_new_integer(10);
-
-    ok("test compare of 5 and 10 results in LESS",
-       (icalvalue_compare(v1,v2) == ICAL_XLICCOMPARETYPE_LESS));
-	   
-    ok("test compare of 10 and 5 results in GREATER",
-       (icalvalue_compare(v2,v1) == ICAL_XLICCOMPARETYPE_GREATER));
-
-    icalvalue_free(v1);
-    icalvalue_free(v2);
-}
-
-
-void test_restriction()
-{
-    icalcomponent *comp;
-    struct icaltimetype atime = icaltime_from_timet( time(0),0);
-    int valid; 
-
-    struct icaldatetimeperiodtype rtime;
-
-    char *str;
-
-    rtime.period.start = icaltime_from_timet( time(0),0);
-    rtime.period.end = icaltime_from_timet( time(0),0);
-    rtime.period.end.hour++;
-    rtime.time = icaltime_null_time();
-
-    comp = 
-	icalcomponent_vanew(
-	    ICAL_VCALENDAR_COMPONENT,
-	    icalproperty_new_version("2.0"),
-	    icalproperty_new_prodid("-//RDU Software//NONSGML HandCal//EN"),
-	    icalproperty_new_method(ICAL_METHOD_REQUEST),
-	    icalcomponent_vanew(
-		ICAL_VTIMEZONE_COMPONENT,
-		icalproperty_new_tzid("America/New_York"),
-		icalcomponent_vanew(
-		    ICAL_XDAYLIGHT_COMPONENT,
-		    icalproperty_new_dtstart(atime),
-		    icalproperty_new_rdate(rtime),
-		    icalproperty_new_tzoffsetfrom(-4.0),
-		    icalproperty_new_tzoffsetto(-5.0),
-		    icalproperty_new_tzname("EST"),
-		    0
-		    ),
-		icalcomponent_vanew(
-		    ICAL_XSTANDARD_COMPONENT,
-		    icalproperty_new_dtstart(atime),
-		    icalproperty_new_rdate(rtime),
-		    icalproperty_new_tzoffsetfrom(-5.0),
-		    icalproperty_new_tzoffsetto(-4.0),
-		    icalproperty_new_tzname("EST"),
-		    0
-		    ),
-		0
-		),
-	    icalcomponent_vanew(
-		ICAL_VEVENT_COMPONENT,
-		icalproperty_new_dtstamp(atime),
-		icalproperty_new_uid("guid-1.host1.com"),
-		icalproperty_vanew_organizer(
-		    "mrbig@host.com",
-		    icalparameter_new_role(ICAL_ROLE_CHAIR),
-		    0
-		    ),
-		icalproperty_vanew_attendee(
-		    "employee-A@host.com",
-		    icalparameter_new_role(ICAL_ROLE_REQPARTICIPANT),
-		    icalparameter_new_rsvp(ICAL_RSVP_TRUE),
-		    icalparameter_new_cutype(ICAL_CUTYPE_GROUP),
-		    0
-		    ),
-		icalproperty_new_description("Project XYZ Review Meeting"),
-		icalproperty_new_categories("MEETING"),
-		icalproperty_new_class(ICAL_CLASS_PUBLIC),
-		icalproperty_new_created(atime),
-		icalproperty_new_summary("XYZ Project Review"),
-                /*		icalproperty_new_dtstart(
-		    atime,
-		    icalparameter_new_tzid("America/New_York"),
-		    0
-		    ),*/
-		icalproperty_vanew_dtend(
-		    atime,
-		    icalparameter_new_tzid("America/New_York"),
-		    0
-		    ),
-		icalproperty_new_location("1CP Conference Room 4350"),
-		0
-		),
-	    0
-	    );
-
-    valid = icalrestriction_check(comp);
-    
-    ok("icalrestriction_check() == 0", (valid==0));
-    
-    str = icalcomponent_as_ical_string(comp);
-
-    icalcomponent_free(comp);
-
-}
-
-void test_calendar()
-{
-    icalcomponent *comp;
-    icalset *c;
-    icalset *s;
-    icalcalendar* calendar;
-    icalerrorenum error;
-    struct icaltimetype atime = icaltime_from_timet( time(0),0);
-
-    mkdir("calendar", 0755);
-    mkdir("calendar/booked", 0755);
-
-    calendar = icalcalendar_new("calendar");
-
-    comp = icalcomponent_vanew(ICAL_VCALENDAR_COMPONENT,
-	icalcomponent_vanew(
-	ICAL_VEVENT_COMPONENT,
-	icalproperty_new_version("2.0"),
-	icalproperty_new_description("This is an event"),
-	icalproperty_new_dtstart(atime),
-	icalproperty_vanew_comment(
-	    "Another Comment",
-	    icalparameter_new_cn("A Common Name 1"),
-	    icalparameter_new_cn("A Common Name 2"),
-	    icalparameter_new_cn("A Common Name 3"),
-		icalparameter_new_cn("A Common Name 4"),
-	    0),
-	icalproperty_vanew_xlicerror(
-	    "This is only a test",
-	    icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_COMPONENTPARSEERROR),
-	    0),
-	
-	0),0);
-    
-    s = icalcalendar_get_booked(calendar);
-
-    error = icaldirset_add_component(s,comp);
-    
-    ok("Adding Component to dirset", (error == ICAL_NO_ERROR));
-
-    c = icalcalendar_get_properties(calendar);
-
-    error = icalfileset_add_component(c,icalcomponent_new_clone(comp));
-
-    ok("Adding Clone Component to dirset", (error == ICAL_NO_ERROR));
-
-    icalcalendar_free(calendar);
-
-    ok("icalcalendar test", (1));
-}
-
-
-void test_increment(void);
-
-void print_occur(struct icalrecurrencetype recur, struct icaltimetype start)
-{
-    struct icaltimetype next;
-    icalrecur_iterator* ritr;
-	
-    time_t tt = icaltime_as_timet(start);
-
-    printf("#### %s\n",icalrecurrencetype_as_string(&recur));
-    printf("#### %s\n",ctime(&tt ));
-    
-    for(ritr = icalrecur_iterator_new(recur,start),
-	    next = icalrecur_iterator_next(ritr); 
-	!icaltime_is_null_time(next);
-	next = icalrecur_iterator_next(ritr)){
-	
-	tt = icaltime_as_timet(next);
-	
-	printf("  %s",ctime(&tt ));		
-	
-    }
-
-    icalrecur_iterator_free(ritr);
-}
-
-void test_recur()
-{
-   struct icalrecurrencetype rt;
-   struct icaltimetype start;
-   time_t array[25];
-   int i;
-
-   rt = icalrecurrencetype_from_string("FREQ=MONTHLY;UNTIL=19971224T000000Z;INTERVAL=1;BYDAY=TU,2FR,3SA");
-   start = icaltime_from_string("19970905T090000Z");
-
-   if (VERBOSE) print_occur(rt,start);   
-
-   if (VERBOSE) printf("\n  Using icalrecur_expand_recurrence\n");
-
-   icalrecur_expand_recurrence("FREQ=MONTHLY;UNTIL=19971224T000000Z;INTERVAL=1;BYDAY=TU,2FR,3SA",
-			       icaltime_as_timet(start),
-			       25,
-			       array);
-
-   for(i =0; array[i] != 0 && i < 25 ; i++){
-     if (VERBOSE) printf("  %s",ctime(&(array[i])));
-   }
-
-   
-/*    test_increment();*/
-
-}
-
-
-void test_expand_recurrence(){
-
-    time_t arr[10];
-    time_t now = 931057385;
-    int i, numfound = 0;
-    icalrecur_expand_recurrence( "FREQ=MONTHLY;BYDAY=MO,WE", now,
-                                 5, arr );
-
-    if (VERBOSE) printf("Start %s",ctime(&now) );
-
-    for (i=0; i<5; i++) {
-      numfound++;
-      if (VERBOSE) printf("i=%d  %s\n", i, ctime(&arr[i]) );
-    }
-    int_is("Get an array of 5 items", numfound, 5);
-}
-
-
-
-enum byrule {
-    NO_CONTRACTION = -1,
-    BY_SECOND = 0,
-    BY_MINUTE = 1,
-    BY_HOUR = 2,
-    BY_DAY = 3,
-    BY_MONTH_DAY = 4,
-    BY_YEAR_DAY = 5,
-    BY_WEEK_NO = 6,
-    BY_MONTH = 7,
-    BY_SET_POS
-};
-
-void icalrecurrencetype_test()
-{
-    icalvalue *v = icalvalue_new_from_string(
-	ICAL_RECUR_VALUE,
-	"FREQ=YEARLY;UNTIL=20060101T000000;INTERVAL=2;BYDAY=SU,WE;BYSECOND=15,30; BYMONTH=1,6,11");
-
-    struct icalrecurrencetype r = icalvalue_get_recur(v);
-    struct icaltimetype t = icaltime_from_timet( time(0), 0);
-    struct icaltimetype next;
-    time_t tt;
-
-    struct icalrecur_iterator_impl* itr 
-	= (struct icalrecur_iterator_impl*) icalrecur_iterator_new(r,t);
-
-    do {
-
-	next = icalrecur_iterator_next(itr);
-	tt = icaltime_as_timet(next);
-
-	printf("%s",ctime(&tt ));		
-
-    } while( ! icaltime_is_null_time(next));
-
-    icalvalue_free(v);
-
-    icalrecur_iterator_free(itr);
- 
-}
-
-/* From Federico Mena Quintero <federico@ximian.com>    */
-void test_recur_parameter_bug(){
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
- 
-#include <stdio.h>
-#include <stdlib.h>
-#include <libical/ical.h>
- 
-    static const char test_icalcomp_str[] =
-"BEGIN:VEVENT\n"
-"RRULE;X-EVOLUTION-ENDDATE=20030209T081500:FREQ=DAILY;COUNT=10;INTERVAL=6\n"
-"END:VEVENT\n";
-  
-    icalcomponent *icalcomp;
-    icalproperty *prop;
-    struct icalrecurrencetype recur;
-    int n_errors;
-    char *str;
-
-    icalcomp = icalparser_parse_string ((char *) test_icalcomp_str);
-    ok("icalparser_parse_string()",(icalcomp!=NULL));
-    assert(icalcomp!=NULL);
-    
-    str = icalcomponent_as_ical_string(icalcomp);
-    is("parsed matches original", str, (char*)test_icalcomp_str);
-    if (VERBOSE) printf("%s\n\n",str);
-
-    n_errors = icalcomponent_count_errors (icalcomp);
-    int_is("no parse errors", n_errors, 0);
-
-    if (n_errors) {
-	icalproperty *p;
-	
-	for (p = icalcomponent_get_first_property (icalcomp,
-						   ICAL_XLICERROR_PROPERTY);
-	     p;
-	     p = icalcomponent_get_next_property (icalcomp,
-						  ICAL_XLICERROR_PROPERTY)) {
-	    const char *str;
-	    
-	    str = icalproperty_as_ical_string (p);
-	    fprintf (stderr, "error: %s\n", str);
-	}
-    }
-    
-    prop = icalcomponent_get_first_property (icalcomp, ICAL_RRULE_PROPERTY);
-    ok("get RRULE property", (prop!=NULL));
-    assert(prop!=NULL);
-    
-    recur = icalproperty_get_rrule (prop);
-    
-    if (VERBOSE) printf("%s\n",icalrecurrencetype_as_string(&recur));
-
-    icalcomponent_free(icalcomp);
-}
-
-
-void test_duration()
-{
-    struct icaldurationtype d;
-
-    d = icaldurationtype_from_string("PT8H30M");
-    if (VERBOSE) printf("%s\n",icaldurationtype_as_ical_string(d));
-    int_is("PT8H30M", icaldurationtype_as_int(d), 30600);
-    
-    d = icaldurationtype_from_string("-PT8H30M");
-    if (VERBOSE) printf("%s\n",icaldurationtype_as_ical_string(d));
-    int_is("-PT8H30M", icaldurationtype_as_int(d), -30600);
-
-    d = icaldurationtype_from_string("PT10H10M10S");
-    if (VERBOSE) printf("%s\n",icaldurationtype_as_ical_string(d));
-    int_is("PT10H10M10S", icaldurationtype_as_int(d), 36610);
-
-    d = icaldurationtype_from_string("P7W");
-    if (VERBOSE) printf("%s\n",icaldurationtype_as_ical_string(d));
-    int_is("P7W", icaldurationtype_as_int(d), 4233600);
-
-    d = icaldurationtype_from_string("P2DT8H30M");
-    if (VERBOSE) printf("%s\n",icaldurationtype_as_ical_string(d));
-    int_is("P2DT8H30M", icaldurationtype_as_int(d), 203400);
-
-    icalerror_errors_are_fatal = 0;
-
-    /* Test conversion of bad input */
-
-    d = icaldurationtype_from_int(1314000);
-    if (VERBOSE) printf("%s %d\n",icaldurationtype_as_ical_string(d),
-			icaldurationtype_as_int(d));
-    is("1314000", icaldurationtype_as_ical_string(d), "P15DT5H");
-
-    d = icaldurationtype_from_string("P2W1DT5H");
-    if (VERBOSE) printf("%s %d\n",icaldurationtype_as_ical_string(d),
-			icaldurationtype_as_int(d));
-    int_is("P15DT5H", icaldurationtype_as_int(d), 0);
-
-    d = icaldurationtype_from_string("P-2DT8H30M");
-    if (VERBOSE) printf("%s\n",icaldurationtype_as_ical_string(d));
-    int_is("P-2DT8H30M", icaldurationtype_as_int(d), 0);
-
-    d = icaldurationtype_from_string("P7W8H");
-    if (VERBOSE) printf("%s\n",icaldurationtype_as_ical_string(d));
-    int_is("P7W8H", icaldurationtype_as_int(d), 0);
-
-    d = icaldurationtype_from_string("T10H");
-    if (VERBOSE) printf("%s\n",icaldurationtype_as_ical_string(d));
-    int_is("T10H", icaldurationtype_as_int(d), 0);
-
-    icalerror_errors_are_fatal = 1;
-
-    d = icaldurationtype_from_int(4233600);
-    if (VERBOSE) printf("%s\n",icaldurationtype_as_ical_string(d));
-    is("P7W",
-	icaldurationtype_as_ical_string(d), "P7W");
-
-    d = icaldurationtype_from_int(4424400);
-    if (VERBOSE) printf("%s\n",icaldurationtype_as_ical_string(d));
-    is("P51DT5H",
-	icaldurationtype_as_ical_string(d), "P51DT5H");
-}
-
-
-void test_period()
-{
-    struct icalperiodtype p;
-    icalvalue *v;
-    char *str;
-
-    str = "19971015T050000Z/PT8H30M";
-    p = icalperiodtype_from_string(str);
-    is(str, icalperiodtype_as_ical_string(p),str);
-
-
-    str = "19971015T050000Z/19971015T060000Z";
-    p = icalperiodtype_from_string(str);
-    is(str, icalperiodtype_as_ical_string(p),str);
-
-
-    str = "19970101T120000/PT3H";
-
-    v = icalvalue_new_from_string(ICAL_PERIOD_VALUE,str);
-    is(str, icalvalue_as_ical_string(v), str);
-
-    icalvalue_free(v);
-}
-
-
-void test_strings(){
-    icalvalue *v;
-
-    v = icalvalue_new_text("foo;bar;bats");
-    if (VERBOSE)
-      printf("%s\n",icalvalue_as_ical_string(v));
-
-    is("test encoding of 'foo;bar;bats'", 
-       "foo\\;bar\\;bats", icalvalue_as_ical_string(v));
-
-    icalvalue_free(v);
-
-
-    v = icalvalue_new_text("foo\\;b\nar\\;ba\tts");
-    if (VERBOSE)
-      printf("%s\n",icalvalue_as_ical_string(v));
-    
-    is("test encoding of 'foo\\\\;b\\nar\\\\;ba\\tts'", 
-       "foo\\\\\\;b\\nar\\\\\\;ba\\tts", icalvalue_as_ical_string(v));
-    
-    icalvalue_free(v);
-}
-
-
-void test_requeststat()
-{
-    icalproperty *p;
-    icalrequeststatus s;
-    struct icalreqstattype st, st2;
-    char temp[1024];
-    
-    s = icalenum_num_to_reqstat(2,1);
-    
-    ok("icalenum_num_to_reqstat(2,1)",(s == ICAL_2_1_FALLBACK_STATUS));
-    
-    ok("icalenum_reqstat_major()",(icalenum_reqstat_major(s) == 2));
-    ok("icalenum_reqstat_minor()",(icalenum_reqstat_minor(s) == 1));
-    
-    is ("icalenum_reqstat_desc() -> 2.1", icalenum_reqstat_desc(s),
-	"Success but fallback taken  on one or more property  values.");
-    
-    st.code = s;
-    st.debug = "booga";
-    st.desc = 0;
-    
-    is("icalreqstattype_as_string()",
-       icalreqstattype_as_string(st), 
-       "2.1;Success but fallback taken  on one or more property  values.;booga");
-    
-    st.desc = " A non-standard description";
-    
-    is("icalreqstattype_as_string() w/ non standard description",
-       icalreqstattype_as_string(st),
-       "2.1; A non-standard description;booga");
-    
-    st.desc = 0;
-    
-    sprintf(temp,"%s\n",icalreqstattype_as_string(st));
-    
-    
-    st2 = icalreqstattype_from_string("2.1;Success but fallback taken  on one or more property  values.;booga");
-    
-    /*    printf("%d --  %d --  %s -- %s\n",*/
-    ok("icalenum_reqstat_major()",(icalenum_reqstat_major(st2.code) == 2));
-    ok("icalenum_reqstat_minor()",(icalenum_reqstat_minor(st2.code) == 1));
-    is("icalenum_reqstat_desc",
-       icalenum_reqstat_desc(st2.code),
-       "Success but fallback taken  on one or more property  values.");
-    
-    st2 = icalreqstattype_from_string("2.1;Success but fallback taken  on one or more property  values.;booga");
-    if (VERBOSE) printf("%s\n",icalreqstattype_as_string(st2));
-    
-    st2 = icalreqstattype_from_string("2.1;Success but fallback taken  on one or more property  values.;");
-    if (VERBOSE) printf("%s\n",icalreqstattype_as_string(st2));
-    
-    st2 = icalreqstattype_from_string("2.1;Success but fallback taken  on one or more property  values.");
-    if (VERBOSE) printf("%s\n",icalreqstattype_as_string(st2));
-    
-    st2 = icalreqstattype_from_string("2.1;");
-    if (VERBOSE) printf("%s\n",icalreqstattype_as_string(st2));
-
-    is("st2 test again",
-       icalreqstattype_as_string(st2),
-       "2.1;Success but fallback taken  on one or more property  values.");
-    
-    st2 = icalreqstattype_from_string("2.1");
-    is("st2 test #3",
-       icalreqstattype_as_string(st2),
-       "2.1;Success but fallback taken  on one or more property  values.");
-    
-    p = icalproperty_new_from_string("REQUEST-STATUS:2.1;Success but fallback taken  on one or more property  values.;booga");
-
-    is("icalproperty_new_from_string()",
-       icalproperty_as_ical_string(p),
-       "REQUEST-STATUS:2.1;Success but fallback taken  on one or more property  \n values.;booga\n");
-
-    icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR,ICAL_ERROR_NONFATAL);
-    st2 = icalreqstattype_from_string("16.4");
-    
-    ok("test unknown code", (st2.code == ICAL_UNKNOWN_STATUS));
-    
-    st2 = icalreqstattype_from_string("1.");
-    
-    ok("test malformed code", (st2.code == ICAL_UNKNOWN_STATUS));
-    icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR,ICAL_ERROR_DEFAULT);
-
-    icalproperty_free(p);
-}
-
-
-void test_dtstart(){
-    
-    struct icaltimetype tt,tt2;
-    
-    icalproperty *p;
-    
-
-    tt = icaltime_from_string("19970101");
-
-    int_is("19970101 is a date", tt.is_date, 1);
-
-    p = icalproperty_new_dtstart(tt);
-
-    if (VERBOSE) printf("%s\n",icalvalue_kind_to_string(icalvalue_isa(icalproperty_get_value(p))));
-
-    ok("ICAL_DATE_VALUE", (icalvalue_isa(icalproperty_get_value(p))==ICAL_DATE_VALUE));
-
-    tt2 = icalproperty_get_dtstart(p);
-    int_is("converted date is date", tt2.is_date, 1);
-
-    if (VERBOSE) printf("%s\n",icalproperty_as_ical_string(p));
-
-    tt = icaltime_from_string("19970101T103000");
-
-    int_is("19970101T103000 is not a date", tt.is_date, 0);
-
-    icalproperty_free(p);
-
-    p = icalproperty_new_dtstart(tt);
-
-    if (VERBOSE) printf("%s\n",icalvalue_kind_to_string(icalvalue_isa(icalproperty_get_value(p))));
-    ok("ICAL_DATETIME_VALUE", (icalvalue_isa(icalproperty_get_value(p))==ICAL_DATETIME_VALUE));
-
-    tt2 = icalproperty_get_dtstart(p);
-    int_is("converted datetime is not date", tt2.is_date, 0);
-
-    if (VERBOSE) printf("%s\n",icalproperty_as_ical_string(p));
-
-    icalproperty_free(p);
-}
-
-void do_test_time(char* zone)
-{
-    struct icaltimetype ictt, icttutc, icttzone, icttdayl, 
-	icttla, icttny,icttphoenix, icttlocal, icttnorm;
-    time_t tt,tt2, tt_p200;
-    int offset_tz;
-    icalvalue *v;
-    short day_of_week,start_day_of_week, day_of_year;
-    icaltimezone *azone, *utczone;
-    char msg[256];
-
-    icalerror_errors_are_fatal = 0;
-
-    azone = icaltimezone_get_builtin_timezone(zone);
-    utczone = icaltimezone_get_utc_timezone();
-
-    /* Test new API */
-    if (VERBOSE) printf("\n---> From time_t \n");
-
-    tt = 1025127869;		/* stick with a constant... */
-
-    if (VERBOSE) printf("Orig        : %s\n",ical_timet_string(tt));
-    if (VERBOSE) printf("\nicaltime_from_timet(tt,0) (DEPRECATED)\n");
-
-    ictt = icaltime_from_timet(tt, 0);
-
-    is("icaltime_from_timet(1025127869) as UTC", ictt_as_string(ictt),
-       "2002-06-26 21:44:29 (floating)");
-
-    ictt = icaltime_from_timet_with_zone(tt, 0, NULL);
-    is("Floating time from time_t",
-       ictt_as_string(ictt), "2002-06-26 21:44:29 (floating)");
-
-    ictt = icaltime_from_timet_with_zone(tt, 0, azone);
-    ok("icaltime_from_timet_with_zone(tt,0,zone) as zone", 
-       strncmp(ictt_as_string(ictt), "2002-06-26 21:44:29", 19)==0);
-
-    ictt = icaltime_from_timet_with_zone(tt, 0, utczone);
-
-    is("icaltime_from_timet_with_zone(tt,0,utc)", ictt_as_string(ictt),
-       "2002-06-26 21:44:29 Z UTC");
-
-    if (VERBOSE) printf("\n---> Convert from floating \n");
-
-    ictt = icaltime_from_timet_with_zone(tt, 0, NULL);
-    icttutc = icaltime_convert_to_zone(ictt, utczone);
-
-    is("Convert from floating to UTC",
-       ictt_as_string(icttutc),
-       "2002-06-26 21:44:29 Z UTC");
-	   
-    icttzone = icaltime_convert_to_zone(ictt, azone);
-
-    ok("Convert from floating to zone",
-       (strncmp(ictt_as_string(icttzone), "2002-06-26 21:44:29", 19)==0));
-
-    tt2 = icaltime_as_timet(icttzone);
-
-    if (VERBOSE) printf("\n---> Convert from UTC \n");
-
-    ictt = icaltime_from_timet_with_zone(tt, 0, utczone);
-    icttutc = icaltime_convert_to_zone(ictt, utczone);
-
-    is("Convert from UTC to UTC",
-       ictt_as_string(icttutc),
-       "2002-06-26 21:44:29 Z UTC");
-
-    icttzone = icaltime_convert_to_zone(ictt, azone);
-
-    ok("Convert from UTC to zone (test year/mon only..)",
-       (strncmp(ictt_as_string(icttzone), "2002-06-26 21:44:29", 7)==0));
-
-    tt2 = icaltime_as_timet(icttzone);
-
-    if (VERBOSE) printf("No conversion: %s\n", ical_timet_string(tt2));
-
-    ok("No conversion at all (test year/mon only)",
-       (strncmp(ical_timet_string(tt2), "2002-06-26 21:44:29 Z",7) == 0));
-
-    tt2 = icaltime_as_timet_with_zone(icttzone, utczone);
-    if (VERBOSE) printf("Back to UTC  : %s\n", ical_timet_string(tt2));
-
-    ok("test time conversion routines",(tt==tt2));
-
-    if (VERBOSE) printf("\n---> Convert from zone \n");
-    ictt = icaltime_from_timet_with_zone(tt, 0, azone);
-    icttzone = icaltime_convert_to_zone(ictt, azone);
-
-    if (VERBOSE)
-    printf("To zone      : %s\n", ictt_as_string(icttzone));
-    icttutc = icaltime_convert_to_zone(ictt, utczone);
-
-    if (VERBOSE)
-    printf("To UTC      : %s\n", ictt_as_string(icttutc));
-    tt2 = icaltime_as_timet(icttutc);
-
-    if (VERBOSE)
-    printf("No conversion: %s\n", ical_timet_string(tt2));
-
-    tt2 = icaltime_as_timet_with_zone(icttutc, azone);
-
-    if (VERBOSE)
-    printf("Back to zone  : %s\n", ical_timet_string(tt2));
-
-    ok("test time conversion, round 2", (tt==tt2));
-
-    ictt = icaltime_from_string("20001103T183030Z");
-
-    tt = icaltime_as_timet(ictt);
-
-    ok("test icaltime -> time_t for 20001103T183030Z", (tt==973276230)); 
-    /* Fri Nov  3 10:30:30 PST 2000 in PST 
-       Fri Nov  3 18:30:30 PST 2000 in UTC */
-    
-    if (VERBOSE) {
-    printf(" Normalize \n");
-    printf("Orig (ical) : %s\n", ictt_as_string(ictt));
-    }
-    icttnorm = ictt;
-    icttnorm.second -= 60 * 60 * 24 * 5;
-    icttnorm = icaltime_normalize(icttnorm);
-
-    if (VERBOSE) 
-      printf("-5d in sec  : %s\n", ictt_as_string(icttnorm));
-    icttnorm.day += 60;
-    icttnorm = icaltime_normalize(icttnorm);
-
-    if (VERBOSE) 
-      printf("+60 d       : %s\n", ictt_as_string(icttnorm));
-
-    /** add test case here.. **/
-
-    if (VERBOSE) 
-    printf("\n As time_t \n");
-
-    tt2 = icaltime_as_timet(ictt);
-
-    if (VERBOSE) {
-      printf("20001103T183030Z (timet): %s\n",ical_timet_string(tt2));
-      printf("20001103T183030Z        : %s\n",ictt_as_string(ictt));
-    }
-
-    /** this test is bogus **/
-    ok("test normalization", (tt2 == tt));
-
-    icttlocal = icaltime_convert_to_zone(ictt, azone);
-    tt2 = icaltime_as_timet(icttlocal);
-    if (VERBOSE) {
-      printf("20001103T183030  (timet): %s\n",ical_timet_string(tt2));
-      printf("20001103T183030         : %s\n",ictt_as_string(icttlocal));
-    }
-
-    offset_tz = -icaltimezone_get_utc_offset_of_utc_time(azone, &ictt, 0); /* FIXME */
-    if (VERBOSE)
-      printf("offset_tz               : %d\n",offset_tz);
-
-    ok("test utc offset", (tt-tt2 == offset_tz));
-
-    /* FIXME with the new API, it's not very useful */
-    icttlocal = ictt;
-    icaltimezone_convert_time(&icttlocal,
-	icaltimezone_get_utc_timezone(),
-	icaltimezone_get_builtin_timezone(zone));
-
-    if (VERBOSE)
-      printf("As local    : %s\n", ictt_as_string(icttlocal));
-
-    if (VERBOSE) printf("\n Convert to and from lib c \n");
-
-    if (VERBOSE) printf("System time is: %s\n",ical_timet_string(tt));
-
-    v = icalvalue_new_datetime(ictt);
-
-    if (VERBOSE) 
-      printf("System time from libical: %s\n",icalvalue_as_ical_string(v));
-
-    icalvalue_free(v);
-
-    tt2 = icaltime_as_timet(ictt);
-
-    if (VERBOSE)
-    printf("Converted back to libc: %s\n",ical_timet_string(tt2));
-    
-    if (VERBOSE) printf("\n Incrementing time  \n");
-
-    icttnorm = ictt;
-
-    icttnorm.year++;
-    tt2 = icaltime_as_timet(icttnorm);
-    if (VERBOSE)
-    printf("Add a year: %s\n",ical_timet_string(tt2));
-
-    icttnorm.month+=13;
-    tt2 = icaltime_as_timet(icttnorm);
-    if (VERBOSE)
-    printf("Add 13 months: %s\n",ical_timet_string(tt2));
-
-    icttnorm.second+=90;
-    tt2 = icaltime_as_timet(icttnorm);
-    if (VERBOSE)
-    printf("Add 90 seconds: %s\n",ical_timet_string(tt2));
-
-    if (VERBOSE) printf("\n Day Of week \n");
-
-    day_of_week = icaltime_day_of_week(ictt);
-    start_day_of_week = icaltime_start_doy_of_week(ictt);
-    day_of_year = icaltime_day_of_year(ictt);
-
-    sprintf(msg, "Testing day of week %d", day_of_week);
-    int_is(msg, day_of_week, 6);
-
-    sprintf(msg, "Testing day of year %d",day_of_year);
-    int_is(msg, day_of_year, 308);
-
-    sprintf(msg, "Week started on doy of %d", start_day_of_week);
-    int_is(msg, start_day_of_week , 303);
-
-    if (VERBOSE) printf("\n TimeZone Conversions \n");
-
-/*
-    icttla = ictt;
-    icaltimezone_convert_time(&icttla,
-			      icaltimezone_get_utc_timezone(),
-			      lazone);
-*/
-    icttla = icaltime_convert_to_zone(ictt,
-	icaltimezone_get_builtin_timezone("America/Los_Angeles"));
-
-    int_is("Converted hour in America/Los_Angeles is 10", icttla.hour, 10);
-
-    icttutc = icaltime_convert_to_zone(icttla,icaltimezone_get_utc_timezone());
-
-    ok("America/Los_Angeles local time is 2000-11-03 10:30:30",
-       (strncmp(ictt_as_string(icttla), "2000-11-03 10:30:30", 19)==0));
-
-    ok("Test conversion back to UTC",(icaltime_compare(icttutc, ictt) == 0)); 
-
-    icttny  = icaltime_convert_to_zone(ictt,
-	icaltimezone_get_builtin_timezone("America/New_York"));
-
-    icttphoenix = icaltime_convert_to_zone(ictt,
-	icaltimezone_get_builtin_timezone("America/Phoenix"));
-
-    if (VERBOSE) {
-    printf("Orig (ctime): %s\n", ical_timet_string(tt) );
-    printf("Orig (ical) : %s\n", ictt_as_string(ictt));
-    printf("UTC         : %s\n", ictt_as_string(icttutc));
-    printf("Los Angeles : %s\n", ictt_as_string(icttla));
-    printf("Phoenix     : %s\n", ictt_as_string(icttphoenix));
-    printf("New York    : %s\n", ictt_as_string(icttny));
-    }
-    /** @todo Check results for Phoenix here?... **/
-
-    /* Daylight savings test for New York */
-    if (VERBOSE) {
-    printf("\n Daylight Savings \n");
-
-    printf("Orig (ctime): %s\n", ical_timet_string(tt) );
-    printf("Orig (ical) : %s\n", ictt_as_string(ictt));
-    printf("NY          : %s\n", ictt_as_string(icttny));
-    }
-
-    ok("Converted time in zone America/New_York is 2000-11-03 13:30:30",
-       (strncmp(ictt_as_string(icttny),"2000-11-03 13:30:30",19)==0));
-
-    tt_p200 = tt +  200 * 24 * 60 * 60 ; /* Add 200 days */
-
-    icttdayl = icaltime_from_timet_with_zone(tt_p200,0,
-	icaltimezone_get_utc_timezone());
-    icttny = icaltime_convert_to_zone(icttdayl,
-	icaltimezone_get_builtin_timezone("America/New_York"));
-
-    if (VERBOSE) {
-    printf("Orig +200d  : %s\n", ical_timet_string(tt_p200) );
-    printf("NY+200D     : %s\n", ictt_as_string(icttny));
-    }
-
-    ok("Converted time +200d in zone America/New_York is 2001-05-22 14:30:30",
-       (strncmp(ictt_as_string(icttny),"2001-05-22 14:30:30",19)==0));
-
-
-    /* Daylight savings test for Los Angeles */
-
-    icttla = icaltime_convert_to_zone(ictt,
-	icaltimezone_get_builtin_timezone("America/Los_Angeles"));
-
-    if (VERBOSE) {
-    printf("\nOrig (ctime): %s\n", ical_timet_string(tt) );
-    printf("Orig (ical) : %s\n", ictt_as_string(ictt));
-    printf("LA          : %s\n", ictt_as_string(icttla));
-    }
-
-    ok("Converted time in zone America/Los_Angeles is 2000-11-03 10:30:30",
-       (strncmp(ictt_as_string(icttla),"2000-11-03 10:30:30",19)==0));
-
-    
-    icttla = icaltime_convert_to_zone(icttdayl,
-	icaltimezone_get_builtin_timezone("America/Los_Angeles"));
-
-    if (VERBOSE) {
-    printf("Orig +200d  : %s\n", ical_timet_string(tt_p200) );
-    printf("LA+200D     : %s\n", ictt_as_string(icttla));
-    }
-
-    ok("Converted time +200d in zone America/Los_Angeles is 2001-05-22 11:30:30",
-       (strncmp(ictt_as_string(icttla),"2001-05-22 11:30:30",19)==0));
-
-
-    icalerror_errors_are_fatal = 1;
-}
-
-void test_iterators()
-{
-    icalcomponent *c,*inner,*next;
-    icalcompiter i;
-    char vevent_list[64] = "";
-    char remaining_list[64] = "";
-
-    char *vevent_list_good = "12347";
-    char *remaining_list_good = "568910";
-
-    int nomore = 1;
-    
-    c= icalcomponent_vanew(
-	ICAL_VCALENDAR_COMPONENT,
-	icalcomponent_vanew(ICAL_VEVENT_COMPONENT,
-			    icalproperty_new_version("1"),0),
-	icalcomponent_vanew(ICAL_VEVENT_COMPONENT,
-			    icalproperty_new_version("2"),0),
-	icalcomponent_vanew(ICAL_VEVENT_COMPONENT,
-			    icalproperty_new_version("3"),0),
-	icalcomponent_vanew(ICAL_VEVENT_COMPONENT,
-			    icalproperty_new_version("4"),0),
-	icalcomponent_vanew(ICAL_VTODO_COMPONENT,
-			    icalproperty_new_version("5"),0),
-	icalcomponent_vanew(ICAL_VJOURNAL_COMPONENT,
-			    icalproperty_new_version("6"),0),
-	icalcomponent_vanew(ICAL_VEVENT_COMPONENT,
-			    icalproperty_new_version("7"),0),
-	icalcomponent_vanew(ICAL_VJOURNAL_COMPONENT,
-			    icalproperty_new_version("8"),0),
-	icalcomponent_vanew(ICAL_VJOURNAL_COMPONENT,
-			    icalproperty_new_version("9"),0),
-	icalcomponent_vanew(ICAL_VJOURNAL_COMPONENT,
-			    icalproperty_new_version("10"),0),
-	0);
-   
-    /* List all of the VEVENTS */
-
-    for(i = icalcomponent_begin_component(c,ICAL_VEVENT_COMPONENT);
-	icalcompiter_deref(&i)!= 0; icalcompiter_next(&i)){
-	
-	icalcomponent *this = icalcompiter_deref(&i);
-
-	icalproperty *p = 
-	    icalcomponent_get_first_property(this,
-					     ICAL_VERSION_PROPERTY);
-	const char* s = icalproperty_get_version(p);
-
-	strcat(vevent_list, s);
-    }
-    is("iterate through VEVENTS in a component", 
-       vevent_list, vevent_list_good);
-
-    /* Delete all of the VEVENTS */
-    /* reset iterator */
-    icalcomponent_get_first_component(c,ICAL_VEVENT_COMPONENT);
-
-    while((inner=icalcomponent_get_current_component(c)) != 0 ){
-	if(icalcomponent_isa(inner) == ICAL_VEVENT_COMPONENT){
-	    icalcomponent_remove_component(c,inner);
-		icalcomponent_free(inner);
-	} else {
-	    icalcomponent_get_next_component(c,ICAL_VEVENT_COMPONENT);
-	}
-    }
-
-    /* List all remaining components */
-    for(inner = icalcomponent_get_first_component(c,ICAL_ANY_COMPONENT); 
-	inner != 0; 
-	inner = icalcomponent_get_next_component(c,ICAL_ANY_COMPONENT)){
-	
-
-	icalproperty *p = 
-	    icalcomponent_get_first_property(inner,ICAL_VERSION_PROPERTY);
-
-	const char* s = icalproperty_get_version(p);	
-
-	strcat(remaining_list, s);
-    }
-
-    is("iterate through remaining components", 
-       remaining_list, remaining_list_good);
-
-    
-    /* Remove all remaining components */
-    for(inner = icalcomponent_get_first_component(c,ICAL_ANY_COMPONENT); 
-	inner != 0; 
-	inner = next){
-
-	icalcomponent *this;
-	icalproperty *p;
-	const char* s;
-	next = icalcomponent_get_next_component(c,ICAL_ANY_COMPONENT);
-
-	p=icalcomponent_get_first_property(inner,ICAL_VERSION_PROPERTY);
-	s = icalproperty_get_version(p);	
-
-	icalcomponent_remove_component(c,inner);
-
-	this = icalcomponent_get_current_component(c);
-
-	if(this != 0){
-	    p=icalcomponent_get_first_property(this,ICAL_VERSION_PROPERTY);
-	    s = icalproperty_get_version(p);	
-	}
-
-	icalcomponent_free(inner);
-    }
-
-
-    /* List all remaining components */
-    for(inner = icalcomponent_get_first_component(c,ICAL_ANY_COMPONENT); 
-	inner != 0; 
-	inner = icalcomponent_get_next_component(c,ICAL_ANY_COMPONENT)){
-	
-	icalproperty *p = 
-	    icalcomponent_get_first_property(inner,ICAL_VERSION_PROPERTY);
-
-	const char* s = icalproperty_get_version(p);	
-
-	if (s)
-	  nomore = 0;
-    }
-
-    ok("test if any components remain after deleting the rest", 
-       nomore == 1);
-    
-	icalcomponent_free(c);
-}
-
-
-void test_time()
-{
-    char  *zones[6] = { "America/Los_Angeles","America/New_York","Europe/London","Asia/Shanghai", NULL};
-    
-    int i;
-
-    do_test_time(0);
-
-    for(i = 0; zones[i] != NULL; i++){
-
-      if (VERBOSE) printf(" ######### Timezone: %s ############\n",zones[i]);
-        
-	do_test_time(zones[i]);
-
-    } 
-
-}
-
-
-void test_icalset()
-{
-    icalcomponent *c; 
-
-    icalset* f = icalset_new_file("2446.ics");
-    icalset* d = icalset_new_dir("outdir");
-
-    assert(f!=0);
-    assert(d!=0);
-
-    for(c = icalset_get_first_component(f);
-	c != 0;
-	c = icalset_get_next_component(f)){
-
-	icalcomponent *clone; 
-
-	clone = icalcomponent_new_clone(c);
-
-	icalset_add_component(d,clone);
-
-	printf(" class %d\n",icalclassify(c,0,"user"));
-
-    }
-
-	icalset_free(f);
-	icalset_free(d);
-}
-
-
-icalcomponent* icalclassify_find_overlaps(icalset* set, icalcomponent* comp);
-
-void test_overlaps()
-{
-    icalcomponent *cset,*c;
-    icalset *set;
-    time_t tm1 = 973378800; /*Sat Nov  4 23:00:00 UTC 2000,
-			      Sat Nov  4 15:00:00 PST 2000 */
-    time_t tm2 = 973382400; /*Sat Nov  5 00:00:00 UTC 2000 
-			      Sat Nov  4 16:00:00 PST 2000 */
-
-    time_t hh = 1800; /* one half hour */
-
-    set = icalset_new_file("../../test-data/overlaps.ics");
-
-    c = icalcomponent_vanew(
-	ICAL_VEVENT_COMPONENT,
-	icalproperty_vanew_dtstart(icaltime_from_timet(tm1-hh,0),0),
-	icalproperty_vanew_dtend(icaltime_from_timet(tm2-hh,0),0),
-	0
-	);
-
-    cset =  icalclassify_find_overlaps(set,c);
-    ok("TODO find overlaps 1", (cset != NULL));
-
-    if (VERBOSE && cset) printf("%s\n",icalcomponent_as_ical_string(cset));
-
-    if (cset) icalcomponent_free(cset);
-    if (c)    icalcomponent_free(c);
-
-
-    c = icalcomponent_vanew(
-	ICAL_VEVENT_COMPONENT,
-	icalproperty_vanew_dtstart(icaltime_from_timet(tm1-hh,0),0),
-	icalproperty_vanew_dtend(icaltime_from_timet(tm2,0),0),
-	0
-	);
-
-    cset =  icalclassify_find_overlaps(set,c);
-
-    ok("TODO find overlaps 1", cset != NULL);
-    if (VERBOSE && cset) printf("%s\n",icalcomponent_as_ical_string(cset));
-
-    if (cset) icalcomponent_free(cset);
-    if (c)    icalcomponent_free(c);
-
-    c = icalcomponent_vanew(
-	ICAL_VEVENT_COMPONENT,
-	icalproperty_vanew_dtstart(icaltime_from_timet(tm1+5*hh,0),0),
-	icalproperty_vanew_dtend(icaltime_from_timet(tm2+5*hh,0),0),
-	0
-	);
-
-    cset =  icalclassify_find_overlaps(set,c);
-    ok("TODO find overlaps 1", cset != NULL);
-    if (VERBOSE && cset) printf("%s\n",icalcomponent_as_ical_string(cset));
-
-    if (set)  icalset_free(set);
-    if (cset) icalcomponent_free(cset);
-    if (c)    icalcomponent_free(c);
-}
-
-
-
-void test_fblist()
-{
-    icalspanlist *sl, *new_sl;
-    icalset* set = icalset_new_file("../../test-data/spanlist.ics");
-    struct icalperiodtype period;
-    icalcomponent *comp;
-    int * foo;
-    int i;
-
-    sl = icalspanlist_new(set,
-		     icaltime_from_string("19980101T000000Z"),
-		     icaltime_from_string("19980108T000000Z"));
-		
-    ok("open ../../test-data/spanlist.ics", (set!=NULL));
-    assert(set!=NULL);
-
-    if (VERBOSE) printf("Restricted spanlist\n");
-    if (VERBOSE) icalspanlist_dump(sl);
-
-    period= icalspanlist_next_free_time(sl,
-		    icaltime_from_string("19970801T120000"));
-
-    is("Next Free time start 19970801T120000", icaltime_as_ical_string(period.start), "19970801T120000");
-    is("Next Free time end   19980101T000000", icaltime_as_ical_string(period.end), "19980101T000000");
-
-    period= icalspanlist_next_free_time(sl, period.end);
-
-    is("Next Free time start 19980101T010000", icaltime_as_ical_string(period.start), "19980101T010000");
-    is("Next Free time end   19980102T010000", icaltime_as_ical_string(period.end), "19980102T010000");
- 
-    if (VERBOSE) printf("%s\n",
-	   icalcomponent_as_ical_string(icalspanlist_as_vfreebusy(sl,
-								  "a@foo.com",
-								  "b@foo.com")
-					));
-
-    foo = icalspanlist_as_freebusy_matrix(sl,3600);
-    
-    for (i=0; foo[i] != -1; i++); /* find number entries */
-
-    int_is("Calculating freebusy hourly matrix", i, (7*24));
-
-    if (VERBOSE) {
-      for (i=0; foo[i] != -1; i++) {
-	printf("%d", foo[i]);
-	if ((i % 24) == 23)
-	  printf("\n");
-      }
-      printf("\n\n");
-    }
-
-
-    free(foo);
-
-    foo = icalspanlist_as_freebusy_matrix(sl,3600*24);
-
-    ok("Calculating daily freebusy matrix", (foo!=NULL));
-
-    {
-      char out_str[80] = "";
-      char *strp = out_str;
-
-      for (i=0; foo[i]!=-1; i++){
-	sprintf(strp, "%d", foo[i]);
-	strp++;
-      }
-      is("Checking freebusy validity", out_str, "1121110");
-    }
-    if (VERBOSE) {
-      for (i=0; foo[i] != -1; i++) {
-	printf("%d", foo[i]);
-	if ((i % 7) == 6)
-	  printf("\n");
-      }
-      printf("\n\n");
-    }
-    free(foo);
-
-    icalspanlist_free(sl);
-
-
-    if (VERBOSE) printf("Unrestricted spanlist\n");
-
-    sl = icalspanlist_new(set,
-			  icaltime_from_string("19970324T120000Z"),
-			  icaltime_null_time());
-
-    ok("add 19970324T120000Z to spanlist", (sl!=NULL));
-
-    if (VERBOSE) printf("Restricted spanlist\n");
-    if (VERBOSE) icalspanlist_dump(sl);
-
-    period= icalspanlist_next_free_time(sl,
-				      icaltime_from_string("19970801T120000Z"));
-
-
-    is("Next Free time start 19980101T010000", 
-       icaltime_as_ical_string(period.start),
-       "19980101T010000");
-
-    is("Next Free time end   19980102T010000", 
-       icaltime_as_ical_string(period.end), 
-       "19980102T010000");
-
-    comp = icalspanlist_as_vfreebusy(sl, "a@foo.com", "b@foo.com");
-
-    ok("Calculating VFREEBUSY component", (comp != NULL));
-    if (VERBOSE) printf("%s\n", icalcomponent_as_ical_string(comp));
-
-    new_sl = icalspanlist_from_vfreebusy(comp);
-
-    ok("Calculating spanlist from generated VFREEBUSY component", 
-       (new_sl != NULL));
-
-    if (VERBOSE) icalspanlist_dump(new_sl);
-
-    if (sl) icalspanlist_free(sl);
-    if (new_sl) icalspanlist_free(new_sl);
-    if (comp) icalcomponent_free(comp);
-
-    icalset_free(set);
-}
-
-
-void test_convenience(){
-    icalcomponent *c;
-    int duration;
-    struct icaltimetype tt;
-
-    c = icalcomponent_vanew(
-	ICAL_VCALENDAR_COMPONENT,
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    icalproperty_new_dtstart(icaltime_from_string("19970801T120000")),
-	    icalproperty_new_dtend(icaltime_from_string("19970801T130000")),
-	    0
-	    ),
-	0);
-
-    if (VERBOSE) printf("\n%s\n", icalcomponent_as_ical_string(c));
-
-    duration = icaldurationtype_as_int(icalcomponent_get_duration(c))/60;
-
-    is("Start is 1997-08-01 12:00:00 (floating)",
-       ictt_as_string(icalcomponent_get_dtstart(c)), "1997-08-01 12:00:00 (floating)");
-    is("End is 1997-08-01 13:00:00 (floating)",
-       ictt_as_string(icalcomponent_get_dtend(c)), "1997-08-01 13:00:00 (floating)");
-    ok("Duration is 60 m", (duration == 60));
-
-    icalcomponent_free(c);
-
-    c = icalcomponent_vanew(
-	ICAL_VCALENDAR_COMPONENT,
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    icalproperty_new_dtstart(icaltime_from_string("19970801T120000Z")),
-	    icalproperty_new_duration(icaldurationtype_from_string("PT1H30M")),
-	    0
-	    ),
-	0);
-
-    if (VERBOSE) printf("\n%s\n", icalcomponent_as_ical_string(c));
-
-    duration = icaldurationtype_as_int(icalcomponent_get_duration(c))/60;
-
-    is("Start is 1997-08-01 12:00:00 Z UTC",
-       ictt_as_string(icalcomponent_get_dtstart(c)), "1997-08-01 12:00:00 Z UTC");
-    is("End is 1997-08-01 13:30:00 Z UTC",
-       ictt_as_string(icalcomponent_get_dtend(c)), "1997-08-01 13:30:00 Z UTC");
-    ok("Duration is 90 m", (duration == 90));
-
-    icalcomponent_free(c);
-
-    icalerror_errors_are_fatal = 0;
-
-    c = icalcomponent_vanew(
-	ICAL_VCALENDAR_COMPONENT,
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    icalproperty_new_dtstart(icaltime_from_string("19970801T120000")),
-	    icalproperty_new_dtend(icaltime_from_string("19970801T130000")),
-	    0
-	    ),
-	0);
-
-    icalcomponent_set_duration(c,icaldurationtype_from_string("PT1H30M"));
-
-    if (VERBOSE) printf("\n%s\n", icalcomponent_as_ical_string(c));
-
-    duration = icaldurationtype_as_int(icalcomponent_get_duration(c))/60;
-
-    is("Start is 1997-08-01 12:00:00 (floating)",
-	ictt_as_string(icalcomponent_get_dtstart(c)),
-	"1997-08-01 12:00:00 (floating)");
-    is("End is 1997-08-01 13:00:00 (floating)",
-	ictt_as_string(icalcomponent_get_dtend(c)),
-	"1997-08-01 13:00:00 (floating)");
-    ok("Duration is 60 m", (duration == 60));
-
-    icalcomponent_free(c);
-
-    c = icalcomponent_vanew(
-	ICAL_VCALENDAR_COMPONENT,
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    icalproperty_new_dtstart(icaltime_from_string("19970801T120000Z")),
-	    icalproperty_new_duration(icaldurationtype_from_string("PT1H30M")),
-	    0
-	    ),
-	0);
-
-    icalcomponent_set_dtend(c,icaltime_from_string("19970801T133000Z"));
-
-    if (VERBOSE) printf("\n%s\n", icalcomponent_as_ical_string(c));
-
-
-    duration = icaldurationtype_as_int(icalcomponent_get_duration(c))/60;
-
-    ok("Start is 1997-08-01 12:00:00 Z UTC",
-       (0 == strcmp("1997-08-01 12:00:00 Z UTC", ictt_as_string(icalcomponent_get_dtstart(c)))));
-    ok("End is 1997-08-01 13:30:00 Z UTC",
-       (0 == strcmp("1997-08-01 13:30:00 Z UTC", ictt_as_string(icalcomponent_get_dtend(c)))));
-    ok("Duration is 90 m", (duration == 90));
-
-    icalerror_errors_are_fatal = 1;
-
-    icalcomponent_free(c);
-
-    c = icalcomponent_vanew(
-	ICAL_VCALENDAR_COMPONENT,
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    0
-	    ),
-	0);
-
-    icalcomponent_set_dtstart(c,icaltime_from_string("19970801T120000Z"));
-    icalcomponent_set_dtend(c,icaltime_from_string("19970801T133000Z"));
-
-    if (VERBOSE) printf("\n%s\n", icalcomponent_as_ical_string(c));
-
-
-    duration = icaldurationtype_as_int(icalcomponent_get_duration(c))/60;
-
-    ok("Start is 1997-08-01 12:00:00 Z UTC",
-       (0 == strcmp("1997-08-01 12:00:00 Z UTC", ictt_as_string(icalcomponent_get_dtstart(c)))));
-    ok("End is 1997-08-01 13:30:00 Z UTC",
-       (0 == strcmp("1997-08-01 13:30:00 Z UTC", ictt_as_string(icalcomponent_get_dtend(c)))));
-    ok("Duration is 90 m", (duration == 90));
-
-    icalcomponent_free(c);
-
-    c = icalcomponent_vanew(
-	ICAL_VCALENDAR_COMPONENT,
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    0
-	    ),
-	0);
-
-
-    icalcomponent_set_dtstart(c,icaltime_from_string("19970801T120000Z"));
-    icalcomponent_set_duration(c,icaldurationtype_from_string("PT1H30M"));
-
-    if (VERBOSE) printf("\n%s\n", icalcomponent_as_ical_string(c));
-
-
-    duration = icaldurationtype_as_int(icalcomponent_get_duration(c))/60;
-
-    ok("Start is 1997-08-01 12:00:00 Z UTC",
-       (0 == strcmp("1997-08-01 12:00:00 Z UTC", ictt_as_string(icalcomponent_get_dtstart(c)))));
-    ok("End is 1997-08-01 13:30:00 Z UTC",
-       (0 == strcmp("1997-08-01 13:30:00 Z UTC", ictt_as_string(icalcomponent_get_dtend(c)))));
-    ok("Duration is 90 m", (duration == 90));
-
-    icalcomponent_free(c);
-
-    c = icalcomponent_vanew(
-	ICAL_VCALENDAR_COMPONENT,
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    0
-	    ),
-    0);
-
-    tt = icaltime_from_string("19970801T120000");
-    icaltime_set_timezone(&tt,
-	icaltimezone_get_builtin_timezone("Europe/Rome"));
-    icalcomponent_set_dtstart(c,tt);
-
-    if (VERBOSE) printf("\n%s\n", icalcomponent_as_ical_string(c));
-
-    icalcomponent_set_duration(c,icaldurationtype_from_string("PT1H30M"));
-    duration = icaldurationtype_as_int(icalcomponent_get_duration(c))/60;
-
-    ok("Start is 1997-08-01 12:00:00 /softwarestudio.org/Olson_20010626_2/Europe/Rome",
-       (0 == strcmp("1997-08-01 12:00:00 /softwarestudio.org/Olson_20010626_2/Europe/Rome", ictt_as_string(icalcomponent_get_dtstart(c)))));
-    ok("End is 1997-08-01 13:30:00 /softwarestudio.org/Olson_20010626_2/Europe/Rome",
-       (0 == strcmp("1997-08-01 13:30:00 /softwarestudio.org/Olson_20010626_2/Europe/Rome", ictt_as_string(icalcomponent_get_dtend(c)))));
-    ok("Duration is 90 m", (duration == 90));
-
-    icalcomponent_free(c);
-}
-
-void test_time_parser()
-{
-    struct icaltimetype tt;
-
-    icalerror_errors_are_fatal = 0;
-
-    tt = icaltime_from_string("19970101T1000");
-    ok("19970101T1000 is null time", icaltime_is_null_time(tt));
-
-    tt = icaltime_from_string("19970101X100000");
-    ok("19970101X100000 is null time", icaltime_is_null_time(tt));
-
-    tt = icaltime_from_string("19970101T100000");
-    ok("19970101T100000 is valid", !icaltime_is_null_time(tt));
-
-    if (VERBOSE) printf("%s\n",icaltime_as_ctime(tt));
-
-    tt = icaltime_from_string("19970101T100000Z");
-
-    ok("19970101T100000Z is valid" , !icaltime_is_null_time(tt));
-    if (VERBOSE) printf("%s\n",icaltime_as_ctime(tt));
-
-    tt = icaltime_from_string("19970101");
-    ok("19970101 is valid", (!icaltime_is_null_time(tt)));
-
-    if (VERBOSE) printf("%s\n",icaltime_as_ctime(tt));
-
-    icalerror_errors_are_fatal = 1;
-}
-
-void test_recur_parser()
-{
-  struct icalrecurrencetype rt; 
-  char *str;
-
-  str = "FREQ=YEARLY;UNTIL=20000131T090000Z;INTERVAL=1;BYDAY=-1TU,3WE,-4FR,SA,SU;BYYEARDAY=34,65,76,78;BYMONTH=1,2,3,4,8";
-  rt = icalrecurrencetype_from_string(str);
-  is(str, icalrecurrencetype_as_string(&rt), str);
-
-  str = "FREQ=DAILY;COUNT=3;INTERVAL=1;BYDAY=-1TU,3WE,-4FR,SA,SU;BYYEARDAY=34,65,76,78;BYMONTH=1,2,3,4,8";
-  
-  rt = icalrecurrencetype_from_string(str);
-  is(str, icalrecurrencetype_as_string(&rt), str);
-}
-
-char* ical_strstr(const char *haystack, const char *needle){
-    return strstr(haystack,needle);
-}
-
-void test_start_of_week()
-{
-    struct icaltimetype tt2;
-    struct icaltimetype tt1 = icaltime_from_string("19900110");
-    int dow, doy,start_dow;
-
-    do{
-        tt1 = icaltime_normalize(tt1);
-
-        doy = icaltime_start_doy_of_week(tt1);
-        dow = icaltime_day_of_week(tt1);
-
-        tt2 = icaltime_from_day_of_year(doy,tt1.year);
-        start_dow = icaltime_day_of_week(tt2);
-
-        if(doy == 1){
-	  char msg[128];
-	  sprintf(msg, "%s", ictt_as_string(tt1));
-	  int_is(msg, start_dow, 1);
-        }
-
-        if(start_dow != 1){ /* Sunday is 1 */
-            printf("failed: Start of week (%s) is not a Sunday \n for %s (doy=%d,dow=%d)\n",ictt_as_string(tt2), ictt_as_string(tt1),dow,start_dow);
-        }
-
-
-        assert(start_dow == 1);
-
-
-        tt1.day+=1;
-        
-    } while(tt1.year < 2010);
-}
-
-void test_doy()
-{
-    struct icaltimetype tt1, tt2;
-    short doy,doy2;
-    char msg[128];
-
-    doy = -1;
-
-    tt1 = icaltime_from_string("19900101");
-
-    if (VERBOSE) printf("Test icaltime_day_of_year() agreement with mktime\n");
-
-    do{
-        struct tm stm;
-
-        tt1 = icaltime_normalize(tt1);
-
-        stm.tm_sec = tt1.second;
-        stm.tm_min = tt1.minute;
-        stm.tm_hour = tt1.hour;
-        stm.tm_mday = tt1.day;
-        stm.tm_mon = tt1.month-1;
-        stm.tm_year = tt1.year-1900;
-        stm.tm_isdst = -1;
-
-        mktime(&stm);
-
-        doy = icaltime_day_of_year(tt1);
-
-        doy2 = stm.tm_yday+1;
-
-	if (doy == 1) {
-	  /** show some test cases **/
-	  sprintf(msg, "Year %d - mktime() compare", tt1.year);
-	  int_is(msg, doy,doy2);
-	}
-
-        if (doy != doy2){
-	  printf("Failed for %s (%d,%d)\n",ictt_as_string(tt1),doy,doy2);
-        }
-	assert(doy == doy2);
-
-        tt1.day+=1;
-        
-    } while(tt1.year < 2010);
-    
-    if (VERBOSE) printf("\nTest icaltime_day_of_year() agreement with icaltime_from_day_of_year()\n");
-
-    tt1 = icaltime_from_string("19900101");
-
-    do{      
-        if(doy == 1){
-	  /** show some test cases **/
-	  sprintf(msg, "Year %d - icaltime_day_of_year() compare", tt1.year);
-	  int_is(msg, doy,doy2);
-        }
-
-        doy = icaltime_day_of_year(tt1);
-        tt2 = icaltime_from_day_of_year(doy,tt1.year);
-        doy2 = icaltime_day_of_year(tt2);
-
-        assert(doy2 == doy);
-        assert(icaltime_compare(tt1,tt2) == 0);
-
-        tt1.day+=1;
-        tt1 = icaltime_normalize(tt1);
-        
-    } while(tt1.year < 2010);
-
-
-    tt1 = icaltime_from_string("19950301");
-    doy = icaltime_day_of_year(tt1);
-    tt2 = icaltime_from_day_of_year(doy,1995);
-    if(VERBOSE) printf("%d %s %s\n",doy, icaltime_as_ctime(tt1),icaltime_as_ctime(tt2));
-
-    ok("test 19950301", (tt2.day == 1 && tt2.month == 3));
-    ok("day of year == 60", (doy == 60));
-
-    tt1 = icaltime_from_string("19960301");
-    doy = icaltime_day_of_year(tt1);
-    tt2 = icaltime_from_day_of_year(doy,1996);
-    if (VERBOSE) printf("%d %s %s\n",doy, icaltime_as_ctime(tt1),icaltime_as_ctime(tt2));
-    ok("test 19960301", (tt2.day == 1 && tt2.month == 3));
-    ok("day of year == 61", (doy == 61));
-
-    tt1 = icaltime_from_string("19970301");
-    doy = icaltime_day_of_year(tt1);
-    tt2 = icaltime_from_day_of_year(doy,1997);
-    if (VERBOSE) printf("%d %s %s\n",doy, icaltime_as_ctime(tt1),icaltime_as_ctime(tt2));
-
-    ok("test 19970301", (tt2.day == 1 && tt2.month == 3));
-    ok("day of year == 60", (doy == 60));
-
-}
-
-void test_x(){
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
- 
-#include <stdio.h>
-#include <stdlib.h>
-#include <libical/ical.h>
- 
-    static const char test_icalcomp_str[] =
-"BEGIN:VEVENT\r\n"
-"RRULE\r\n"
-" ;X-EVOLUTION-ENDDATE=20030209T081500\r\n"
-" :FREQ=DAILY;COUNT=10;INTERVAL=6\r\n"
-"X-COMMENT;X-FOO=BAR: Booga\r\n"
-"END:VEVENT\r\n";
-  
-    icalcomponent *icalcomp;
-    icalproperty *prop;
-    struct icalrecurrencetype recur;
-    int n_errors;
-    
-    icalcomp = icalparser_parse_string ((char *) test_icalcomp_str);
-    assert(icalcomp!=NULL);
-    
-    if (VERBOSE) printf("%s\n\n",icalcomponent_as_ical_string(icalcomp));
-
-    n_errors = icalcomponent_count_errors (icalcomp);
-    int_is("icalparser_parse_string()", n_errors,0);
-
-    if (n_errors) {
-      /** NOT USED **/
-	icalproperty *p;
-	
-	for (p = icalcomponent_get_first_property (icalcomp,
-						   ICAL_XLICERROR_PROPERTY);
-	     p;
-	     p = icalcomponent_get_next_property (icalcomp,
-						  ICAL_XLICERROR_PROPERTY)) {
-	    const char *str;
-	    
-	    str = icalproperty_as_ical_string (p);
-	    fprintf (stderr, "error: %s\n", str);
-	}
-    }
-    
-    prop = icalcomponent_get_first_property (icalcomp, ICAL_RRULE_PROPERTY);
-    ok("get RRULE property", (prop != NULL));
-    assert(prop!=NULL);
-    
-    recur = icalproperty_get_rrule (prop);
-    
-    if (VERBOSE) printf("%s\n",icalrecurrencetype_as_string(&recur));
-
-    icalcomponent_free(icalcomp);
-
-}
-
-void test_gauge_sql() {
-    icalgauge *g;
-    char* str;
-    
-    str= "SELECT DTSTART,DTEND,COMMENT FROM VEVENT,VTODO WHERE VEVENT.SUMMARY = 'Bongoa' AND SEQUENCE < 5";
-
-    g = icalgauge_new_from_sql(str, 0);
-    ok(str, (g!=NULL));
-    if (VERBOSE) icalgauge_dump(g);
-
-    icalgauge_free(g);
-
-    str="SELECT * FROM VEVENT,VTODO WHERE VEVENT.SUMMARY = 'Bongoa' AND SEQUENCE < 5 OR METHOD != 'CREATE'";
-
-    g = icalgauge_new_from_sql(str, 0);
-    ok(str, (g!=NULL));
-    if (VERBOSE) icalgauge_dump(g);
-
-    icalgauge_free(g);
-
-    str="SELECT * FROM VEVENT WHERE SUMMARY == 'BA301'";
-
-    g = icalgauge_new_from_sql(str, 0);
-    ok(str, (g!=NULL));    
-    if (VERBOSE) icalgauge_dump(g);
-
-    icalgauge_free(g);
-
-    str="SELECT * FROM VEVENT WHERE SUMMARY == 'BA301'";
-
-    g = icalgauge_new_from_sql(str, 0);
-    ok(str, (g!=NULL));    
-    if (VERBOSE) icalgauge_dump(g);
-
-    icalgauge_free(g);
-
-    str="SELECT * FROM VEVENT WHERE LOCATION == '104 Forum'";
-
-    g = icalgauge_new_from_sql(str, 0);
-    ok(str, (g!=NULL));    
-    if (VERBOSE) icalgauge_dump(g);
-
-    icalgauge_free(g);
-}
-
-
-void test_gauge_compare() {
-    icalgauge *g;
-    icalcomponent *c;
-    char* str;
-
-    /* Equality */
-
-    c =  icalcomponent_vanew(ICAL_VCALENDAR_COMPONENT,
-	      icalcomponent_vanew(ICAL_VEVENT_COMPONENT,
-		  icalproperty_new_dtstart(
-		      icaltime_from_string("20000101T000002")),0),0);
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE DTSTART = '20000101T000002'", 0);
-
-    ok("SELECT * FROM VEVENT WHERE DTSTART = '20000101T000002'", (c!=0 && g!=0));
-    assert(c!=0);
-    assert(g!=0);
-
-    int_is("compare",icalgauge_compare(g,c), 1);
-
-    icalgauge_free(g);
-
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE DTSTART = '20000101T000001'", 0);
-
-    ok("SELECT * FROM VEVENT WHERE DTSTART = '20000101T000001'\n", (g!=0));
-
-    assert(g!=0);
-    int_is("compare",icalgauge_compare(g,c), 0);
-
-    icalgauge_free(g);
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE DTSTART != '20000101T000003'", 0);
-
-    ok("SELECT * FROM VEVENT WHERE DTSTART != '20000101T000003'\n", (c!=0 && g!=0));
-
-
-    assert(g!=0);
-    int_is("compare",icalgauge_compare(g,c), 1);
-
-    icalgauge_free(g);
-
-
-    /* Less than */
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE DTSTART < '20000101T000003'", 0);
-
-    ok("SELECT * FROM VEVENT WHERE DTSTART < '20000101T000003'", (c!=0 && g!=0));
-
-    int_is("compare",icalgauge_compare(g,c), 1);
-
-    assert(g!=0);
-    icalgauge_free(g);
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE DTSTART < '20000101T000002'", 0);
-
-    ok("SELECT * FROM VEVENT WHERE DTSTART < '20000101T000002'\n", (g!=0));
-
-
-    assert(g!=0);
-    int_is("compare",icalgauge_compare(g,c), 0);
-
-    icalgauge_free(g);
-
-    /* Greater than */
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE DTSTART > '20000101T000001'", 0);
-
-    ok("SELECT * FROM VEVENT WHERE DTSTART > '20000101T000001'\n", (g!=0));
-
-
-    assert(g!=0);
-    int_is("compare",icalgauge_compare(g,c), 1);
-
-    icalgauge_free(g);
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE DTSTART > '20000101T000002'", 0);
-
-    ok("SELECT * FROM VEVENT WHERE DTSTART > '20000101T000002'\n", (g!=0));
-
-
-    assert(g!=0);
-    int_is("compare",icalgauge_compare(g,c), 0);
-
-
-    icalgauge_free(g);
-
-
-    /* Greater than or Equal to */
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE DTSTART >= '20000101T000002'", 0);
-
-    ok("SELECT * FROM VEVENT WHERE DTSTART >= '20000101T000002'\n", (g!=0));
-
-
-    int_is("compare",icalgauge_compare(g,c), 1);
-
-    icalgauge_free(g);
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE DTSTART >= '20000101T000003'", 0);
-
-    ok("SELECT * FROM VEVENT WHERE DTSTART >= '20000101T000003'\n", (g!=0));
-
-
-    int_is("compare",icalgauge_compare(g,c), 0);
-
-    icalgauge_free(g);
-
-    /* Less than or Equal to */
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE DTSTART <= '20000101T000002'", 0);
-
-    ok("SELECT * FROM VEVENT WHERE DTSTART <= '20000101T000002'\n", (g!=0));
-
-
-    assert(g!=0);
-    int_is("compare",icalgauge_compare(g,c), 1);
-
-    icalgauge_free(g);
-
-    g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE DTSTART <= '20000101T000001'", 0);
-
-    ok("SELECT * FROM VEVENT WHERE DTSTART <= '20000101T000001'\n", (g!=0));
-
-
-    int_is("compare",icalgauge_compare(g,c), 0);
-
-    icalgauge_free(g);
-
-    icalcomponent_free(c);
-
-    /* Combinations */
-
-    c =  icalcomponent_vanew(ICAL_VCALENDAR_COMPONENT,
-	      icalcomponent_vanew(ICAL_VEVENT_COMPONENT,
-		  icalproperty_new_dtstart(
-		      icaltime_from_string("20000102T000000")),0),0);
-
-
-    str =  "SELECT * FROM VEVENT WHERE DTSTART > '20000101T000000' and DTSTART < '20000103T000000'";
-
-    g = icalgauge_new_from_sql(str, 0);
-    ok(str, (g!=0));
-    int_is("compare",icalgauge_compare(g,c), 1);
-
-    icalgauge_free(g);
-
-    str =  "SELECT * FROM VEVENT WHERE DTSTART > '20000101T000000' and DTSTART < '20000102T000000'";
-
-    g = icalgauge_new_from_sql(str, 0);
-    ok(str, (g!=0));
-    int_is("compare",icalgauge_compare(g,c), 0);
-
-    icalgauge_free(g);
-
-    str =  "SELECT * FROM VEVENT WHERE DTSTART > '20000101T000000' or DTSTART < '20000102T000000'";
-
-    g = icalgauge_new_from_sql(str, 0);
-    ok(str, (g!=0));
-    int_is("compare",icalgauge_compare(g,c), 1);
-
-    icalgauge_free(g);
-
-
-    icalcomponent_free(c);
-
-    /* Combinations, non-cannonical component */
-
-    c = icalcomponent_vanew(ICAL_VEVENT_COMPONENT,
-		  icalproperty_new_dtstart(
-		      icaltime_from_string("20000102T000000")),0);
-
-
-    str =  "SELECT * FROM VEVENT WHERE DTSTART > '20000101T000000' and DTSTART < '20000103T000000'";
-
-    g = icalgauge_new_from_sql(str, 0);
-    ok(str, (g!=0));
-    int_is("compare",icalgauge_compare(g,c), 1);
-
-    icalgauge_free(g);
-
-    str =  "SELECT * FROM VEVENT WHERE DTSTART > '20000101T000000' and DTSTART < '20000102T000000'";
-
-    g = icalgauge_new_from_sql(str, 0);
-    ok(str, (g!=0));
-    int_is("compare",icalgauge_compare(g,c), 0);
-
-    icalgauge_free(g);
-
-    str =  "SELECT * FROM VEVENT WHERE DTSTART > '20000101T000000' or DTSTART < '20000102T000000'";
-
-    g = icalgauge_new_from_sql(str, 0);
-    ok(str, (g!=0));
-    int_is("compare",icalgauge_compare(g,c), 1);
-
-    icalgauge_free(g);
-    icalcomponent_free(c);
-
-
-    /* Complex comparisions */
-
-    c =  icalcomponent_vanew(
-	ICAL_VCALENDAR_COMPONENT,
-	icalproperty_new_method(ICAL_METHOD_REQUEST),
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    icalproperty_new_dtstart(
-		icaltime_from_string("20000101T000002")),
-	    icalproperty_new_comment("foo"),
-	    icalcomponent_vanew(
-		ICAL_VALARM_COMPONENT,
-		icalproperty_new_dtstart(
-		    icaltime_from_string("20000101T120000")),
-		
-		0),
-	    0),
-	0);
-    
-    
-    str = "SELECT * FROM VEVENT WHERE VALARM.DTSTART = '20000101T120000'";
-
-    g = icalgauge_new_from_sql(str, 0);
-    ok(str, (g!=0));
-    int_is("compare",icalgauge_compare(g,c), 1);
-
-    icalgauge_free(g);
-
-    str = "SELECT * FROM VEVENT WHERE COMMENT = 'foo'";
-    g = icalgauge_new_from_sql(str, 0);
-    ok(str, (g!=0));
-    int_is("compare",icalgauge_compare(g,c), 1);
-
-    icalgauge_free(g);
-	
-    str = "SELECT * FROM VEVENT WHERE COMMENT = 'foo' AND  VALARM.DTSTART = '20000101T120000'";
-    g = icalgauge_new_from_sql(str, 0);
-    ok(str, (g!=0));
-    int_is("compare",icalgauge_compare(g,c), 1);
-
-    icalgauge_free(g);
-
-    str = "SELECT * FROM VEVENT WHERE COMMENT = 'bar' AND  VALARM.DTSTART = '20000101T120000'";
-    g = icalgauge_new_from_sql(str, 0);
-    ok(str, (g!=0));
-    int_is("compare",icalgauge_compare(g,c), 0);
-
-    icalgauge_free(g);
-
-    str = "SELECT * FROM VEVENT WHERE COMMENT = 'bar' or  VALARM.DTSTART = '20000101T120000'";
-    g = icalgauge_new_from_sql(str, 0);
-    ok(str, (g!=0));
-    int_is("compare",icalgauge_compare(g,c), 1);
-
-    icalgauge_free(g);
-
-    icalcomponent_free(c);
-
-}
-
-icalcomponent* make_component(int i){
-
-    icalcomponent *c;
-
-    struct icaltimetype t = icaltime_from_string("20000101T120000Z");
-
-    t.day += i;
-
-    icaltime_normalize(t);
-
-    c =  icalcomponent_vanew(
-	ICAL_VCALENDAR_COMPONENT,
-	icalproperty_new_method(ICAL_METHOD_REQUEST),
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    icalproperty_new_dtstart(t),
-	    0),
-	0);
-
-    assert(c != 0);
-
-    return c;
-
-}
-void test_fileset()
-{
-    icalset *fs;
-    icalcomponent *c;
-    int i;
-    int comp_count = 0;
-    char *path = "test_fileset.ics";
-    icalgauge  *g = icalgauge_new_from_sql(
-	"SELECT * FROM VEVENT WHERE DTSTART > '20000103T120000Z' AND DTSTART <= '20000106T120000Z'", 0);
-
-    ok("icalgauge_new_from_sql()", (g!=NULL));
-
-    unlink(path);
-
-    fs = icalfileset_new(path);
-    
-    ok("icalfileset_new()", (fs!=NULL));
-    assert(fs != 0);
-
-    for (i = 0; i!= 10; i++){
-	c = make_component(i);
-	icalfileset_add_component(fs,c);
-    }
-
-    icalfileset_commit(fs);
-
-    icalset_free(fs);
-    /** reopen fileset.ics **/
-    fs = icalfileset_new(path);
-
-    if (VERBOSE) printf("== No Selections \n");
-
-    comp_count = 0;
-    for (c = icalfileset_get_first_component(fs);
-	 c != 0;
-	 c = icalfileset_get_next_component(fs)){
-	struct icaltimetype t = icalcomponent_get_dtstart(c);
-	comp_count++;
-	if (VERBOSE) printf("%s\n",icaltime_as_ctime(t));
-    }
-    int_is("icalfileset get components",comp_count, 10);
-
-    icalfileset_select(fs,g);
-
-    if (VERBOSE) printf("\n== DTSTART > '20000103T120000Z' AND DTSTART <= '20000106T120000Z' \n");
-
-    comp_count = 0;
-    for (c = icalfileset_get_first_component(fs);
-	 c != 0;
-	 c = icalfileset_get_next_component(fs)){
-	struct icaltimetype t = icalcomponent_get_dtstart(c);
-	comp_count++;
-	if (VERBOSE) printf("%s\n",icaltime_as_ctime(t));
-    }
-    int_is("icalfileset get components with gauge",comp_count, 3);
-
-    icalset_free(fs);
-
-	/*icalgauge_free(g);*/
-    
-}
-
-void microsleep(int us)
-{
-#ifndef WIN32
-    struct timeval tv;
-
-    tv.tv_sec = 0;
-    tv.tv_usec = us;
-
-    select(0,0,0,0,&tv);
-#else
-	Sleep(us);
-#endif
-}
-
-
-void test_file_locks()
-{
-#ifndef WIN32
-    pid_t pid;
-    char *path = "test_fileset_locktest.ics";
-    icalset *fs;
-    icalcomponent *c, *c2;
-    struct icaldurationtype d;
-    int i;
-    int final,sec;
-
-    icalerror_clear_errno();
-
-    unlink(path);
-
-    fs = icalfileset_new(path);
-
-    if(icalfileset_get_first_component(fs)==0){
-	c = make_component(0);
-	
-	d = icaldurationtype_from_int(1);
-	
-	icalcomponent_set_duration(c,d);
-	
-	icalfileset_add_component(fs,c);
-	
-	c2 = icalcomponent_new_clone(c);
-	
-	icalfileset_add_component(fs,c2);
-	
-	icalfileset_commit(fs);
-    }
-    
-    icalset_free(fs);
-    
-    assert(icalerrno == ICAL_NO_ERROR);
-    
-    pid = fork();
-    
-    assert(pid >= 0);
-    
-    if(pid == 0){
-	/*child*/
-	int i;
-
-	microsleep(rand()/(RAND_MAX/100));
-
-	for(i = 0; i< 50; i++){
-	    fs = icalfileset_new(path);
-
-
-	    assert(fs != 0);
-
-	    c = icalfileset_get_first_component(fs);
-
-	    assert(c!=0);
-	   
-	    d = icalcomponent_get_duration(c);
-	    d = icaldurationtype_from_int(icaldurationtype_as_int(d)+1);
-	    
-	    icalcomponent_set_duration(c,d);
-	    icalcomponent_set_summary(c,"Child");	  
-  
-	    c2 = icalcomponent_new_clone(c);
-	    icalcomponent_set_summary(c2,"Child");
-	    icalfileset_add_component(fs,c2);
-
-	    icalfileset_mark(fs);
-	    icalfileset_commit(fs);
-
-	    icalset_free(fs);
-
-	    microsleep(rand()/(RAND_MAX/20));
-
-
-	}
-
-	exit(0);
-
-    } else {
-	/* parent */
-	int i;
-	
-	for(i = 0; i< 50; i++){
-	    fs = icalfileset_new(path);
-
-	    assert(fs != 0);
-
-	    c = icalfileset_get_first_component(fs);
-	    
-	    assert(c!=0);
-
-	    d = icalcomponent_get_duration(c);
-	    d = icaldurationtype_from_int(icaldurationtype_as_int(d)+1);
-	    
-	    icalcomponent_set_duration(c,d);
-	    icalcomponent_set_summary(c,"Parent");
-
-	    c2 = icalcomponent_new_clone(c);
-	    icalcomponent_set_summary(c2,"Parent");
-	    icalfileset_add_component(fs,c2);
-
-	    icalfileset_mark(fs);
-	    icalfileset_commit(fs);
-	    icalset_free(fs);
-
-	    putc('.',stdout);
-	    fflush(stdout);
-
-	}
-    }
-
-    assert(waitpid(pid,0,0)==pid);
-	
-
-    fs = icalfileset_new(path);
-    
-    i=1;
-
-    c = icalfileset_get_first_component(fs);
-    final = icaldurationtype_as_int(icalcomponent_get_duration(c));
-    for (c = icalfileset_get_next_component(fs);
-	 c != 0;
-	 c = icalfileset_get_next_component(fs)){
-	struct icaldurationtype d = icalcomponent_get_duration(c);
-	sec = icaldurationtype_as_int(d);
-
-	/*printf("%d,%d ",i,sec);*/
-	assert(i == sec);
-	i++;
-    }
-
-    printf("\nFinal: %d\n",final);
-
-    
-    assert(sec == final);
-#endif
-}
-
-void test_action()
-{
-    icalcomponent *c;
-    icalproperty *p;
-    char *str;
-
-    static const char test_icalcomp_str[] =
-"BEGIN:VEVENT\n"
-"ACTION:EMAIL\n"
-"ACTION:PROCEDURE\n"
-"ACTION:AUDIO\n"
-"ACTION:FUBAR\n"
-"END:VEVENT\n";
-
-     
-    c = icalparser_parse_string ((char *) test_icalcomp_str);
-
-    ok("icalparser_parse_string(), ACTIONS", (c!=NULL));
-    assert(c!=0);
-    
-    str = icalcomponent_as_ical_string(c);
-    is("icalcomponent_as_ical_string()", str, ((char*) test_icalcomp_str));
-    if (VERBOSE) printf("%s\n\n",str);
-
-    p = icalcomponent_get_first_property(c,ICAL_ACTION_PROPERTY);
-
-    ok("ICAL_ACTION_EMAIL", (icalproperty_get_action(p) == ICAL_ACTION_EMAIL));
-
-    p = icalcomponent_get_next_property(c,ICAL_ACTION_PROPERTY);
-
-    ok("ICAL_ACTION_PROCEDURE", (icalproperty_get_action(p) == ICAL_ACTION_PROCEDURE));
-
-    p = icalcomponent_get_next_property(c,ICAL_ACTION_PROPERTY);
-
-    ok("ICAL_ACTION_AUDIO", (icalproperty_get_action(p) == ICAL_ACTION_AUDIO));
-
-    p = icalcomponent_get_next_property(c,ICAL_ACTION_PROPERTY);
-
-    ok("ICAL_ACTION_X", (icalproperty_get_action(p) == ICAL_ACTION_X));
-    is("ICAL_ACTION -> FUBAR", icalvalue_get_x(icalproperty_get_value(p)), "FUBAR");
-    icalcomponent_free(c);
-}
-
-        
-
-void test_trigger()
-{
-
-    struct icaltriggertype tr;
-    icalcomponent *c;
-    icalproperty *p;
-    const char* str;
-    
-    static const char test_icalcomp_str[] =
-"BEGIN:VEVENT\n"
-"TRIGGER;VALUE=DATE-TIME:19980403T120000\n"
-"TRIGGER;VALUE=DURATION:-PT15M\n"
-"TRIGGER;VALUE=DATE-TIME:19980403T120000\n"
-"TRIGGER;VALUE=DURATION:-PT15M\n"
-"END:VEVENT\n";
-  
-    
-    c = icalparser_parse_string ((char *) test_icalcomp_str);
-    ok("icalparser_parse_string()", (c!= NULL));
-    assert(c!=NULL);
-    
-    is("parsed triggers", icalcomponent_as_ical_string(c), (char*)test_icalcomp_str);
-
-    for(p = icalcomponent_get_first_property(c,ICAL_TRIGGER_PROPERTY);
-	p != 0;
-	p = icalcomponent_get_next_property(c,ICAL_TRIGGER_PROPERTY)){
-	tr = icalproperty_get_trigger(p);
-
-	if(!icaltime_is_null_time(tr.time)){
-	  if (VERBOSE) printf("value=DATE-TIME:%s\n", icaltime_as_ical_string(tr.time));
-	} else {
-	  if (VERBOSE) printf("value=DURATION:%s\n", icaldurationtype_as_ical_string(tr.duration));
-	}   
-    }
-
-    icalcomponent_free(c);
-
-    /* Trigger, as a DATETIME */
-    tr.duration = icaldurationtype_null_duration();
-    tr.time = icaltime_from_string("19970101T120000");
-    p = icalproperty_new_trigger(tr);
-    str = icalproperty_as_ical_string(p);
-
-    is("TRIGGER;VALUE=DATE-TIME:19970101T120000", str, "TRIGGER;VALUE=DATE-TIME:19970101T120000\n");
-    icalproperty_free(p);
-
-    /* TRIGGER, as a DURATION */
-    tr.time = icaltime_null_time();
-    tr.duration = icaldurationtype_from_string("P3DT3H50M45S");
-    p = icalproperty_new_trigger(tr);
-    str = icalproperty_as_ical_string(p);
-    
-    is("TRIGGER;VALUE=DURATION:P3DT3H50M45S", str, "TRIGGER;VALUE=DURATION:P3DT3H50M45S\n");
-    icalproperty_free(p);
-
-    /* TRIGGER, as a DATETIME, VALUE=DATETIME*/
-    tr.duration = icaldurationtype_null_duration();
-    tr.time = icaltime_from_string("19970101T120000");
-    p = icalproperty_new_trigger(tr);
-    icalproperty_add_parameter(p,icalparameter_new_value( ICAL_VALUE_DATETIME));
-    str = icalproperty_as_ical_string(p);
-
-    is("TRIGGER;VALUE=DATE-TIME:19970101T120000", str, "TRIGGER;VALUE=DATE-TIME:19970101T120000\n");
-    icalproperty_free(p);
-
-    /*TRIGGER, as a DURATION, VALUE=DATETIME */
-    tr.time = icaltime_null_time();
-    tr.duration = icaldurationtype_from_string("P3DT3H50M45S");
-    p = icalproperty_new_trigger(tr);
-    icalproperty_add_parameter(p,icalparameter_new_value( ICAL_VALUE_DATETIME ));
-
-    str = icalproperty_as_ical_string(p);
-    
-    is("TRIGGER;VALUE=DURATION:P3DT3H50M45S", str, "TRIGGER;VALUE=DURATION:P3DT3H50M45S\n");
-    icalproperty_free(p);
-
-    /* TRIGGER, as a DATETIME, VALUE=DURATION*/
-    tr.duration = icaldurationtype_null_duration();
-    tr.time = icaltime_from_string("19970101T120000");
-    p = icalproperty_new_trigger(tr);
-    icalproperty_add_parameter(p,icalparameter_new_value( ICAL_VALUE_DURATION));
-    str = icalproperty_as_ical_string(p);
-
-    is("TRIGGER;VALUE=DATE-TIME:19970101T120000", str, "TRIGGER;VALUE=DATE-TIME:19970101T120000\n");
-    icalproperty_free(p);
-
-    /*TRIGGER, as a DURATION, VALUE=DURATION */
-    tr.time = icaltime_null_time();
-    tr.duration = icaldurationtype_from_string("P3DT3H50M45S");
-    p = icalproperty_new_trigger(tr);
-    icalproperty_add_parameter(p,icalparameter_new_value( ICAL_VALUE_DURATION));
-
-    str = icalproperty_as_ical_string(p);
-    
-    is("TRIGGER;VALUE=DURATION:P3DT3H50M45S", str, "TRIGGER;VALUE=DURATION:P3DT3H50M45S\n");
-    icalproperty_free(p);
-
-
-   /* TRIGGER, as a DATETIME, VALUE=BINARY  */
-    tr.duration = icaldurationtype_null_duration();
-    tr.time = icaltime_from_string("19970101T120000");
-    p = icalproperty_new_trigger(tr);
-    icalproperty_add_parameter(p,icalparameter_new_value(ICAL_VALUE_BINARY));
-    str = icalproperty_as_ical_string(p);
-
-    is("TRIGGER;VALUE=DATE-TIME:19970101T120000", str, "TRIGGER;VALUE=DATE-TIME:19970101T120000\n");
-    icalproperty_free(p);
-
-    /*TRIGGER, as a DURATION, VALUE=BINARY   */
-    tr.time = icaltime_null_time();
-    tr.duration = icaldurationtype_from_string("P3DT3H50M45S");
-    p = icalproperty_new_trigger(tr);
-    icalproperty_add_parameter(p,icalparameter_new_value(ICAL_VALUE_BINARY));
-
-    str = icalproperty_as_ical_string(p);
-    
-    is("TRIGGER;VALUE=DURATION:P3DT3H50M45S", str, "TRIGGER;VALUE=DURATION:P3DT3H50M45S\n");
-    icalproperty_free(p);
-}
-
-
-void test_rdate()
-{
-
-    struct icaldatetimeperiodtype dtp;
-    icalproperty *p;
-    const char* str;
-    struct icalperiodtype period;
-
-    period.start = icaltime_from_string("19970101T120000");
-    period.end = icaltime_null_time();
-    period.duration = icaldurationtype_from_string("PT3H10M15S");
-
-    /* RDATE, as DATE-TIME */
-    dtp.time = icaltime_from_string("19970101T120000");
-    dtp.period = icalperiodtype_null_period();
-    p = icalproperty_new_rdate(dtp);
-    str = icalproperty_as_ical_string(p);
-
-    is("RDATE as DATE-TIME",
-       "RDATE;VALUE=DATE-TIME:19970101T120000\n",str);
-    icalproperty_free(p); 
-
-    /* RDATE, as PERIOD */
-    dtp.time = icaltime_null_time();
-    dtp.period = period;
-    p = icalproperty_new_rdate(dtp);
-
-    str = icalproperty_as_ical_string(p);
-    is("RDATE, as PERIOD", "RDATE;VALUE=PERIOD:19970101T120000/PT3H10M15S\n",str);
-    icalproperty_free(p); 
-
-    /* RDATE, as DATE-TIME, VALUE=DATE-TIME */
-    dtp.time = icaltime_from_string("19970101T120000");
-    dtp.period = icalperiodtype_null_period();
-    p = icalproperty_new_rdate(dtp);
-    icalproperty_add_parameter(p,icalparameter_new_value(ICAL_VALUE_DATETIME));
-    str = icalproperty_as_ical_string(p);
-
-    is("RDATE, as DATE-TIME, VALUE=DATE-TIME",
-       "RDATE;VALUE=DATE-TIME:19970101T120000\n",str);
-    icalproperty_free(p); 
-
-
-    /* RDATE, as PERIOD, VALUE=DATE-TIME */
-    dtp.time = icaltime_null_time();
-    dtp.period = period;
-    p = icalproperty_new_rdate(dtp);
-    icalproperty_add_parameter(p,icalparameter_new_value(ICAL_VALUE_DATETIME));
-    str = icalproperty_as_ical_string(p);
-    is("RDATE, as PERIOD, VALUE=DATE-TIME",
-       "RDATE;VALUE=PERIOD:19970101T120000/PT3H10M15S\n",str);
-    icalproperty_free(p); 
-
-
-    /* RDATE, as DATE-TIME, VALUE=PERIOD */
-    dtp.time = icaltime_from_string("19970101T120000");
-    dtp.period = icalperiodtype_null_period();
-    p = icalproperty_new_rdate(dtp);
-    icalproperty_add_parameter(p,icalparameter_new_value(ICAL_VALUE_PERIOD));
-    str = icalproperty_as_ical_string(p);
-
-    is("RDATE, as DATE-TIME, VALUE=PERIOD",
-       "RDATE;VALUE=DATE-TIME:19970101T120000\n",str);
-    icalproperty_free(p); 
-
-
-    /* RDATE, as PERIOD, VALUE=PERIOD */
-    dtp.time = icaltime_null_time();
-    dtp.period = period;
-    p = icalproperty_new_rdate(dtp);
-    icalproperty_add_parameter(p,icalparameter_new_value(ICAL_VALUE_PERIOD));
-    str = icalproperty_as_ical_string(p);
-
-    is("RDATE, as PERIOD, VALUE=PERIOD",
-       "RDATE;VALUE=PERIOD:19970101T120000/PT3H10M15S\n",str);
-    icalproperty_free(p); 
-
-
-    /* RDATE, as DATE-TIME, VALUE=BINARY */
-    dtp.time = icaltime_from_string("19970101T120000");
-    dtp.period = icalperiodtype_null_period();
-    p = icalproperty_new_rdate(dtp);
-    icalproperty_add_parameter(p,icalparameter_new_value(ICAL_VALUE_BINARY));
-    str = icalproperty_as_ical_string(p);
-    
-    is("RDATE, as DATE-TIME, VALUE=BINARY",
-       "RDATE;VALUE=DATE-TIME:19970101T120000\n",str);
-    icalproperty_free(p); 
-
-
-    /* RDATE, as PERIOD, VALUE=BINARY */
-    dtp.time = icaltime_null_time();
-    dtp.period = period;
-    p = icalproperty_new_rdate(dtp);
-    icalproperty_add_parameter(p,icalparameter_new_value(ICAL_VALUE_BINARY));
-    str = icalproperty_as_ical_string(p);
-
-    is("RDAE, as PERIOD, VALUE=BINARY",
-       "RDATE;VALUE=PERIOD:19970101T120000/PT3H10M15S\n",str);
-    icalproperty_free(p); 
-}
-
-
-void test_langbind()
-{
-    icalcomponent *c, *inner; 
-    icalproperty *p;
-    char *test_str_parsed;
-    static const char test_str[] =
-"BEGIN:VEVENT\n"
-"ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MAILTO:employee-A@host.com\n"
-"COMMENT: Comment that \n spans a line\n"
-"COMMENT: Comment with \"quotable\" \'characters\' and other \t bad magic \n things \f Yeah.\n"
-"DTSTART:19970101T120000\n"
-"DTSTART:19970101T120000Z\n"
-"DTSTART:19970101\n"
-"DURATION:P3DT4H25M\n"
-"FREEBUSY:19970101T120000/19970101T120000\n"
-"FREEBUSY:19970101T120000/P3DT4H25M\n"
-"END:VEVENT\n";
-
-    static const char *test_str_parsed_good = 
-"BEGIN:VEVENT\n"
-"ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MAILTO:\n"
-" employee-A@host.com\n"
-"COMMENT: Comment that spans a line\n"
-"COMMENT: Comment with \\\"quotable\\\" 'characters' and other \\t bad magic \n"
-" things \\f Yeah.\n"
-"DTSTART:19970101T120000\n"
-"DTSTART:19970101T120000Z\n"
-"DTSTART;VALUE=DATE:19970101\n"
-"DURATION:P3DT4H25M\n"
-"FREEBUSY:19970101T120000/19970101T120000\n"
-"FREEBUSY:19970101T120000/P3DT4H25M\n"
-"END:VEVENT\n";
-
-    if (VERBOSE) printf("%s\n",test_str);
-
-    c = icalparser_parse_string(test_str);
-
-    ok("icalparser_parse_string()", (c!=NULL));
-    assert(c != NULL);
-
-    test_str_parsed = icalcomponent_as_ical_string(c);
-
-    is("parsed version with bad chars, etc",
-       test_str_parsed,
-       test_str_parsed_good);
-
-    
-    inner = icalcomponent_get_inner(c);
-
-    for(
-	p = icallangbind_get_first_property(inner,"ANY");
-	p != 0;
-	p = icallangbind_get_next_property(inner,"ANY")
-	) { 
-
-      const char *str = icallangbind_property_eval_string(p,":");
-      /** TODO add tests **/
-      if (VERBOSE) printf("%s\n",str);
-    }
-
-
-    p = icalcomponent_get_first_property(inner,ICAL_ATTENDEE_PROPERTY);
-
-    icalproperty_set_parameter_from_string(p,"CUTYPE","INDIVIDUAL");
-
-    is ("Set attendee parameter",
-	icalproperty_as_ical_string(p),
-	"ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=INDIVIDUAL:MAILTO:\n"
-	" employee-A@host.com\n");
- 
-    icalproperty_set_value_from_string(p,"mary@foo.org","TEXT");
-
-    is ("Set attendee parameter value",
-	icalproperty_as_ical_string(p),
-	"ATTENDEE;VALUE=TEXT;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=INDIVIDUAL:\n"
-" mary@foo.org\n");
-
-	icalcomponent_free(c);
-}
-
-void test_property_parse()
-{
-    icalproperty *p;
-    const char *str;
-
-    p= icalproperty_new_from_string(
-                         "ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MAILTO:employee-A@host.com");
-
-    ok("icalproperty_from_string(), ATTENDEE", (p != 0));
-    assert (p !=  0);
-
-    str = icalproperty_as_ical_string(p);
-    if (VERBOSE) printf("%s\n",str);
-
-    icalproperty_free(p);
-
-    p= icalproperty_new_from_string("DTSTART:19970101T120000Z\n");
-
-    ok("icalproperty_from_string(), simple DTSTART", (p != 0));
-    assert (p !=  0);
-
-    str = icalproperty_as_ical_string(p);
-    if (VERBOSE) printf("%s\n",str);
-    
-    icalproperty_free(p);
-
-}
-
-
-void test_value_parameter() 
-{
-
-    icalcomponent *c;
-    icalproperty *p;
-    icalparameter *param;
-    
-    static const char test_icalcomp_str[] =
-"BEGIN:VEVENT\n"
-"DTSTART;VALUE=DATE-TIME:19971123T123000\n"
-"DTSTART;VALUE=DATE:19971123\n"
-"DTSTART;VALUE=FOO:19971123T123000\n"
-"END:VEVENT\n";
-     
-    c = icalparser_parse_string ((char *) test_icalcomp_str);
-    ok("icalparser_parse_string()", (c != NULL));
-    if (!c) {
-	exit (EXIT_FAILURE);
-    }
-
-    if (VERBOSE) printf("%s",icalcomponent_as_ical_string(c));
-
-    p = icalcomponent_get_first_property(c,ICAL_DTSTART_PROPERTY);
-    param = icalproperty_get_first_parameter(p,ICAL_VALUE_PARAMETER);
-    
-    ok("icalproperty_get_value()", (icalparameter_get_value(param) == ICAL_VALUE_DATETIME));
-
-    p = icalcomponent_get_next_property(c,ICAL_DTSTART_PROPERTY);
-    param = icalproperty_get_first_parameter(p,ICAL_VALUE_PARAMETER);
-    ok("icalproperty_get_first_parameter()",(icalparameter_get_value(param) == ICAL_VALUE_DATE));
-
-    icalcomponent_free(c);
-}
-
-
-void test_x_parameter()
-{
-    icalproperty *p;
-
-    p= icalproperty_new_from_string(
-       "COMMENT;X-A=1;X-B=2: This is a note");
-
-    if (VERBOSE) printf("%s\n",icalproperty_as_ical_string(p));
-
-    ok("COMMENT property",(icalproperty_isa(p) == ICAL_COMMENT_PROPERTY));
-    is("COMMENT parses param", icalproperty_get_comment(p)," This is a note");
-
-    icalproperty_set_parameter_from_string(p,"X-LIES", "no");
-    icalproperty_set_parameter_from_string(p,"X-LAUGHS", "big");
-    icalproperty_set_parameter_from_string(p,"X-TRUTH", "yes");
-    icalproperty_set_parameter_from_string(p,"X-HUMOUR", "bad");
-
-    if (VERBOSE) printf("%s\n",icalproperty_as_ical_string(p));
-
-    is("Check X-LIES", icalproperty_get_parameter_as_string(p, "X-LIES"), "no");
-    is("Check X-LAUGHS", icalproperty_get_parameter_as_string(p, "X-LAUGHS"), "big");
-    is("Check X-TRUTH", icalproperty_get_parameter_as_string(p, "X-TRUTH"), "yes");
-    is("Check X-HUMOUR", icalproperty_get_parameter_as_string(p, "X-HUMOUR"), "bad");
-
-    icalproperty_free(p);
-}
-
-
-
-void test_x_property() 
-{
-    icalproperty *p;
-    
-    p= icalproperty_new_from_string(
-       "X-LIC-PROPERTY: This is a note");
-
-    if (VERBOSE && p) printf("%s\n",icalproperty_as_ical_string(p));
-
-    ok("x-property is correct kind",(icalproperty_isa(p) == ICAL_X_PROPERTY));
-    is("icalproperty_get_x_name() works",
-       icalproperty_get_x_name(p),"X-LIC-PROPERTY");
-    is("icalproperty_get_x() works",
-       icalproperty_get_x(p)," This is a note");
-
-    icalproperty_free(p);
-}
-
-void test_utcoffset()
-{
-    icalproperty *p;
-
-    p = icalproperty_new_from_string("TZOFFSETFROM:-001608");
-    ok("parse TZOOFSETFROM:-001608", (p!=NULL));
-
-    if (VERBOSE && p) printf("%s\n",icalproperty_as_ical_string(p));
-
-    if (p) icalproperty_free(p);
-}
-
-void test_attach()
-{
-    icalcomponent *c;
-
-    static const char test_icalcomp_str[] =
-"BEGIN:VEVENT\n"
-"ATTACH:CID:jsmith.part3.960817T083000.xyzMain@host1.com\n"
-"ATTACH:FMTTYPE=application/postscript;ftp://xyzCorp.com/pub/reports/r-960812.ps\n"
-"END:VEVENT\n";
-
-    c = icalparser_parse_string ((char *) test_icalcomp_str);
-    ok("parse simple attachment", (c != NULL));
-
-    if (VERBOSE) printf("%s",icalcomponent_as_ical_string(c));
-
-    if (c) icalcomponent_free(c);
-}
-
-
-void test_vcal(void)
-{
-  VObject *vcal = 0;
-  icalcomponent *comp;
-  char* file = "../../test-data/user-cal.vcf";
-
-  vcal = Parse_MIME_FromFileName(file);
-    
-  ok("Parsing ../../test-data/user-cal.vcf", (vcal != 0));
-
-  comp = icalvcal_convert(vcal);
-
-  ok("Converting to ical component", (comp != 0));
-  
-  if (VERBOSE && comp)
-    printf("%s\n",icalcomponent_as_ical_string(comp));
-
-  if (comp) icalcomponent_free(comp);
-  if (vcal) deleteVObject(vcal);
-}
-
-int main(int argc, char *argv[])
-{
-    int c;
-    extern char *optarg;
-    extern int optopt;
-    int errflg=0;
-    char* program_name = strrchr(argv[0],'/');
-    int do_test = 0;
-    int do_header = 0;
-
-    set_zone_directory("../../zoneinfo");
-    putenv("TZ=");
-
-    test_start(0);
-
-
-#ifndef WIN32
-    while ((c = getopt(argc, argv, "lvq")) != -1) {
-      switch (c) {
-      case 'v': {
-	VERBOSE = 1;
-	break;
-      }
-      case 'q': {
-	QUIET = 1;
-	break;
-      }
-      case 'l': {
-	do_header = 1;;
-      }
-      case '?': {
-	errflg++;
-      }
-      }
-    } 
-    if (optind < argc) {
-      do_test = atoi(argv[argc-1]);
-    }
-#else
-    if (argc>1)
-      do_test = atoi(argv[2]);
-
-#endif
-    
-    
-    test_run("Test time parser functions", test_time_parser, do_test, do_header);
-    test_run("Test time", test_time, do_test, do_header);
-    test_run("Test day of Year", test_doy, do_test, do_header);
-    test_run("Test duration", test_duration, do_test, do_header);
-    test_run("Test period",      test_period, do_test, do_header);
-    test_run("Test DTSTART",      test_dtstart, do_test, do_header);
-    test_run("Test day of year of week start",      test_start_of_week, do_test, do_header);
-    test_run("Test recur parser",      test_recur_parser, do_test, do_header);
-    test_run("Test recur", test_recur, do_test, do_header);
-    test_run("Test Recurring Events File", test_recur_file, do_test, do_header);
-    test_run("Test parameter bug", test_recur_parameter_bug, do_test, do_header);
-    test_run("Test Array Expansion", test_expand_recurrence, do_test, do_header);
-    test_run("Test Free/Busy lists", test_fblist, do_test, do_header);
-    test_run("Test Overlaps", test_overlaps, do_test, do_header);
-    
-    test_run("Test Span", test_icalcomponent_get_span, do_test, do_header);
-    test_run("Test Gauge SQL", test_gauge_sql, do_test, do_header);
-    test_run("Test Gauge Compare", test_gauge_compare, do_test, do_header);
-    test_run("Test File Set", test_fileset, do_test, do_header);
-    test_run("Test File Set (Extended)", test_fileset_extended, do_test, do_header);
-    test_run("Test Dir Set", test_dirset, do_test, do_header);
-    test_run("Test Dir Set (Extended)", test_dirset_extended, do_test, do_header);
-    
-    test_run("Test File Locks", test_file_locks, do_test, do_header);
-    test_run("Test X Props and Params", test_x, do_test, do_header);
-    test_run("Test Trigger", test_trigger, do_test, do_header);
-    test_run("Test Restriction", test_restriction, do_test, do_header);
-    test_run("Test RDATE", test_rdate, do_test, do_header);
-    test_run("Test language binding", test_langbind, do_test, do_header);
-    test_run("Test property parser", test_property_parse, do_test, do_header);
-    test_run("Test Action", test_action, do_test, do_header);
-    test_run("Test Value Parameter", test_value_parameter, do_test, do_header);
-    test_run("Test X property", test_x_property, do_test, do_header);
-    test_run("Test X parameter", test_x_parameter, do_test, do_header);
-    test_run("Test request status", test_requeststat, do_test, do_header);
-    test_run("Test UTC-OFFSET", test_utcoffset, do_test, do_header);
-    test_run("Test Values", test_values, do_test, do_header);
-    test_run("Test Parameters", test_parameters, do_test, do_header);
-    test_run("Test Properties", test_properties, do_test, do_header);
-    test_run("Test Components", test_components, do_test, do_header);
-    test_run("Test Convenience", test_convenience, do_test, do_header);
-    test_run("Test classify ", test_classify, do_test, do_header);
-    test_run("Test Iterators", test_iterators, do_test, do_header);
-    test_run("Test strings", test_strings, do_test, do_header);
-    test_run("Test Compare", test_compare, do_test, do_header);
-    test_run("Create Simple Component", create_simple_component, do_test, do_header);
-    test_run("Create Components", create_new_component, do_test, do_header);
-    test_run("Create Components with vaargs", create_new_component_with_va_args, do_test, do_header);
-    test_run("Test Memory", test_memory, do_test, do_header);
-    test_run("Test Attachment", test_attach, do_test, do_header);
-    test_run("Test icalcalendar", test_calendar, do_test, do_header);
-    test_run("Test Dirset", test_dirset, do_test, do_header);
-    test_run("Test vCal to iCal conversion", test_vcal, do_test, do_header);
-    test_run("Test UTF-8 Handling", test_utf8, do_test, do_header);
-
-    /** OPTIONAL TESTS go here... **/
-
-#ifdef WITH_CXX_BINDINGS
-    test_run("Test C++ API", test_cxx, do_test, do_header);
-#endif
-
-#ifdef WITH_BDB
-    test_run("Test BDB Set", test_bdbset, do_test, do_header);
-#endif
-
-
-    icaltimezone_free_builtin_timezones();
-    icalmemory_free_ring();
-    free_zone_directory();
-
-    test_end();
-
-    return 0;
-}
-
-
diff --git a/libical/src/test/regression.h b/libical/src/test/regression.h
deleted file mode 100644
index 633cd3295d..0000000000
--- a/libical/src/test/regression.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-extern int VERBOSE;
-extern int QUIET;
-
-/* regression-component.c */
-void create_new_component(void);
-void create_new_component_with_va_args(void);
-void create_simple_component(void);
-void test_icalcomponent_get_span(void);
-void create_new_component_with_va_args(void);
-
-/* regression-classify.c */
-void test_classify(void);
-
-/* regression-recur.c */
-void test_recur_file(void);
-
-/* regression-cxx.c */
-void test_cxx(void);
-
-/* regression-storage.c */
-void test_fileset_extended(void);
-void test_dirset_extended(void);
-void test_bdbset(void);
-
-/* regression-utils.c */
-const char* ical_timet_string(const time_t t);
-const char* ictt_as_string(struct icaltimetype t);
-char* icaltime_as_ctime(struct icaltimetype t);
-
-
-void _ok(char*name, int result, char*file, int linenum, char *test);
-void _is(char* test_name, const char* str1, const char* str2, char *file, int linenum);
-void _int_is(char* test_name, int i1, int i2, char *file, int linenum);
-#define ok(TEST, EX) (_ok(TEST, EX, __FILE__, __LINE__, #EX))
-#define is(S1, S2, EX) (_is(S1, S2, EX, __FILE__, __LINE__))
-#define int_is(I1, I2, EX) (_int_is(I1, I2, EX, __FILE__, __LINE__))
-void test_header(char*title, int test_set);
-void test_start(int);
-void test_end(void);
-void test_run(char *test_name, 
-	      void (*test_fcn)(void), 
-	      int do_test, int headeronly);
-
-
-
-
-#ifdef  __cplusplus
-}
-#endif
diff --git a/libical/src/test/storage.c b/libical/src/test/storage.c
deleted file mode 100644
index acd9d95734..0000000000
--- a/libical/src/test/storage.c
+++ /dev/null
@@ -1,873 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: storage.c
-  CREATOR: eric 03 April 1999
-  
-  DESCRIPTION:
-  
-  $Id$
-  $Locker$
-
-  (C) COPYRIGHT 1999 Eric Busboom 
-  http://www.softwarestudio.org
-
-  The contents of this file are subject to the Mozilla Public License
-  Version 1.0 (the "License"); you may not use this file except in
-  compliance with the License. You may obtain a copy of the License at
-  http://www.mozilla.org/MPL/
- 
-  Software distributed under the License is distributed on an "AS IS"
-  basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-  the License for the specific language governing rights and
-  limitations under the License.
-
-  The original author is Eric Busboom
-  The original code is usecases.c
-
-    
-  ======================================================================*/
-
-#include <libical/ical.h>
-#include <assert.h>
-#include <string.h> /* for strdup */
-#include <stdlib.h> /* for malloc */
-#include <stdio.h> /* for printf */
-#include <time.h> /* for time() */
-#include "icalmemory.h"
-#include "icaldirset.h"
-#include "icalfileset.h"
-#ifdef WITH_BDB4
-#include "icalbdbset.h"
-#endif
-#include "icalerror.h"
-#include "icalrestriction.h"
-#include "icalcalendar.h"
-
-#define OUTPUT_FILE "filesetout.ics"
-#define DATABASE "calendar.db"
-
-/* define sample calendar struct */
-struct calendar {
-  int ID;
-  int total_size;
-
-  /* offsets */
-  int total_size_offset;
-  int vcalendar_size_offset;
-  int vcalendar_offset;
-  int title_size_offset;
-  int title_offset;
-
-  /* data */
-  int vcalendar_size;
-  char *vcalendar;
-
-  int title_size;
-  char *title;
-
-};
-
-int vcalendar_init(struct calendar **cal, char *vcalendar, char *title);
-
-#ifdef WITH_BDB4
-int get_title(DB *dbp, const DBT *pkey, const DBT *pdata, DBT *skey);
-char * parse_vcalendar(const DBT *dbt) ;
-#endif
-
-char * pack_calendar(struct calendar *cal, int size);
-struct calendar * unpack_calendar(char *str, int size);
-
-char str[] = "BEGIN:VCALENDAR\n\
-PRODID:\"-//RDU Software//NONSGML HandCal//EN\"\n\
-VERSION:2.0\n\
-BEGIN:VTIMEZONE\n\
-TZID:US-Eastern\n\
-BEGIN:STANDARD\n\
-DTSTART:19981025T020000\n\
-RDATE:19981025T020000\n\
-TZOFFSETFROM:-0400\n\
-TZOFFSETTO:-0500\n\
-TZNAME:EST\n\
-END:STANDARD\n\
-BEGIN:DAYLIGHT\n\
-DTSTART:19990404T020000\n\
-RDATE:19990404T020000\n\
-TZOFFSETFROM:-0500\n\
-TZOFFSETTO:-0400\n\
-TZNAME:EDT\n\
-END:DAYLIGHT\n\
-END:VTIMEZONE\n\
-BEGIN:VEVENT\n\
-DTSTAMP:19980309T231000Z\n\
-UID:guid-1.host1.com\n\
-ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com\n\
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MAILTO:employee-A@host.com\n\
-DESCRIPTION:Project XYZ Review Meeting\n\
-CATEGORIES:MEETING\n\
-CLASS:PUBLIC\n\
-CREATED:19980309T130000Z\n\
-SUMMARY:XYZ Project Review\n\
-DTSTART;TZID=US-Eastern:19980312T083000\n\
-DTEND;TZID=US-Eastern:19980312T093000\n\
-LOCATION:1CP Conference Room 4350\n\
-END:VEVENT\n\
-BEGIN:BOOGA\n\
-DTSTAMP:19980309T231000Z\n\
-X-LIC-FOO:Booga\n\
-DTSTOMP:19980309T231000Z\n\
-UID:guid-1.host1.com\n\
-END:BOOGA\n\
-END:VCALENDAR";
-
-char str2[] = "BEGIN:VCALENDAR\n\
-PRODID:\"-//RDU Software//NONSGML HandCal//EN\"\n\
-VERSION:2.0\n\
-BEGIN:VEVENT\n\
-DTSTAMP:19980309T231000Z\n\
-UID:guid-1.host1.com\n\
-ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com\n\
-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:MAILTO:employee-A@host.com\n\
-DESCRIPTION:Project XYZ Review Meeting\n\
-CATEGORIES:MEETING\n\
-CLASS:PUBLIC\n\
-CREATED:19980309T130000Z\n\
-SUMMARY:XYZ Project Review\n\
-DTSTART;TZID=US-Eastern:19980312T083000\n\
-DTEND;TZID=US-Eastern:19980312T093000\n\
-LOCATION:1CP Conference Room 4350\n\
-END:VEVENT\n\
-END:VCALENDAR\n\
-";
-
-void test_fileset()
-{
-    icalfileset *cout;
-    int month = 0;
-    int count=0;
-    struct icaltimetype start, end;
-    icalcomponent *c,*clone, *itr;
-
-    start = icaltime_from_timet( time(0),0);
-    end = start;
-    end.hour++;
-
-    cout = icalfileset_new(OUTPUT_FILE);
-    assert(cout != 0);
-
-    c = icalparser_parse_string(str2);
-    assert(c != 0);
-
-    /* Add data to the file */
-
-    for(month = 1; month < 10; month++){
-	icalcomponent *event;
-	icalproperty *dtstart, *dtend;
-
-        cout = icalfileset_new(OUTPUT_FILE);
-        assert(cout != 0);
-
-	start.month = month; 
-	end.month = month;
-	
-	clone = icalcomponent_new_clone(c);
-	assert(clone !=0);
-	event = icalcomponent_get_first_component(clone,ICAL_VEVENT_COMPONENT);
-	assert(event != 0);
-
-	dtstart = icalcomponent_get_first_property(event,ICAL_DTSTART_PROPERTY);
-	assert(dtstart!=0);
-	icalproperty_set_dtstart(dtstart,start);
-        
-	dtend = icalcomponent_get_first_property(event,ICAL_DTEND_PROPERTY);
-	assert(dtend!=0);
-	icalproperty_set_dtend(dtend,end);
-	
-	icalfileset_add_component(cout,clone);
-	icalfileset_commit(cout);
-
-        icalset_free(cout);
-
-    }
-
-    /* Print them out */
-
-    cout = icalfileset_new(OUTPUT_FILE);
-    assert(cout != 0);
-    
-    for (itr = icalfileset_get_first_component(cout);
-         itr != 0;
-         itr = icalfileset_get_next_component(cout)){
-
-      icalcomponent *event;
-      icalproperty *dtstart, *dtend;
-
-      count++;
-
-      event = icalcomponent_get_first_component(itr,ICAL_VEVENT_COMPONENT);
-
-      dtstart = icalcomponent_get_first_property(event,ICAL_DTSTART_PROPERTY);
-      dtend = icalcomponent_get_first_property(event,ICAL_DTEND_PROPERTY);
-      
-      printf("%d %s %s\n",count, icalproperty_as_ical_string(dtstart),
-             icalproperty_as_ical_string(dtend));
-
-    }
-
-    /* Remove all of them */
-
-    icalset_free(cout);
-
-    cout = icalfileset_new(OUTPUT_FILE);
-    assert(cout != 0);
-    
-    for (itr = icalfileset_get_first_component(cout);
-         itr != 0;
-         itr = icalfileset_get_next_component(cout)){
-
-
-      icalfileset_remove_component(cout, itr);
-    }
-
-    icalset_free(cout);
-
-
-    /* Print them out again */
-
-    cout = icalfileset_new(OUTPUT_FILE);
-    assert(cout != 0);
-    count =0;
-    
-    for (itr = icalfileset_get_first_component(cout);
-         itr != 0;
-         itr = icalfileset_get_next_component(cout)){
-
-      icalcomponent *event;
-      icalproperty *dtstart, *dtend;
-
-      count++;
-
-      event = icalcomponent_get_first_component(itr,ICAL_VEVENT_COMPONENT);
-
-      dtstart = icalcomponent_get_first_property(event,ICAL_DTSTART_PROPERTY);
-      dtend = icalcomponent_get_first_property(event,ICAL_DTEND_PROPERTY);
-      
-      printf("%d %s %s\n",count, icalproperty_as_ical_string(dtstart),
-             icalproperty_as_ical_string(dtend));
-
-    }
-
-    icalset_free(cout);
-
-
-}
-
-/*
-   In this example, we're storing a calendar with several components
-   under the reference id "calendar_7286" and retrieving records based
-   on title, "month_1" through "month_10".  We use a number of the 
-   "optional" arguments to specify secondary indices, sub-databases
-   (i.e. having multiple databases residing within a single Berkeley
-   DB file), and keys for storage and retrieval.
-*/
-
-#ifdef WITH_BDB4
-void test_bdbset()
-{
-    icalbdbset *cout;
-    int month = 0;
-    int count=0;
-    int num_components=0;
-    int szdata_len=0;
-    int ret=0;
-    char *subdb, *szdata, *szpacked_data;
-    char uid[255];
-    struct icaltimetype start, end;
-    icalcomponent *c,*clone, *itr;
-    DB *dbp, *sdbp;
-    DBT key, data;
-    DBC *dbcp;
-
-    struct calendar *cal;
-    int cal_size;
-
-    start = icaltime_from_timet( time(0),0);
-    end = start;
-    end.hour++;
-
-    /* Note: as per the Berkeley DB ref pages: 
-     *
-     * The database argument is optional, and allows applications to
-     * have multiple databases in a single file. Although no database
-     * argument needs to be specified, it is an error to attempt to
-     * open a second database in a file that was not initially created
-     * using a database name. 
-     *
-     */
-
-    subdb = "calendar_id";
-    sdbp = 0;
-
-    /* open database, using subdb */
-    dbp = icalbdbset_database_open(DATABASE, subdb, DB_HASH);
-    sdbp = icalbdbset_secondary_open(dbp, 
-				     DATABASE, 
-				     "title", 
-				     get_title, 
-				     DB_HASH); 
-
-    c = icalparser_parse_string(str2);
-    assert(c != 0);
-
-    /* Add data to the file */
-
-    for(month = 1; month < 10; month++){
-      icalcomponent *event;
-      icalproperty *dtstart, *dtend, *location;
-
-      /* retrieve data */
-      cout = icalbdbset_new(dbp, sdbp, NULL);  
-      assert(cout != 0);
-
-      start.month = month; 
-      end.month = month;
-		
-      clone = icalcomponent_new_clone(c);
-      assert(clone !=0);
-      event = icalcomponent_get_first_component(clone,
-						ICAL_VEVENT_COMPONENT);
-      assert(event != 0);
-
-      dtstart = icalcomponent_get_first_property(event,
-						 ICAL_DTSTART_PROPERTY);
-      assert(dtstart!=0);
-      icalproperty_set_dtstart(dtstart,start);
-        
-      dtend = icalcomponent_get_first_property(event,ICAL_DTEND_PROPERTY);
-      assert(dtend!=0);
-      icalproperty_set_dtend(dtend,end);
-
-      location = icalcomponent_get_first_property(event, ICAL_LOCATION_PROPERTY);
-      assert(location!=0);
-
-#if 0
-      /* change the uid to include the month */
-      sprintf(uid, "%s_%d", icalcomponent_get_uid(clone), month);
-      icalcomponent_set_uid(clone, uid);
-#endif
-
-      icalbdbset_add_component(cout,clone);
-
-      /* commit changes */
-      icalbdbset_commit(cout);
-
-      num_components = icalcomponent_count_components(clone, ICAL_ANY_COMPONENT);
-
-      icalset_free(cout); 
-
-    }
-
-    /* try out the cursor operations */
-    memset(&key, 0, sizeof(DBT));
-    memset(&data, 0, sizeof(DBT));
-    
-    ret = icalbdbset_acquire_cursor(dbp, &dbcp);
-    ret = icalbdbset_get_first(dbcp, &key, &data);
-    ret = icalbdbset_get_next(dbcp, &key, &data);
-    ret = icalbdbset_get_last(dbcp, &key, &data);
-
-    /* Print them out */
-
-    for(month = 1, count=0; month < 10; month++){
-      char *title;
-
-      icalcomponent *event;
-      icalproperty *dtstart, *dtend;
-
-      cout = icalbdbset_new(dbp, sdbp, NULL);
-      assert(cout != 0);
-    
-      for (itr = icalbdbset_get_first_component(cout);
-	   itr != 0;
-	   itr = icalbdbset_get_next_component(cout)){
-
-	icalcomponent *event;
-	icalproperty *dtstart, *dtend;
-
-	count++;
-
-      event = icalcomponent_get_first_component(itr,ICAL_VEVENT_COMPONENT);
-
-      dtstart = icalcomponent_get_first_property(event,ICAL_DTSTART_PROPERTY);
-      dtend = icalcomponent_get_first_property(event,ICAL_DTEND_PROPERTY);
-      
-      printf("%d %s %s\n",count, icalproperty_as_ical_string(dtstart),
-             icalproperty_as_ical_string(dtend));
-
-      }
-      icalset_free(cout);
-    }
-
-    /* close database */
-    icalbdbset_database_close(dbp);
-    icalbdbset_database_close(sdbp); 
-
-    /* open database */
-    dbp = icalbdbset_database_open(DATABASE, subdb, DB_HASH);
-    sdbp = icalbdbset_secondary_open(dbp, 
-				     DATABASE, 
-				     "title", 
-				     get_title, 
-				     DB_HASH); 
-
-    /* Remove all of them */
-    for(month = 1; month < 10; month++){
-
-      cout = icalbdbset_new(dbp, sdbp, NULL);
-      assert(cout != 0);
-    
-      for (itr = icalbdbset_get_first_component(cout);
-	   itr != 0;
-	   itr = icalbdbset_get_next_component(cout)){
-	
-	icalbdbset_remove_component(cout, itr);
-      }
-
-      icalbdbset_commit(cout);
-      icalset_free(cout);
-
-    }
-
-    /* Print them out again */
-
-    for(month = 1, count=0; month < 10; month++){
-      char *title;
-
-      icalcomponent *event;
-      icalproperty *dtstart, *dtend;
-
-      cout = icalbdbset_new(dbp, sdbp, NULL);
-      assert(cout != 0);
-    
-      for (itr = icalbdbset_get_first_component(cout);
-	   itr != 0;
-	   itr = icalbdbset_get_next_component(cout)){
-
-	icalcomponent *event;
-	icalproperty *dtstart, *dtend;
-
-	count++;
-
-      event = icalcomponent_get_first_component(itr,ICAL_VEVENT_COMPONENT);
-
-      dtstart = icalcomponent_get_first_property(event,ICAL_DTSTART_PROPERTY);
-      dtend = icalcomponent_get_first_property(event,ICAL_DTEND_PROPERTY);
-      
-      printf("%d %s %s\n",count, icalproperty_as_ical_string(dtstart),
-             icalproperty_as_ical_string(dtend));
-
-      }
-      icalset_free(cout);
-    }
-}
-
-/* get_title -- extracts a secondary key (the vcalendar)
- * from a primary key/data pair */
-
-/* just create a random title for now */
-
-int get_title(DB *dbp, const DBT *pkey, const DBT *pdata, DBT *skey)
-{
-  icalcomponent *cl;
-  char title[255];
-
-  memset(skey, 0, sizeof(DBT)); 
-
-  cl = icalparser_parse_string((char *)pdata->data);
-  sprintf(title, "title_%s", icalcomponent_get_uid(cl));
-
-  skey->data = strdup(title);
-  skey->size = strlen(skey->data);
-  return (0); 
-}
-
-char * parse_vcalendar(const DBT *dbt) 
-{
-  char *str;
-  struct calendar *cal;
-
-  str = (char *)dbt->data;
-  cal = unpack_calendar(str, dbt->size);
-
-  return cal->vcalendar;
-}
-
-#endif
-
-
-int vcalendar_init(struct calendar **rcal, char *vcalendar, char *title) 
-{
-  int vcalendar_size, title_size, total_size;
-  struct calendar *cal;
-
-  if(vcalendar) 
-    vcalendar_size = strlen(vcalendar);
-  else {
-    vcalendar = "";
-    vcalendar_size = strlen(vcalendar);
-  }
-
-  if(title) 
-    title_size = strlen(title);
-  else {
-    title = "";
-    title_size = strlen(title);
-  }
-
-  total_size = sizeof(struct calendar) + vcalendar_size + title_size;
-
-  if((cal = (struct calendar *)malloc(total_size))==NULL)
-    return 0;
-  memset(cal, 0, total_size);
-
-  /* offsets */
-  cal->total_size_offset     = sizeof(int);
-  cal->vcalendar_size_offset = (sizeof(int) * 7);
-  cal->vcalendar_offset      = cal->vcalendar_size_offset + sizeof(int);
-  cal->title_size_offset     = cal->vcalendar_offset + vcalendar_size;
-  cal->title_offset          = cal->title_size_offset + sizeof(int);
-
-  /* sizes */
-  cal->total_size            = total_size;
-  cal->vcalendar_size        = vcalendar_size;
-  cal->title_size            = title_size;
-
-  if (vcalendar && *vcalendar) 
-    cal->vcalendar = strdup(vcalendar);
-
-  if (title && *title)
-    cal->title     = strdup(title);
-
-  *rcal = cal;
-
-  return 0;
-}
-
-char * pack_calendar(struct calendar *cal, int size) 
-{
-  char *str;
-
-  if((str = (char *)malloc(sizeof(char) * size))==NULL)
-    return 0;
-
-  /* ID */
-  memcpy(str, &cal->ID, sizeof(cal->ID));
-
-  /* total_size */
-  memcpy(str + cal->total_size_offset,
-	 &cal->total_size,
-	 sizeof(cal->total_size));
-
-  /* vcalendar_size */
-  memcpy(str + cal->vcalendar_size_offset, 
-         &cal->vcalendar_size, 
-         sizeof(cal->vcalendar_size));
-
-  /* vcalendar */
-  memcpy(str + cal->vcalendar_offset, 
-         cal->vcalendar, 
-         cal->vcalendar_size);
-
-  /* title_size */
-  memcpy(str + cal->title_size_offset,
-	 &cal->title_size,
-	 sizeof(cal->title_size));
-
-  /* title */
-  memcpy(str + cal->title_offset,
-	 cal->title,
-	 cal->title_size);
-
-  return str;
-}
-
-struct calendar * unpack_calendar(char *str, int size)
-{
-  struct calendar *cal;
-  if((cal = (struct calendar *) malloc(size))==NULL)
-    return 0;
-  memset(cal, 0, size);
-
-  /* offsets */
-  cal->total_size_offset     = sizeof(int);
-  cal->vcalendar_size_offset = (sizeof(int) * 7);
-  cal->vcalendar_offset      = cal->vcalendar_size_offset + sizeof(int);
-
-  /* ID */
-  memcpy(&cal->ID, str, sizeof(cal->ID));
-
-  /* total_size */
-  memcpy(&cal->total_size,
-	 str + cal->total_size_offset,
-	 sizeof(cal->total_size));
-
-  /* vcalendar_size */
-  memcpy(&cal->vcalendar_size, 
-	 str + cal->vcalendar_size_offset, 
-	 sizeof(cal->vcalendar_size));
-
-  if((cal->vcalendar = (char *)malloc(sizeof(char) * 
-				      cal->vcalendar_size))==NULL)
-    return 0;
-
-  /* vcalendar */
-  memcpy(cal->vcalendar, 
-	 (char *)(str + cal->vcalendar_offset), 
-	 cal->vcalendar_size);
-
-  cal->title_size_offset     = cal->vcalendar_offset + cal->vcalendar_size;
-  cal->title_offset          = cal->title_size_offset + sizeof(int);
-
-  /* title_size */
-  memcpy(&cal->title_size,
-	 str + cal->title_size_offset,
-	 sizeof(cal->title_size));
-
-  if((cal->title = (char *)malloc(sizeof(char) *
-				  cal->title_size))==NULL)
-    return 0;
-
-  /* title*/
-  memcpy(cal->title,
-	 (char *)(str + cal->title_offset),
-	 cal->title_size);
-
-  return cal;
-}
-
-int test_dirset()
-{
-
-    icalcomponent *c, *gauge;
-    icalerrorenum error;
-    icalcomponent *itr;
-    icalfileset* cluster;
-    struct icalperiodtype rtime;
-    icaldirset *s = icaldirset_new("store");
-    int i;
-
-    assert(s != 0);
-
-    rtime.start = icaltime_from_timet( time(0),0);
-
-    cluster = icalfileset_new(OUTPUT_FILE);
-
-    assert(cluster != 0);
-
-#define NUMCOMP 4
-
-    /* Duplicate every component in the cluster NUMCOMP times */
-
-    icalerror_clear_errno();
-
-    for (i = 1; i<NUMCOMP+1; i++){
-
-	/*rtime.start.month = i%12;*/
-	rtime.start.month = i;
-	rtime.end = rtime.start;
-	rtime.end.hour++;
-	
-	for (itr = icalfileset_get_first_component(cluster);
-	     itr != 0;
-	     itr = icalfileset_get_next_component(cluster)){
-	    icalcomponent *clone, *inner;
-	    icalproperty *p;
-
-	    inner = icalcomponent_get_first_component(itr,ICAL_VEVENT_COMPONENT);
-            if (inner == 0){
-              continue;
-            }
-
-	    /* Change the dtstart and dtend times in the component
-               pointed to by Itr*/
-
-	    clone = icalcomponent_new_clone(itr);
-	    inner = icalcomponent_get_first_component(itr,ICAL_VEVENT_COMPONENT);
-
-	    assert(icalerrno == ICAL_NO_ERROR);
-	    assert(inner !=0);
-
-	    /* DTSTART*/
-	    p = icalcomponent_get_first_property(inner,ICAL_DTSTART_PROPERTY);
-	    assert(icalerrno  == ICAL_NO_ERROR);
-
-	    if (p == 0){
-		p = icalproperty_new_dtstart(rtime.start);
-		icalcomponent_add_property(inner,p);
-	    } else {
-		icalproperty_set_dtstart(p,rtime.start);
-	    }
-	    assert(icalerrno  == ICAL_NO_ERROR);
-
-	    /* DTEND*/
-	    p = icalcomponent_get_first_property(inner,ICAL_DTEND_PROPERTY);
-	    assert(icalerrno  == ICAL_NO_ERROR);
-
-	    if (p == 0){
-		p = icalproperty_new_dtstart(rtime.end);
-		icalcomponent_add_property(inner,p);
-	    } else {
-		icalproperty_set_dtstart(p,rtime.end);
-	    }
-	    assert(icalerrno  == ICAL_NO_ERROR);
-	    
-	    printf("\n----------\n%s\n---------\n",icalcomponent_as_ical_string(inner));
-
-	    error = icaldirset_add_component(s,
-					     icalcomponent_new_clone(itr));
-	    
-	    assert(icalerrno  == ICAL_NO_ERROR);
-
-	}
-
-    }
-    
-    gauge = 
-	icalcomponent_vanew(
-	    ICAL_VCALENDAR_COMPONENT,
-	    icalcomponent_vanew(
-		ICAL_VEVENT_COMPONENT,  
-		icalproperty_vanew_summary(
-		    "Submit Income Taxes",
-		    icalparameter_new_xliccomparetype(ICAL_XLICCOMPARETYPE_EQUAL),
-		    0),
-		0),
-	    icalcomponent_vanew(
-		ICAL_VEVENT_COMPONENT,  
-		icalproperty_vanew_summary(
-		    "Bastille Day Party",
-		    icalparameter_new_xliccomparetype(ICAL_XLICCOMPARETYPE_EQUAL),
-		    0),
-		0),
-	    0);
-
-#if 0
-
-
-    icaldirset_select(s,gauge);
-
-    for(c = icaldirset_first(s); c != 0; c = icaldirset_next(s)){
-	
-	printf("Got one! (%d)\n", count++);
-	
-	if (c != 0){
-	    printf("%s", icalcomponent_as_ical_string(c));;
-	    if (icaldirset_store(s2,c) == 0){
-		printf("Failed to write!\n");
-	    }
-	    icalcomponent_free(c);
-	} else {
-	    printf("Failed to get component\n");
-	}
-    }
-
-
-    icalset_free(s2);
-#endif
-
-
-    for(c = icaldirset_get_first_component(s); 
-	c != 0; 
-	c = icaldirset_get_next_component(s)){
-
-	if (c != 0){
-	    printf("%s", icalcomponent_as_ical_string(c));;
-	} else {
-	    printf("Failed to get component\n");
-	}
-
-    }
-
-    /* Remove all of the components */
-    i=0;
-    while((c=icaldirset_get_current_component(s)) != 0 ){
-	i++;
-
-	icaldirset_remove_component(s,c);
-    }
-	
-
-    icalset_free(s);
-    return 0;
-}
-
-#if 0
-void test_calendar()
-{
-    icalcomponent *comp;
-    icalfileset *c;
-    icaldirset *s;
-    icalcalendar* calendar = icalcalendar_new("calendar");
-    icalerrorenum error;
-    struct icaltimetype atime = icaltime_null_time();
-
-    comp = icalcomponent_vanew(
-	ICAL_VEVENT_COMPONENT,
-	icalproperty_new_version("2.0"),
-	icalproperty_new_description("This is an event"),
-	icalproperty_new_dtstart(atime),
-	icalproperty_vanew_comment(
-	    "Another Comment",
-	    icalparameter_new_cn("A Common Name 1"),
-	    icalparameter_new_cn("A Common Name 2"),
-	    icalparameter_new_cn("A Common Name 3"),
-		icalparameter_new_cn("A Common Name 4"),
-	    0),
-	icalproperty_vanew_xlicerror(
-	    "This is only a test",
-	    icalparameter_new_xlicerrortype(ICAL_XLICERRORTYPE_COMPONENTPARSEERROR),
-	    0),
-	
-	0);
-	
-	
-    s = icalcalendar_get_booked(calendar);
-
-    error = icaldirset_add_component(s,comp);
-    
-    assert(error == ICAL_NO_ERROR);
-
-    c = icalcalendar_get_properties(calendar);
-
-    error = icalfileset_add_component(c,icalcomponent_new_clone(comp));
-
-    assert(error == ICAL_NO_ERROR);
-
-    icalcalendar_free(calendar);
-
-}
-#endif
-
-int main(int argc, char *argv[])
-{
-
-    printf("\n------------Test File Set---------------\n");
-    test_fileset(); 
-
-    printf("\n------------Test Dir Set---------------\n");
-    test_dirset();
-
-#ifdef WITH_BDB4
-    printf("\n------------Test BerkeleyDB Set---------------\n");
-    test_bdbset();
-#endif
-
-#if 0
-    printf("\n------------Test Calendar---------------\n");
-    test_calendar();
-#endif
-
-    return 0;
-}
-
-
-
diff --git a/libical/src/test/stow.c b/libical/src/test/stow.c
deleted file mode 100644
index 52307420bb..0000000000
--- a/libical/src/test/stow.c
+++ /dev/null
@@ -1,888 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: stow.c
-  CREATOR: eric 29 April 2000
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000 Eric Busboom
- http://www.softwarestudio.org
-
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
- The Initial Developer of the Original Code is Eric Busboom
-
- ======================================================================*/
-
-
-#include <stdio.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <limits.h> /* for PATH_MAX */
-#include <assert.h>
-#include <stdlib.h>
-#include <sys/utsname.h> /* for uname */
-#include <sys/stat.h> /* for stat */
-#include <unistd.h> /* for stat, getpid, getopt */
-#include <pwd.h> /* For getpwent */
-#include <sys/types.h> /* For getpwent */
-#include <ctype.h> /* for tolower */
-
-#include <libical/ical.h>
-#include <libicalss/icalss.h>
-
-char* program_name;
-#define TMPSIZE 2048
-#define SENDMAIL "/usr/lib/sendmail -t"
-
-void usage(char *message);
-
-#ifndef PATH_MAX
-#define PATH_MAX 256 /* HACK */
-#endif
-
-
-enum options {
-    STORE_IN_FILE,
-    STORE_IN_DB,
-    INPUT_IS_MIME,
-    INPUT_IS_ICAL,
-    INPUT_FROM_STDIN,
-    INPUT_FROM_FILE,
-    ERRORS_TO_STDOUT,
-    ERRORS_TO_ORGANIZER
-};
-
-struct options_struct
-{
-	enum options storage;
-	enum options input_type;
-	enum options input_source;
-	enum options errors;
-	char* input_file;
-	char* calid;
-	char* output_file;
-};
-
-
-enum file_type
-{
-    ERROR,
-    NO_FILE,
-    DIRECTORY,
-    REGULAR,
-    OTHER
-};
-
-enum file_type test_file(char *path)
-{
-    struct stat sbuf;
-    enum file_type type;
-    
-    errno = 0;
-
-    /* Check if the path already exists and if it is a directory*/
-    if (stat(path,&sbuf) != 0){
-	
-	/* A file by the given name does not exist, or there was
-           another error */
-	if(errno == ENOENT)
-	{
-	    type = NO_FILE;
-	} else {
-	    type = ERROR;
-	}
-
-    } else {
-	/* A file by the given name exists, but is it a directory? */
-	
-	if (S_ISDIR(sbuf.st_mode)){ 
-	    type = DIRECTORY;
-	} else if(S_ISREG(sbuf.st_mode)){ 
-	    type = REGULAR;
-	} else {
-	    type = OTHER;
-	}
-    }
-
-    return type;
-}
-
-char* lowercase(const char* str)
-{
-    char* p = 0;
-    char* new = strdup(str);
-
-    if(str ==0){
-	return 0;
-    }
-
-    for(p = new; *p!=0; p++){
-	*p = tolower(*p);
-    }
-
-    return new;
-}
-
-#if 0
-char* get_local_attendee(struct options_struct *opt)
-{
-    char attendee[PATH_MAX];
-
-    if(opt->calid){
-
-	strncpy(attendee,opt->calid,PATH_MAX);
-
-    } else {
-	
-	char* user = getenv("USER");
-	struct utsname uts;
-	uname(&utget_option);
-	/* HACK nodename may not be a fully qualified domain name */
-	snprintf(attendee,PATH_MAX,"%s@%s",user,uts.nodename);
-   
-    }
-
-    return lowercase(attendee);
-}
-#endif
-
-
-icalcomponent* get_first_real_component(icalcomponent *comp)
-{
-    icalcomponent *c;
-
-    for(c = icalcomponent_get_first_component(comp,ICAL_ANY_COMPONENT);
-	c != 0;
-	c = icalcomponent_get_next_component(comp,ICAL_ANY_COMPONENT)){
-	if (icalcomponent_isa(c) == ICAL_VEVENT_COMPONENT ||
-	    icalcomponent_isa(c) == ICAL_VTODO_COMPONENT ||
-	    icalcomponent_isa(c) == ICAL_VJOURNAL_COMPONENT )
-	{
-	    return c;
-	}
-    }
-
-    return 0;
-}
-
-
-
-char* make_mime(const char* to, const char* from, const char* subject, 
-		const char* text_message, const char* method, 
-		const char* ical_message)
-{
-    size_t size = strlen(to)+strlen(from)+strlen(subject)+
-	strlen(text_message)+ strlen(ical_message)+TMPSIZE;
-
-    char mime_part_1[TMPSIZE];
-    char mime_part_2[TMPSIZE];
-    char content_id[TMPSIZE];
-    char boundary[TMPSIZE];
-    struct utsname uts;
-    char* m;
-
-
-    if ((m = malloc(sizeof(char)*size)) == 0){
-	fprintf(stderr,"%s: Can't allocate memory: %s\n",program_name,strerror(errno));
-	exit(1);
-    }
-
-    uname(&uts);
-
-    srand(time(0)<<getpid());
-    sprintf(content_id,"%d-%d@%s",(int)time(0),rand(),uts.nodename);
-    sprintf(boundary,"%d-%d-%s",(int)time(0),rand(),uts.nodename);
-
-    sprintf(mime_part_1,"Content-ID: %s\n\
-Content-type: text/plain\n\
-Content-Description: Text description of error message\n\n\
-%s\n\n--%s",
-	    content_id,text_message,boundary);
-
-    if(ical_message != 0 && method != 0){
-	sprintf(mime_part_2,"Content-ID: %s\n\
-Content-type: text/calendar; method=%s\n\
-Content-Description: iCal component reply\n\n\
-%s\n\n--%s--",
-		content_id,method,ical_message,boundary);
-    }
-
-    sprintf(m,"To: %s\n\
-From: %s\n\
-Subject: %s\n\
-MIME-Version: 1.0\n\
-Content-ID: %s\n\
-Content-Type:  multipart/mixed; boundary=\"%s\"\n\
-\n\
- This is a multimedia message in MIME format\n\
-\n\
---%s\n\
-%s\n\
-",
-	    to,from,subject,content_id,boundary,boundary,
-	    mime_part_1);
-
-    if(ical_message != 0 && method != 0){
-	strcat(m, mime_part_2);
-    } else {
-	strcat(m,"--\n");
-    }
-
-    return m;
-}
-
-/* The incoming component had fatal errors */
-void return_failure(icalcomponent* comp,  char* message, 
-		    struct options_struct *opt)
-{
-    char* local_attendee = opt->calid;
-    FILE* p;
-    const char *org_addr;
-
-    icalcomponent  *inner = get_first_real_component(comp);
-
-    icalproperty *organizer_prop = icalcomponent_get_first_property(inner,ICAL_ORGANIZER_PROPERTY);
-    const char *organizer = icalproperty_get_organizer(organizer_prop);
-
-    org_addr = strchr(organizer,':');
-
-    if(org_addr != 0){
-        org_addr++; /* Skip the ';' */
-    } else {
-        org_addr = organizer;
-    }
-
-    if (opt->errors == ERRORS_TO_ORGANIZER){
-	p = popen(SENDMAIL,"w");
-    } else {
-	p = stdout;
-    }
-
-    if(p == 0){
-	fprintf(stderr,
-		"%s: fatal. Could not open pipe to sendmail (\"%s\") \n",
-		program_name,SENDMAIL);
-	exit(1);
-     }
-   
-    fputs(make_mime(org_addr, local_attendee, "iMIP error", 
-		    message, "reply",
-		    icalcomponent_as_ical_string(comp)),p);
-    
-    if (opt->errors == ERRORS_TO_ORGANIZER){ 
-	pclose(p);
-    }   
-}
-
-/* The program had a fatal error and could not process the incoming component*/
-void return_error(icalcomponent* comp,  char* message, struct options_struct *opt)
-{
-    
-
-    fputs(make_mime("Dest", "Source", "iMIP system failure", 
-		    message, 0,0),stdout);
-
-}
-
-icalcomponent* make_reply(icalcomponent *comp, icalproperty *return_status, 
-			 struct options_struct *opt)
-
-{
-    icalcomponent *reply, *rinner;
-    icalcomponent  *inner = get_first_real_component(comp);
-    icalproperty *p=0;
-    char* local_attendee = opt->calid;
-    char attendee[TMPSIZE];
-
-    char prodid[TMPSIZE];
-
-    snprintf(attendee,TMPSIZE,"mailto:%s",local_attendee);
-
-    snprintf(prodid,TMPSIZE,"-//Softwarestudio.org//%s version %s//EN",PACKAGE,VERSION);
-
-    /* Create the base component */
-    reply = icalcomponent_vanew( 
-	ICAL_VCALENDAR_COMPONENT,
-	icalproperty_new_version(strdup("2.0")),
-	icalproperty_new_prodid(strdup(prodid)),
-	icalproperty_new_method(ICAL_METHOD_REPLY),
-	icalcomponent_vanew(
-	    ICAL_VEVENT_COMPONENT,
-	    icalproperty_new_clone(
-		icalcomponent_get_first_property(inner,ICAL_DTSTAMP_PROPERTY)),
-	    icalproperty_new_clone(
-		icalcomponent_get_first_property(inner,ICAL_ORGANIZER_PROPERTY)),
-	    icalproperty_new_clone(
-		icalcomponent_get_first_property(inner,ICAL_UID_PROPERTY)),
-	    icalproperty_new_attendee(attendee),
-	    0),
-	0);
-
-    
-    /* Convert errors into request-status properties and transfers
-       them to the reply component */
-
-    icalcomponent_convert_errors(comp);
-
-    rinner = get_first_real_component(reply);
-
-    for(p = icalcomponent_get_first_property(inner,
-					     ICAL_REQUESTSTATUS_PROPERTY);
-	p != 0;
-	p = icalcomponent_get_next_property(inner,
-					    ICAL_REQUESTSTATUS_PROPERTY)){
-	
-	icalcomponent_add_property(rinner,icalproperty_new_clone(p));
-    }
-		
-    if(return_status != 0){
-	icalcomponent_add_property(rinner, return_status);
-    }
-        
-    return reply;
-	    
-}
-
-int check_attendee(icalproperty *p,  struct options_struct *opt){  
-    const char* s = icalproperty_get_attendee(p);
-    char* lower_attendee = lowercase(s);
-    char* local_attendee = opt->calid;
-    
-    /* Check that attendee begins with "mailto:" */
-    if (strncmp(lower_attendee,"mailto:",7) == 0){
-	/* skip over the mailto: part */
-	lower_attendee += 7;
-	
-	if(strcmp(lower_attendee,local_attendee) == 0){
-	    return 1;
-	}
-	
-	lower_attendee -= 7;
-	
-	free(lower_attendee);
-    } 
-
-    return 0;
-}
-
-char static_component_error_str[PATH_MAX];
-char* check_component(icalcomponent* comp,  icalproperty **return_status,
-		      struct options_struct *opt)
-{
-    char* component_error_str=0;
-    icalcomponent* inner;
-    int errors = 0;
-    icalproperty *p;
-    int found_attendee = 0;
-    struct icalreqstattype rs;
-
-    rs.code =  ICAL_UNKNOWN_STATUS;
-    rs.desc = 0;
-    rs.debug = 0;
-
-    /*{
-	icalrequeststatus code;
-	const char* desc;
-	const char* debug;
-        };*/
-
-    *return_status = 0;
-
-    /* This do/while loop only executes once because it is being used
-       to fake exceptions */
-
-    do {
-
-	/* Check that we actually got a component */
-	if(comp == 0){
-	    strcpy(static_component_error_str,
-		   "Did not find a component");
-	    component_error_str = static_component_error_str;
-	    break;
-	}
-
-	/* Check that the root component is a VCALENDAR */
-	if(icalcomponent_isa(comp) != ICAL_VCALENDAR_COMPONENT){
-	    strcpy(static_component_error_str,
-		   "Root component is not a VCALENDAR");
-	    component_error_str = static_component_error_str;
-            rs.code = ICAL_3_11_MISSREQCOMP_STATUS;
-
-	    break;
-	}
-
-
-	/* Check that the component has a METHOD */
-
-	if (icalcomponent_get_first_property(comp,ICAL_METHOD_PROPERTY) == 0)
-	{
-	    strcpy(static_component_error_str,
-		   "The component you sent did not have a METHOD property");
-	    component_error_str = static_component_error_str;
-            rs.code = ICAL_3_11_MISSREQCOMP_STATUS;
-	    break;
-	}
-	
-	inner = get_first_real_component(comp);
-
-
-	/* Check that the compopnent has an organizer */
-	if(icalcomponent_get_first_property(inner,ICAL_ORGANIZER_PROPERTY) == 0){
-	    fprintf(stderr,"%s: fatal. Component does not have an ORGANIZER property\n",program_name);
-            rs.code = ICAL_3_11_MISSREQCOMP_STATUS;
-            break;
-	}
-
-
-	/* Check for this user as an attendee or organizer */
-
-	for(p = icalcomponent_get_first_property(inner,ICAL_ATTENDEE_PROPERTY);
-	    p != 0;
-	    p = icalcomponent_get_next_property(inner,ICAL_ATTENDEE_PROPERTY)){
-	  
-	    found_attendee += check_attendee(p,opt);
-	}
-
-	for(p = icalcomponent_get_first_property(inner,ICAL_ORGANIZER_PROPERTY);
-	    p != 0;
-	    p = icalcomponent_get_next_property(inner,ICAL_ORGANIZER_PROPERTY)){
-	  
-	    found_attendee += check_attendee(p,opt);
-	}
-		
-	if (found_attendee == 0){
-	    struct icalreqstattype rs;
-	    memset(static_component_error_str,0,PATH_MAX);
-
-	    snprintf(static_component_error_str,PATH_MAX,
-		   "This target user (%s) is not listed as an attendee or organizer",
-		    opt->calid );
-	    component_error_str = static_component_error_str;
-
-	    rs.code = ICAL_3_7_INVCU_STATUS;
-
-	    break;
-	}
-
-
-
-	/* Check that the component passes iTIP restrictions */
-	
-	errors = icalcomponent_count_errors(comp);
-	icalrestriction_check(comp);
-	
-	if(errors != icalcomponent_count_errors(comp)){
-	    snprintf(static_component_error_str,PATH_MAX,
-		   "The component does not conform to iTIP restrictions.\n Here is the original component; look at the X-LIC-ERROR properties\nfor details\n\n%s",icalcomponent_as_ical_string(comp));
-	    component_error_str = static_component_error_str;
-	    break;
-	}
-
-
-
-    } while(0);
-
-    if(rs.code != ICAL_UNKNOWN_STATUS){
-        *return_status = icalproperty_new_requeststatus(rs);
-    }
-
-    return component_error_str;
-}
-
-
-void usage(char *message)
-{
-    fprintf(stderr,"Usage: %s [-emdcn] [-i inputfile] [-o outputfile] [-u calid]\n",program_name);
-    fprintf(stderr,"-e\tInput data is encapsulated in a MIME Message \n\
--m\tInput is raw iCal \n\
--i\tSpecify input file. Otherwise, input comes from stdin\n\
--o\tSpecify file to save incoming message to\n\
--d\tSpecify database to send data to\n\
--u\tSet the calid to store the data to\n\
--n\tSend errors to stdout instead of organizer\n\
-");
-
-}
-
-
-void get_options(int argc, char* argv[], struct options_struct *opt)
-{
-    int c;
-    extern char *optarg;
-    extern int optind, optopt;
-    int errflg=0;
-
-    opt->storage = STORE_IN_FILE;
-    opt->input_source = INPUT_FROM_STDIN;
-    opt->input_type = INPUT_IS_ICAL;
-    opt->input_file = 0;
-    opt->errors = ERRORS_TO_ORGANIZER;
-    opt->calid = 0;
-    opt->output_file = 0;
-
-
-    while ((c = getopt(argc, argv, "nemu:o:d:b:c:i:")) != -1) {
-             switch (c) {
-		 case 'e': { /* Input data is MIME encapsulated */
-		     opt->input_type = INPUT_IS_MIME;
-		     break;
-		 }
-		 case 'm': { /* Input is iCal. Default*/
-		     opt->input_type = INPUT_IS_ICAL;
-		     break;
-		 }
-		 case 'i': { /* Input comes from named file */
-		     opt->input_source = INPUT_FROM_FILE;
-		     opt->input_file = strdup(optarg);
-		     break;
-		 }
-		 case 'o': { /* Output goes to named file. Default*/
-		     opt->output_file = strdup(optarg);
-		     opt->storage = STORE_IN_FILE;
-		     break;
-		 }
-		 case 'd': { /* Output goes to database */
-		     fprintf(stderr,"%s: option -d is unimplmented\n",program_name);
-		     opt->storage = STORE_IN_DB;
-		     errflg++;
-		     break;
-		 }
-		 case 'c': {
-
-		     break;
-		 }
-		 case 'u': { /* Set the calid for the output database or
-				file. Default is user name of user running
-				program */
-		     opt->calid = strdup(optarg);
-		     break;
-		 }
-
-		 case 'n': { /* Dump error to stdout. Default is to
-		                send error to the organizer specified
-		                in the iCal data */
-		     opt->errors = ERRORS_TO_STDOUT;
-		     break;
-		 }
-
-		 case ':': {/* Option given without an operand */
-		     fprintf(stderr,
-			     "%s: Option -%c requires an operand\n", 
-			     program_name,optopt);
-		     errflg++;
-		     break;
-		 }
-		 case '?': {
-		     errflg++;
-		 }
-
-             }
-
-	     if (errflg >0){
-		 usage("");
-		 exit(1);
-	     }
-    } 
-
-    if(opt->calid == 0){
-	/* If no calid specified, use username */
-	char attendee[PATH_MAX];
-	char* user = getenv("USER");
-	struct utsname uts;
-	uname(&uts);
-	/* HACK nodename may not be a fully qualified domain name */
-	snprintf(attendee,PATH_MAX,"%s@%s",user,uts.nodename);
-
-	opt->calid = lowercase(attendee);
-    }
-
-    if(opt->storage == STORE_IN_FILE &&
-	opt->output_file ==0){
-	char file[PATH_MAX];
-	char* user = getenv("USER");
-	struct passwd *pw;
-
-	if(!user){
-	    fprintf(stderr,"%s: Can't get username. Try explicitly specifing the output file with -o", program_name);
-	    exit(1);
-	}
-	
-	/* Find password entry for user */
-	while( (pw = getpwent())!=0){
-	    if(strcmp(user,pw->pw_name)==0){
-		break;
-	    }
-	}
-	    
-	if(pw==0){
-	    fprintf(stderr,"%s: Can't get get password entry for user \"%s\" Try explicitly specifing the output file with -o", 
-		    program_name,user);
-	    exit(1);
-	}
-
-	if(pw->pw_dir==0){
-	    fprintf(stderr,"%s: User \"%s\" has no home directory. Try explicitly specifing the output file with -o", 
-		    program_name, user);
-	    exit(1);
-	}
-
-	snprintf(file,PATH_MAX,"%s/.facs/%s",pw->pw_dir,opt->calid);
-
-	opt->output_file = strdup(file);
-    }
-
-
-    /* Now try to create the calendar directory if it does
-       not exist */
-
-     if(opt->storage == STORE_IN_FILE ) {
-	char * p;
-	char* facspath = strdup(opt->output_file);
-	enum file_type type;
-
-	/* Cut off the last slash to make it just a directoy */
-
-	p = strrchr(facspath,'/');
-
-        if (p != 0){
-            /* Use some other directory */
-            *p='\0';
-            
-            type = test_file(facspath);
-            
-            errno = 0;
-            if (type == NO_FILE){
-                
-                if(mkdir(facspath,0775) != 0){
-                    fprintf(stderr,
-                            "%s: Failed to create calendar directory %s: %s\n",
-                            program_name,facspath, strerror(errno));
-                    exit(1);
-                } else {
-                    fprintf(stderr,"%s: Creating calendar directory %s\n",
-                            program_name,facspath);
-                }
-                
-            } else if(type==REGULAR || type == ERROR){
-                fprintf(stderr,"%s: Cannot create calendar directory %s\n",
-                        program_name,facspath);
-                exit(1);
-            } 		    
-        }
-     }
-}
-
-char* check_options(struct options_struct *opt)
-{
-    return 0;
-}
-
-void store_component(icalcomponent *comp, struct options_struct *opt)
-{
-    icalerrorenum error; 
-
-
-    if(opt->storage == STORE_IN_FILE){
-	icalset *fs = icalfileset_new(opt->output_file);
-
-	if (fs == 0){
-	    fprintf(stderr,
-		    "%s: Failed to get incoming component directory: %s\n",
-		    program_name, icalerror_strerror(icalerrno));
-	    exit(1);
-	}
-
-
-	error = icalfileset_add_component(fs,comp);
-    
-	if (error != ICAL_NO_ERROR){
-	    fprintf(stderr,"%s: Failed to write incoming component: %s\n",
-		    program_name, icalerror_strerror(icalerrno));
-	    exit(1);
-	}
-	
-	error = icalfileset_commit(fs);
-    
-	if (error != ICAL_NO_ERROR){
-	    fprintf(stderr,"%s: Failed to commit incoming cluster: %s\n",
-		    program_name, icalerror_strerror(icalerrno));
-	    exit(1);
-	}
-	
-	icalset_free(fs);
-
-	return;
-    } else {
-	assert(0);
-    }
-}
-
-char* read_stream(char *s, size_t size, void *d)
-{
-  char *c = fgets(s,size, (FILE*)d);
-
-  return c;
-}
-
-icalcomponent* read_nonmime_component(struct options_struct *opt)
-{
-    FILE *stream;
-    icalcomponent *comp;
-    icalparser* parser = icalparser_new();
-    icalerrorstate es = icalerror_get_error_state(ICAL_MALFORMEDDATA_ERROR);
-    char* line;
-
-    if(opt->input_source == INPUT_FROM_FILE){
- 	stream = fopen(opt->input_file,"r"); 	
-
-	if (stream == 0){
-	    perror("Can't open input file");
-	    exit(1);
-	}
-
-    } else {
- 	stream = stdin;  	 	
-    }
-
-    assert(stream != 0);
-    icalparser_set_gen_data(parser,stream);
-   
-    do {	
-	line = icalparser_get_line(parser,read_stream);
-	
-        icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR,ICAL_ERROR_NONFATAL);
-	comp = icalparser_add_line(parser,line);
-        icalerror_set_error_state(ICAL_MALFORMEDDATA_ERROR,es);
-	
-	if (comp != 0){
-	    return comp;
-	}
-	
-    } while ( line != 0);
-
-    if(opt->input_source == INPUT_FROM_FILE){
-	fclose(stream);
-    }
-
-
-    return comp;
- }
-
-icalcomponent* find_vcalendar(icalcomponent* comp)
-{
-    icalcomponent *c,*rtrn;
-
-    for(c = icalcomponent_get_first_component(comp,ICAL_ANY_COMPONENT);
-	c != 0;
-	c = icalcomponent_get_next_component(comp,ICAL_ANY_COMPONENT)){
-
-	if(icalcomponent_isa(c) == ICAL_VCALENDAR_COMPONENT){
-	    icalcomponent_remove_component(comp,c);
-	    return c;
-	}
-
-	if((rtrn=find_vcalendar(c)) != 0){
-	    return rtrn;
-	}
-    }
-
-    return 0;
-}
-
-icalcomponent* read_mime_component(struct options_struct *opt)
-{
-    icalcomponent *comp,*mimecomp;
-    FILE* stream;
-    
-    if(opt->input_source == INPUT_FROM_FILE){
- 	stream = fopen(opt->input_file,"r"); 	
-	
-	if (stream == 0){
-	    perror("Can't open input file");
-	    exit(1);
-	}
-	
-    } else {
- 	stream = stdin;  	 	
-    }
-    
-    assert(stream != 0);
-    
-    mimecomp = icalmime_parse(read_stream,(void*)stream);
-
-    /* now find the iCal component embedded within the mime component */
-    comp = find_vcalendar(mimecomp);
-
-
-    if(comp == 0){
-	return 0;
-    }
-
-    return comp;    
-}
-
-icalcomponent* read_component(struct options_struct *opt)
-{
-    if(opt->input_type == INPUT_IS_MIME){
-	return read_mime_component(opt);
-    } else if (opt->input_type == INPUT_IS_ICAL){
-	return read_nonmime_component(opt);
-    } else {
-	fprintf(stderr,"%s: Internal Error; unknown option for input_type\n",
-		program_name);
-	exit(1);
-    }
-}
-
-int main(int argc, char* argv[] )
-{
-    char* options_error_str;
-    char* component_error_str;
-    icalcomponent* comp, *reply;
-    struct options_struct opt;
-    icalproperty *return_status;
-
-    program_name = strrchr(argv[0],'/');
-
-    get_options(argc, argv, &opt);
-
-    if ( (options_error_str = check_options(&opt)) != 0 ){
-	usage(options_error_str);
-	exit(1);
-    }    
-
-    comp = read_component(&opt);
-
-    /* If the component had any fatal errors, return an error message
-       to the organizer */
-    if ( (component_error_str = 
-	  check_component(comp,&return_status,&opt)) != 0){
-
-	reply = make_reply(comp,return_status,&opt);
-
-	return_failure(reply, component_error_str, &opt);
-	icalcomponent_free(reply);
-	exit(0);
-
-    }
-
-    store_component(comp,&opt);
-
-
-    /* Don't free the component comp, since it is now part of the
-       store, and will be freed there */
-
-    exit(0);
-}
-
diff --git a/libical/src/test/test_fileset.ics b/libical/src/test/test_fileset.ics
deleted file mode 100644
index 35799e4569..0000000000
--- a/libical/src/test/test_fileset.ics
+++ /dev/null
@@ -1,60 +0,0 @@
-BEGIN:VCALENDAR
-METHOD:REQUEST
-BEGIN:VEVENT
-DTSTART:20000101T120000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-BEGIN:VEVENT
-DTSTART:20000102T120000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-BEGIN:VEVENT
-DTSTART:20000103T120000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-BEGIN:VEVENT
-DTSTART:20000104T120000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-BEGIN:VEVENT
-DTSTART:20000105T120000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-BEGIN:VEVENT
-DTSTART:20000106T120000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-BEGIN:VEVENT
-DTSTART:20000107T120000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-BEGIN:VEVENT
-DTSTART:20000108T120000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-BEGIN:VEVENT
-DTSTART:20000109T120000Z
-END:VEVENT
-END:VCALENDAR
-BEGIN:VCALENDAR
-METHOD:REQUEST
-BEGIN:VEVENT
-DTSTART:20000110T120000Z
-END:VEVENT
-END:VCALENDAR
diff --git a/libical/src/test/testclassify.c b/libical/src/test/testclassify.c
deleted file mode 100644
index 6e8385cbc4..0000000000
--- a/libical/src/test/testclassify.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: testclassify.c
-  CREATOR: eric 11 February 2000
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000 Eric Busboom
- http://www.softwarestudio.org
-
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
- ======================================================================*/
-
-#include <stdio.h> /* for printf */
-#include <libical/ical.h>
-#include <errno.h>
-#include <string.h> /* For strerror */
-#include <libicalss/icalss.h>
-
-/* Get a note about the purpose of the property*/
-const char* get_note(icalcomponent *c)
-{
-    icalproperty *p;
-    const char* note = 0;
-
-    if(c != 0){
-        for(p = icalcomponent_get_first_property(c,ICAL_X_PROPERTY);
-            p!= 0;
-            p = icalcomponent_get_next_property(c,ICAL_X_PROPERTY)){
-            if(strcmp(icalproperty_get_x_name(p),"X-LIC-NOTE")==0){
-            note = icalproperty_get_x(p);
-            }
-        }
-    } 
-    
-    if(note == 0){
-        note = "None";
-    }
-    
-    return note;
-}
-
-
-int main(int argc, char* argv[])
-{
-    icalcomponent *c;
-    int i=0;
-
-    /* Open up the two storage files, one for the incomming components, 
-       one for the calendar */
-    icalset* incoming = icalset_new_file("../../test-data/incoming.ics");
-    icalset* cal = icalset_new_file("../../test-data/calendar.ics");
-
-    assert(incoming!= 0);
-    assert(cal!=0);
-
-    /* Iterate through all of the incoming components */
-    for(c=icalset_get_first_component(incoming);c!=0;
-	c=icalset_get_next_component(incoming)){
-	
-	icalproperty_xlicclass class;
-	icalcomponent *match = 0;
-        const char* this_uid;
-
-	i++;
-
-        /* Check this component against the restrictions imposed by
-           iTIP. An errors will be inserted as X-LIC-ERROR properties
-           in the component. The Parser will also insert errors if it
-           cannot parse the component */
-        icalcomponent_check_restrictions(c);
-
-        /* If there are any errors, print out the component */
-        if(icalcomponent_count_errors(c) != 0){
-            printf("----- Component has errors ------- \n%s-----------------\n",
-                   icalcomponent_as_ical_string(c));
-        }
-
-        /* Use one of the icalcomponent convenience routines to get
-           the UID. This routine will save you from having to use
-           icalcomponent_get_inner(),
-           icalcomponent_get_first_property(), checking the return
-           value, and then calling icalproperty_get_uid. There are
-           several other convenience routines for DTSTART, DTEND,
-           DURATION, SUMMARY, METHOD, and COMMENT */
-	this_uid = icalcomponent_get_uid(c);
-
-        if(this_uid != 0){
-            /* Look in the calendar for a component with the same UID
-               as the incomming component. We should reall also be
-               checking the RECURRENCE-ID. Another way to do this
-               operation is to us icalset_find_match(), which does use
-               the RECURRENCE-ID. */
-            match = icalset_fetch(cal,this_uid);
-        }
-
-        
-        /* Classify the incoming component. The third argument is the
-           calid of the user who owns the calendar. In a real program,
-           you would probably switch() on the class.*/
-	class = icalclassify(c,match,"A@example.com");
-
-	printf("Test %d\n\
-Incoming:      %s\n\
-Matched:       %s\n\
-Classification: %s\n\n",
-               i,get_note(c),get_note(match),
-               icalproperty_enum_to_string(class));	
-    }
-
-    return 0;
-}
-
-
diff --git a/libical/src/test/testmime.c b/libical/src/test/testmime.c
deleted file mode 100644
index 1fd455a001..0000000000
--- a/libical/src/test/testmime.c
+++ /dev/null
@@ -1,339 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: 
-  CREATOR: eric 25 June 2000
-  
-  $Id$
-  $Locker$
-    
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either: 
-
-    The LGPL as published by the Free Software Foundation, version
-    2.1, available at: http://www.fsf.org/copyleft/lesser.html
-
-  Or:
-
-    The Mozilla Public License Version 1.0. You may obtain a copy of
-    the License at http://www.mozilla.org/MPL/
-
-  The Initial Developer of the Original Code is Eric Busboom
-
- (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
- ======================================================================*/
-
-#include <libical/ical.h>
-
-#include <stdlib.h> /* For rand */
-#include <string.h> /* for strrchr, strdup*/
-#include <unistd.h>   /* for getopt */
-
-/*int sspm_parse_mime(struct sspm_part *parts, 
-	       size_t max_parts,
-	       struct sspm_action_map *actions,
-	       char* (*get_string)(char *s, size_t size, void* data),
-	       void *get_string_data,
-	       struct sspm_header *first_header
-    );
-*/
-
-
-
-char* major_type_string[] = {
-    "TEXT",
-    "IMAGE",
-    "AUDIO",
-    "VIDEO",
-    "APPLICATION",
-    "MULTIPART",
-    "MESSAGE",
-    "UNKNOWN",
-    "NO"
-};
-
-char* minor_type_string[] = {
-    "ANY",
-    "PLAIN",
-    "RFC822",
-    "DIGEST",
-    "CALENDAR",
-    "MIXED",
-    "RELATED",
-    "ALTERNATIVE",
-    "PARALLEL",
-    "UNKNOWN",
-    "NO"
-};
-
-
-char* read_stream(char *s, size_t size, void *d)
-{
-    char *c = fgets(s,size, (FILE*)d);
-
-    return c;
-
-}
-
-
-int main(int argc, char* argv[]) {
-
-    FILE *f;
-    int c;
-    extern char *optarg;
-    extern int optind, optopt;
-    int errflg=0;
-    char* program_name;
-
-    struct options{
-	    int normal;
-	    int stress;
-	    int base64;
-	    int qp;
-	    int sleep;
-	    int count;
-	    char* input_file;
-    } opt;
-
-    memset(&opt,0,sizeof(opt));
-    
-    program_name = (char*)strrchr((char*)argv[0],'/');
-    program_name++;
-
-    while ((c = getopt(argc, argv, "nsbqi:S:c:")) != -1) {
-	switch (c) {
-	    case 'i': { /* Input comes from named file */
-		opt.input_file = strdup(optarg);
-		break;
-	    }
-	    case 'n':{ /* Normal */
-
-		if(opt.stress+opt.base64+opt.qp != 0){
-		    fprintf(stderr,
-			    "%s: Use only one of  n,s,b and q\n",
-			    program_name);
-		}
-		opt.normal = 1;
-		break;
-	    }
-	    case 's':{ /* Stress-test*/
-		if(opt.base64+opt.normal+opt.qp != 0){
-		    fprintf(stderr,
-			    "%s: Use only one of  n,s,b and q\n",
-			    program_name);
-		}
-		opt.stress = 1;
-		break;
-	    }
-	    case 'b':{ /* test base64 decoding*/
-		if(opt.stress+opt.normal+opt.qp != 0){
-		    fprintf(stderr,
-			    "%s: Use only one of  n,s,b and q\n",
-			    program_name);
-		}
-		opt.base64 = 1;
-		break;
-	    }
-	    case 'q':{ /* test quoted-printable decoding*/
-		if(opt.stress+opt.base64+opt.normal != 0){
-		    fprintf(stderr,
-			    "%s: Use only one of  n,s,b and q\n",
-			    program_name);
-		}
-		opt.qp = 1;
-		break;
-	    }
-	    case 'S':{ /* sleep at end of run */
-		opt.sleep = atoi(optarg);
-		break;
-	    }
-
-	    case 'c':{ /* number of iterations of stress test */
-		opt.count = atoi(optarg);
-		break;
-	    }
-	    
-	    case ':': {/* Option given without an operand */
-		fprintf(stderr,
-			"%s: Option -%c requires an operand\n", 
-			program_name,optopt);
-		errflg++;
-		break;
-	    }
-	    case '?': {
-		errflg++;
-	    }
-	}
-    }
-    
-    if (errflg >0){
-	fprintf(stderr,"Usage: %s [-n|-s|-b|-q] [-i input_file]\n",
-		program_name);
-	exit(1);
-    }
-    
-    if(opt.stress+opt.base64+opt.normal+opt.qp == 0){
-	fprintf(stderr,
-		"%s: Must have one of n,s,b or q\n",
-		program_name);
-    }
-    
-    if(opt.input_file){
-	f = fopen(opt.input_file,"r");
-	if (f == 0){
-	    fprintf(stderr,"Could not open input file \"%s\"\n",
-		    opt.input_file);
-	    exit(1);
-	}
-    } else {
-	f = stdin;
-    }
-	
- 	
-
-    if(opt.normal == 1){
-	icalcomponent *c;
-
-	c = icalmime_parse(read_stream,f);
-	
-	printf("%s\n",icalcomponent_as_ical_string(c));
-
-	icalcomponent_free(c);
-
-    }  else if (opt.stress==1 ){
-	/* Read file in by lines, then randomize the lines into a
-           string buffer */
-
-	char *array[1024];
-	char temp[1024];
-       	char *buf;
-	int i,last;
-	int size;
-	int non_rand;
-	int rand_lines;
-	int r;
-	int j;
-	icalcomponent *c;
-	struct slg_data {
-		char* pos;
-		char* str;
-	} d;
-    
-	for(i=0; !feof(f); i++){
-	    fgets(temp,1024,f);
-	    array[i] = strdup(temp);
-	    size += strlen(temp);
-	}
-	last = i;
- 
-	buf = malloc(size*2);
-	assert(buf != 0);
-	
-
-	for(j=0; j<opt.count; j++){
-
-	    srand(j);
-	    memset(buf,0,size*2);
-	    /* First insert some non-randomized lines */
-	    non_rand = ((float)rand()/(float)RAND_MAX) * last;
-	    for(i=0;i<non_rand;i++){
-		strcat(buf,array[i]);
-	    }
-	    
-	    /* Then, insert some lines at random */
-	    
-	    rand_lines = last - non_rand;
-	    
-	    for(i=0;i<rand_lines;i++){
-		srand(i);
-		r = ((float)rand()/(float)RAND_MAX) * rand_lines;
-		strcat(buf,array[r+non_rand]);
-		
-	    }
-
-	    d.pos = 0;
-	    d.str = buf;
-
-	    c = icalmime_parse(icalparser_string_line_generator,&d);
-
-	    printf("%s\n",icalcomponent_as_ical_string(c));
-
-	    icalcomponent_free(c);
-	    
-	}
-
-	free(buf);
-
-	for(i=0; i<last; i++){
-	    free(array[i]);
-	}
-
-    } else if(opt.qp == 1){	
-	char str[4096];
-	char conv[4096];
-	
-	memset(str,0,4096);
-	
-	while(!feof(f) && fgets(str,4096,f)!=0){
-	    size_t size;
-	    
-	    size = strlen(str);
-	    memset(conv,0,4096);
-	    decode_quoted_printable(conv,str,&size);
-	    
-	    conv[size] = '\0';
-	    printf("%s",conv);
-	    memset(str,0,4096);
-	    
-	}
-    } else if (opt.base64 == 1) {
-	char str[4096];
-	char conv[4096];
-	
-	memset(str,0,4096);
-	
-	while(!feof(f) && fgets(str,4096,f)!=0){
-	    size_t size;
-	    
-	    size = strlen(str);
-	    memset(conv,0,4096);
-	    decode_base64(conv,str,&size);
-	    
-	    conv[size] = '\0';
-	    printf("%s",conv);
-	    memset(str,0,4096);
-	    
-	}
-    }
-
-    if (opt.sleep != 0){
-	sleep(opt.sleep);
-    }
-
-    if(	opt.input_file != 0){
-	free(opt.input_file);
-    }
-
-    icalmemory_free_ring();
-
-    return 0;
-
-}
-
-
-
-
-
-	
-	
-       
diff --git a/libical/src/test/testvcal.c b/libical/src/test/testvcal.c
deleted file mode 100644
index 80b227b148..0000000000
--- a/libical/src/test/testvcal.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C -*-
-  ======================================================================
-  FILE: vcal.c
-  CREATOR: eric 26 May 2000
-  
-  $Id$
-  $Locker$
-    
- (C) COPYRIGHT 2000 Eric Busboom
- http://www.softwarestudio.org
-
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
- The Original Code is eric. The Initial Developer of the Original
- Code is Eric Busboom
-
-
- ======================================================================*/
-
-#include <libicalvcal/icalvcal.h>
-#include <stdio.h>
-
-/* Given a vCal data file as its first argument, this program will
-   print out an equivalent iCal component. 
-
-   For instance: 
-
-       ./testvcal ../../test-data/user-cal.vcf
-
-*/
-
-int main(int argc, char* argv[])
-{
-    VObject *vcal = 0;
-    icalcomponent *comp;
-    char* file;
-
-    if (argc != 2){
-        file = "../../test-data/user-cal.vcf";
-    } else {
-        file = argv[1];
-    }
-
-
-    vcal = Parse_MIME_FromFileName(file);
-    
-    assert(vcal != 0);
-
-    comp = icalvcal_convert(vcal);
-
-    printf("%s\n",icalcomponent_as_ical_string(comp));
-    
-    return 0;
-}           
-
-