From d6fade43cf3eb5fcf722b3a01342705fc312bd79 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Wed, 8 Nov 2000 21:45:19 +0000 Subject: These changes fix bugzilla bugs #874 and #875. 2000-11-08 Federico Mena Quintero These changes fix bugzilla bugs #874 and #875. * cal-util/cal-component.c (cal_component_get_exdate_list): Return a list of CalComponentDateTime instead of simple struct icaltimetype objects. Exception date properties *can* contain a timezone parameter, so we need to include those if they are present. (cal_component_set_exdate_list): On the input, handle a list of CalComponentDateTime structures. On the internals, handle a list of struct datetime instead of plain properties. (cal_component_free_exdate_list): Handle a list of CalComponentDateTime structures. (scan_exdate): Create a list of struct datetime structures. (free_icalcomponent): Free the exdate_list properly. * cal-util/cal-recur.c (generate_instances_for_chunk): Use the proper types for exception dates. * gui/comp-util.h: * gui/comp-util.c: New files with utilities for manipulating calendar component objects. (cal_comp_util_add_exdate): New function. * gui/Makefile.am (evolution_calendar_SOURCES): Added comp-util.[ch] to the list of sources. * gui/e-day-view.c (add_exdate): New convenience function to add an exception date to a calendar component. (e_day_view_on_unrecur_appointment): Use cal_comp_util_add_exdate(). (e_day_view_on_delete_occurrence): Likewise. * gui/e-week-view.c (e_week_view_on_delete_occurrence): Likewise. (e_week_view_on_unrecur_appointment): Likewise. * gui/event-editor.c (nth_weekday): Be paranoid about valid position values. (fill_widgets): Use the proper types for exdates. (dialog_to_comp_object): Likewise. svn path=/trunk/; revision=6517 --- calendar/gui/event-editor.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'calendar/gui/event-editor.c') diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c index 0eca5fdec9..59f08c2267 100644 --- a/calendar/gui/event-editor.c +++ b/calendar/gui/event-editor.c @@ -975,16 +975,12 @@ init_widgets (EventEditor *ee) /* Recurrence units */ menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->recurrence_interval_unit)); - g_assert (menu != NULL); - gtk_signal_connect (GTK_OBJECT (menu), "selection_done", GTK_SIGNAL_FUNC (recur_interval_selection_done_cb), ee); /* Recurrence ending */ menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->recurrence_ending_menu)); - g_assert (menu != NULL); - gtk_signal_connect (GTK_OBJECT (menu), "selection_done", GTK_SIGNAL_FUNC (recur_ending_selection_done_cb), ee); @@ -1528,11 +1524,11 @@ fill_widgets (EventEditor *ee) cal_component_get_exdate_list (priv->comp, &list); for (l = list; l; l = l->next) { - struct icaltimetype *t; + CalComponentDateTime *cdt; time_t ext; - - t = l->data; - ext = icaltime_as_timet (*t); + + cdt = l->data; + ext = icaltime_as_timet (*cdt->value); append_exception (ee, ext); } @@ -1572,6 +1568,8 @@ classification_get (GtkWidget *widget) static short nth_weekday (int pos, icalrecurrencetype_weekday weekday) { + g_assert (pos > 0 && pos <= 5); + return (pos << 3) | (int) weekday; } @@ -1872,18 +1870,21 @@ dialog_to_comp_object (EventEditor *ee, CalComponent *comp) list = NULL; exception_list = GTK_CLIST (priv->recurrence_exception_list); for (i = 0; i < exception_list->rows; i++) { - struct icaltimetype *tt; + CalComponentDateTime *cdt; time_t *tim; - + + cdt = g_new (CalComponentDateTime, 1); + cdt->value = g_new (struct icaltimetype, 1); + cdt->tzid = NULL; + tim = gtk_clist_get_row_data (exception_list, i); - tt = g_new0 (struct icaltimetype, 1); - *tt = icaltime_from_timet (*tim, FALSE, FALSE); + *cdt->value = icaltime_from_timet (*tim, FALSE, FALSE); - list = g_slist_prepend (list, tt); + list = g_slist_prepend (list, cdt); } + cal_component_set_exdate_list (comp, list); - if (list) - cal_component_free_exdate_list (list); + cal_component_free_exdate_list (list); cal_component_commit_sequence (comp); } -- cgit v1.2.3