From 6de272b8d7d61e231a0eb26d2a1a7bbcaa760a07 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Wed, 25 Dec 2002 23:17:07 +0000
Subject: [PATCH] * ical_dezonify.c: shuffle around #includes and #ifdef's

---
 citadel/ChangeLog       |  4 +++-
 citadel/ical_dezonify.c | 33 ++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 152ea6f33..c3035f758 100644
--- 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 d1eb69521..6a49cad4c 100644
--- 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. */
 
-- 
2.30.2