* ical_dezonify.c: shuffle around #includes and #ifdef's

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 152ea6f332a480500f7f38c5169e74d64112a90d..c3035f75853438d23dbf0a72f1197b7fc114b202 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 601.96  2002/12/25 23:17:07  ajc
+ * ical_dezonify.c: shuffle around #includes and #ifdef's
+
  Revision 601.95  2002/12/25 21:46:19  ajc
  * Another shot at timezone handling (ugggghh)
 
@@ -4326,4 +4329,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/ical_dezonify.c b/citadel/ical_dezonify.c
index d1eb6952115978725d3d1e035ec95bc3069f0efd..6a49cad4cc7cf39641d01580d28e1e7c266e6749 100644 (file)
--- a/citadel/ical_dezonify.c
+++ b/citadel/ical_dezonify.c
@@ -7,14 +7,22 @@
  *
  */
 
-#ifdef HAVE_ICAL_H
 
-#include <stdlib.h>
+#include "sysdep.h"
 #include <unistd.h>
-#include <string.h>
-#include <ctype.h>
-#include <fcntl.h>
 #include <sys/types.h>
+#include <limits.h>
+#include <stdio.h>
+#include <string.h>
+#include <strings.h>
+#include "citadel.h"
+#include "server.h"
+#include "citserver.h"
+#include "sysdep_decls.h"
+#include "support.h"
+#include "config.h"
+
+#ifdef HAVE_ICAL_H
 #include <ical.h>
 #include "ical_dezonify.h"
 
@@ -35,24 +43,15 @@ void ical_dezonify_backend(icalcomponent *cal, icalproperty *prop) {
 
        /* Hunt for a TZID parameter in this property. */
        param = icalproperty_get_first_parameter(prop, ICAL_TZID_PARAMETER);
-       if (param == NULL) {
-               printf("No tzid parameter found - "
-                       "perhaps this component is already UTC?\n");
-               return;
-       }
+       if (param == NULL) return;
 
        /* Get the stringish name of this TZID. */
        tzid = icalparameter_get_tzid(param);
-       if (tzid == NULL) {
-               printf("icalparameter_get_tzid() returned NULL\n");
-               return;
-       }
+       if (tzid == NULL) return;
 
        /* Convert it to an icaltimezone type. */
        t = icalcomponent_get_timezone(cal, tzid);
-       if (t == NULL) {
-               printf("icalcomponent_get_timezone(%s) returned NULL\n", tzid);
-       }
+       if (t == NULL) return;
 
        /* Now we know the timezone.  Convert to UTC. */