- wprintf("<TR><TD>");
- wprintf(_("Due date:"));
- wprintf("</TD><TD>");
- p = icalcomponent_get_first_property(vtodo, ICAL_DUE_PROPERTY);
- if (p != NULL) {
- t = icalproperty_get_due(p);
- }
- else {
- t = icaltime_from_timet(now, 0);
- }
- display_icaltimetype_as_webform(&t, "due");
- wprintf("</TD></TR>\n");
- wprintf("<TR><TD>");
- wprintf(_("Description:"));
- wprintf("</TD><TD>");
- wprintf("<TEXTAREA NAME=\"description\" wrap=soft "
- "ROWS=10 COLS=80 WIDTH=80>\n"
- );
- p = icalcomponent_get_first_property(vtodo, ICAL_DESCRIPTION_PROPERTY);
- if (p != NULL) {
- escputs((char *)icalproperty_get_comment(p));
- }
- wprintf("</TEXTAREA></TD></TR></TABLE>\n");
-
- wprintf("<CENTER>"
- "<INPUT TYPE=\"submit\" NAME=\"save_button\" VALUE=\"%s\">"
- " "
- "<INPUT TYPE=\"submit\" NAME=\"delete_button\" VALUE=\"%s\">\n"
- " "
- "<INPUT TYPE=\"submit\" NAME=\"cancel_button\" VALUE=\"%s\">\n"
- "</CENTER>\n",
- _("Save"),
- _("Delete"),
- _("Cancel")
- );
+ /*
+ * Just let libical iterate the recurrence, and keep looping back to the top of this function,
+ * adding new hash entries that all point back to the same msgnum, until either the iteration
+ * stops or some outer bound is reached. The display code will automatically do the Right Thing.
+ */
+ cptr = cal;
+ if (icalcomponent_isa(cptr) != ICAL_VEVENT_COMPONENT) {
+ cptr = icalcomponent_get_first_component(cptr, ICAL_VEVENT_COMPONENT);
+ }
+ if (!cptr) return;
+ ps = icalcomponent_get_first_property(cptr, ICAL_DTSTART_PROPERTY);
+ if (ps == NULL) return;
+ dtstart = icalproperty_get_dtstart(ps);
+ rrule = icalcomponent_get_first_property(cptr, ICAL_RRULE_PROPERTY);
+ if (!rrule) return;
+ recur = icalproperty_get_rrule(rrule);
+ ritr = icalrecur_iterator_new(recur, dtstart);
+ if (!ritr) return;
+
+ while (next = icalrecur_iterator_next(ritr), ((!icaltime_is_null_time(next))&&(!stop_rr)) ) {
+ ++num_recur;
+ if (num_recur > 1) { /* Skip the first one. We already did it at the root. */
+ icalcomponent *cptr;
+ /* lprintf(9, "REPEATS: %s\n", icaltime_as_ical_string(next)); */
+
+ /* Note: anything we do here, we also have to do above for the root event. */
+ Cal = (disp_cal*) malloc(sizeof(disp_cal));
+ memset(Cal, 0, sizeof(disp_cal));
+ Cal->cal = icalcomponent_new_clone(cal);
+ Cal->unread = unread;
+ len = strlen(from);
+ Cal->from = (char*)malloc(len+ 1);
+ memcpy(Cal->from, from, len + 1);
+ Cal->cal_msgnum = msgnum;
+
+ if (icalcomponent_isa(Cal->cal) == ICAL_VEVENT_COMPONENT) {
+ cptr = Cal->cal;
+ }
+ else {
+ cptr = icalcomponent_get_first_component(Cal->cal, ICAL_VEVENT_COMPONENT);
+ }
+ if (cptr) {
+ ps = icalcomponent_get_first_property(cptr, ICAL_DTSTART_PROPERTY);
+ if (ps != NULL) {
+ icalcomponent_remove_property(cptr, ps);
+ ps = icalproperty_new_dtstart(next);
+ icalcomponent_add_property(cptr, ps);
+
+ Cal->event_start = icaltime_as_timet(next);
+ final_recurrence = Cal->event_start;
+ }