* Another shot at timezone handling (ugggghh)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index a2f05fb214146226d7818b506a35121d053ef9e5..152ea6f332a480500f7f38c5169e74d64112a90d 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
  $Log$

+ Revision 601.95  2002/12/25 21:46:19  ajc
+ * Another shot at timezone handling (ugggghh)
+

  Revision 601.94  2002/12/25 07:05:26  ajc
  * set up ical_dezonify() to be called at appropriate times
    (but it doesn't seem to work correctly yet)
  Revision 601.94  2002/12/25 07:05:26  ajc
  * set up ical_dezonify() to be called at appropriate times
    (but it doesn't seem to work correctly yet)


@@ -4323,3 +4326,4 @@ 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
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import

+

diff --git a/citadel/serv_calendar.c b/citadel/serv_calendar.c
index 4abbbf776b795d213780a1ba9cd98c6ed5fffa39..2e8acf5a55b140086210cd267be61f64e8cbc6ef 100644 (file)
--- a/citadel/serv_calendar.c
+++ b/citadel/serv_calendar.c
@@ -139,7 +139,6 @@ void ical_send_a_reply(icalcomponent *request, char *action) {
        }
 
        the_reply = icalcomponent_new_clone(request);
        }
 
        the_reply = icalcomponent_new_clone(request);

-       ical_dezonify(the_reply);

        if (the_reply == NULL) {
                lprintf(3, "ERROR: cannot clone request\n");
                return;
        if (the_reply == NULL) {
                lprintf(3, "ERROR: cannot clone request\n");
                return;


@@ -273,7 +272,9 @@ void ical_locate_part(char *name, char *filename, char *partnum, char *disp,
        }
        if (strcasecmp(partnum, ird->desired_partnum)) return;
        ird->cal = icalcomponent_new_from_string(content);
        }
        if (strcasecmp(partnum, ird->desired_partnum)) return;
        ird->cal = icalcomponent_new_from_string(content);

-       ical_dezonify(ird->cal);
+       if (ird->cal != NULL) {
+               ical_dezonify(ird->cal);
+       }

 }
 
 
 }
 
 


@@ -415,7 +416,6 @@ void ical_locate_original_event(char *name, char *filename, char *partnum, char
                icalcomponent_free(oec->c);
        }
        oec->c = icalcomponent_new_from_string(content);
                icalcomponent_free(oec->c);
        }
        oec->c = icalcomponent_new_from_string(content);

-       ical_dezonify(oec->c);

 }
 
 
 }
 
 


@@ -451,7 +451,6 @@ void ical_merge_attendee_reply(icalcomponent *event, icalcomponent *reply) {
 
        /* Clone the reply, because we're going to rip its guts out. */
        reply = icalcomponent_new_clone(reply);
 
        /* Clone the reply, because we're going to rip its guts out. */
        reply = icalcomponent_new_clone(reply);

-       ical_dezonify(reply);

 
        /* At this point we're looking at the correct subcomponents.
         * Iterate through the attendees looking for a match.
 
        /* At this point we're looking at the correct subcomponents.
         * Iterate through the attendees looking for a match.


@@ -1070,7 +1069,6 @@ void ical_send_out_invitations(icalcomponent *cal) {
                lprintf(3, "ERROR: cannot clone calendar object\n");
                return;
        }
                lprintf(3, "ERROR: cannot clone calendar object\n");
                return;
        }

-       ical_dezonify(the_request);

 
        /* Extract the summary string -- we'll use it as the
         * message subject for the request
 
        /* Extract the summary string -- we'll use it as the
         * message subject for the request


@@ -1246,7 +1244,6 @@ void ical_ctdl_set_extended_msgid(char *name, char *filename, char *partnum,
         */
        if (!strcasecmp(cbtype, "text/calendar")) {
                cal = icalcomponent_new_from_string(content);
         */
        if (!strcasecmp(cbtype, "text/calendar")) {
                cal = icalcomponent_new_from_string(content);

-               ical_dezonify(cal);

                if (cal != NULL) {
                        p = ical_ctdl_get_subprop(cal, ICAL_UID_PROPERTY);
                        if (p != NULL) {
                if (cal != NULL) {
                        p = ical_ctdl_get_subprop(cal, ICAL_UID_PROPERTY);
                        if (p != NULL) {


@@ -1373,7 +1370,6 @@ void ical_obj_aftersave_backend(char *name, char *filename, char *partnum,
        if (!strcasecmp(cbtype, "text/calendar")) {
                cal = icalcomponent_new_from_string(content);
                if (cal != NULL) {
        if (!strcasecmp(cbtype, "text/calendar")) {
                cal = icalcomponent_new_from_string(content);
                if (cal != NULL) {

-                       ical_dezonify(cal);

                        ical_saving_vevent(cal);
                        icalcomponent_free(cal);
                }
                        ical_saving_vevent(cal);
                        icalcomponent_free(cal);
                }