* Be more strategic about when to call ical_dezonify()

  (This may be the last set of fixes.  I hope so.)

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index a7a07c3a41cd76380990f3e51748673dcddffaa8..45feeaa2c479b0895590f33dc518f3ed17e3d684 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,8 @@
 $Log$
+Revision 400.70  2002/12/25 23:18:06  ajc
+* Be more strategic about when to call ical_dezonify()
+  (This may be the last set of fixes.  I hope so.)
+
 Revision 400.69  2002/12/25 21:39:38  ajc
 * ical_dezonify.c: added.
 * calendar.c: convert incoming ical messages to UTC
@@ -1194,4 +1198,3 @@ Sun Dec  6 19:50:55 EST 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
-

diff --git a/webcit/calendar.c b/webcit/calendar.c
index dffbe339e97b42e0057637671f7428be02ef644f..975efd10e215fca718e1267b72857f1c2a6ce0f4 100644 (file)
--- a/webcit/calendar.c
+++ b/webcit/calendar.c
@@ -220,6 +220,7 @@ void cal_process_object(icalcomponent *cal,
        if (the_method == ICAL_METHOD_REQUEST) {
 
                /* Check for conflicts */
+               lprintf(9, "Checking server calendar for conflicts...\n");
                serv_printf("ICAL conflicts|%ld|%s|", msgnum, cal_partnum);
                serv_gets(buf);
                if (buf[0] == '1') {
@@ -248,6 +249,7 @@ void cal_process_object(icalcomponent *cal,
                                        "</TD></TR>\n");
                        }
                }
+               lprintf(9, "...done.\n");
 
                /* Display the Accept/Decline buttons */
                wprintf("<TR><TD COLSPAN=2>"

diff --git a/webcit/ical_dezonify.c b/webcit/ical_dezonify.c
index 642da726e1da8bd4c8bfb41f2fd052bd8f94345b..1902b26e11498e90378bf10b41a51fc50f832d58 100644 (file)
--- a/webcit/ical_dezonify.c
+++ b/webcit/ical_dezonify.c
@@ -34,24 +34,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. */