From 5ff2d06f63f5596ac2bd8f991f5f207fe92e6f1f Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Thu, 14 Dec 2000 04:48:45 +0000 Subject: Even though icaltime_from_timet() now properly ignores the is_utc argument 2000-12-13 Federico Mena Quintero * cal-util/cal-component.c (ensure_mandatory_properties): Even though icaltime_from_timet() now properly ignores the is_utc argument since time_t values *are* in UTC by definition, we were passing FALSE for that argument's value in a bunch of places. So although it is ignored, changed them to TRUE for consistency. Hopefully newer versions of libical will remove that argument entirely since it does not make sense to speak of non-absolute time_t values. * cal-util/cal-recur.c (cal_recur_set_rule_end_date): Likewise. * conduits/calendar/calendar-conduit.c (comp_from_remote_record): Likewise. * conduits/todo/todo-conduit.c (comp_from_remote_record): Likewise. * gui/dialogs/task-editor.c (dialog_to_comp_object): Likewise. * gui/e-day-view.c (e_day_view_on_new_appointment): Likewise. (e_day_view_on_delete_occurrence): Likewise. (e_day_view_on_unrecur_appointment): Likewise. (e_day_view_on_unrecur_appointment): Likewise. (e_day_view_finish_long_event_resize): Likewise. (e_day_view_finish_resize): Likewise. (e_day_view_key_press): Likewise. (e_day_view_on_top_canvas_drag_data_received): Likewise. (e_day_view_on_main_canvas_drag_data_received): Likewise. * gui/e-week-view.c (e_week_view_key_press): Likewise. (e_week_view_on_new_appointment): Likewise. (e_week_view_on_delete_occurrence): Likewise. (e_week_view_on_unrecur_appointment): Likewise. * gui/event-editor.c (simple_recur_to_comp_object): Likewise. (recur_to_comp_object): Likewise. (dialog_to_comp_object): Likewise. * gui/gnome-cal.c (gnome_calendar_new_appointment): Likewise. svn path=/trunk/; revision=6995 --- calendar/ChangeLog | 40 +++++++++++++++++++++++++++ calendar/cal-util/cal-component.c | 2 +- calendar/cal-util/cal-recur.c | 2 +- calendar/conduits/calendar/calendar-conduit.c | 10 +++---- calendar/conduits/todo/todo-conduit.c | 4 +-- calendar/gui/calendar-model.c | 3 +- calendar/gui/dialogs/task-editor.c | 6 ++-- calendar/gui/e-day-view.c | 32 ++++++++++----------- calendar/gui/e-week-view.c | 16 +++++------ calendar/gui/event-editor.c | 8 +++--- calendar/gui/gnome-cal.c | 4 +-- 11 files changed, 83 insertions(+), 44 deletions(-) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index df3740d539..c492b5c001 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,43 @@ +2000-12-13 Federico Mena Quintero + + * cal-util/cal-component.c (ensure_mandatory_properties): Even + though icaltime_from_timet() now properly ignores the is_utc + argument since time_t values *are* in UTC by definition, we were + passing FALSE for that argument's value in a bunch of places. So + although it is ignored, changed them to TRUE for consistency. + Hopefully newer versions of libical will remove that argument + entirely since it does not make sense to speak of non-absolute + time_t values. + + * cal-util/cal-recur.c (cal_recur_set_rule_end_date): Likewise. + + * conduits/calendar/calendar-conduit.c (comp_from_remote_record): Likewise. + + * conduits/todo/todo-conduit.c (comp_from_remote_record): Likewise. + + * gui/dialogs/task-editor.c (dialog_to_comp_object): Likewise. + + * gui/e-day-view.c (e_day_view_on_new_appointment): Likewise. + (e_day_view_on_delete_occurrence): Likewise. + (e_day_view_on_unrecur_appointment): Likewise. + (e_day_view_on_unrecur_appointment): Likewise. + (e_day_view_finish_long_event_resize): Likewise. + (e_day_view_finish_resize): Likewise. + (e_day_view_key_press): Likewise. + (e_day_view_on_top_canvas_drag_data_received): Likewise. + (e_day_view_on_main_canvas_drag_data_received): Likewise. + + * gui/e-week-view.c (e_week_view_key_press): Likewise. + (e_week_view_on_new_appointment): Likewise. + (e_week_view_on_delete_occurrence): Likewise. + (e_week_view_on_unrecur_appointment): Likewise. + + * gui/event-editor.c (simple_recur_to_comp_object): Likewise. + (recur_to_comp_object): Likewise. + (dialog_to_comp_object): Likewise. + + * gui/gnome-cal.c (gnome_calendar_new_appointment): Likewise. + 2000-12-13 Christopher James Lahey * cal-util/cal-recur.c: #if 0ed cal_obj_date_only_compare_func. diff --git a/calendar/cal-util/cal-component.c b/calendar/cal-util/cal-component.c index 823afaa663..c7a1e6e324 100644 --- a/calendar/cal-util/cal-component.c +++ b/calendar/cal-util/cal-component.c @@ -798,7 +798,7 @@ ensure_mandatory_properties (CalComponent *comp) struct icaltimetype t; tim = time (NULL); - t = icaltime_from_timet (tim, FALSE, FALSE); + t = icaltime_from_timet (tim, FALSE, TRUE); priv->dtstamp = icalproperty_new_dtstamp (t); icalcomponent_add_property (priv->icalcomp, priv->dtstamp); diff --git a/calendar/cal-util/cal-recur.c b/calendar/cal-util/cal-recur.c index 12381b7819..9b4a7f9ceb 100644 --- a/calendar/cal-util/cal-recur.c +++ b/calendar/cal-util/cal-recur.c @@ -3733,7 +3733,7 @@ cal_recur_set_rule_end_date (icalproperty *prop, struct icaltimetype icaltime; const char *end_date_string, *xname; - icaltime = icaltime_from_timet (end_date, FALSE, FALSE); + icaltime = icaltime_from_timet (end_date, FALSE, TRUE); value = icalvalue_new_datetime (icaltime); end_date_string = icalvalue_as_ical_string (value); icalvalue_free (value); diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index 10bf56c404..da3a9f2fab 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -519,7 +519,7 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit, { CalComponent *comp; struct Appointment appt; - struct icaltimetype now = icaltime_from_timet (time (NULL), FALSE, FALSE), it; + struct icaltimetype now = icaltime_from_timet (time (NULL), FALSE, TRUE), it; struct icalrecurrencetype recur; int pos, i; CalComponentText summary = {NULL, NULL}; @@ -559,7 +559,7 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit, } if (!is_empty_time (appt.begin)) { - it = icaltime_from_timet (mktime (&appt.begin), FALSE, FALSE); + it = icaltime_from_timet (mktime (&appt.begin), FALSE, TRUE); dt.value = ⁢ cal_component_set_dtstart (comp, &dt); } @@ -568,11 +568,11 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit, time_t t = mktime (&appt.begin); t = time_day_end (t); - it = icaltime_from_timet (t, FALSE, FALSE); + it = icaltime_from_timet (t, FALSE, TRUE); dt.value = ⁢ cal_component_set_dtend (comp, &dt); } else if (!is_empty_time (appt.end)) { - it = icaltime_from_timet (mktime (&appt.end), FALSE, FALSE); + it = icaltime_from_timet (mktime (&appt.end), FALSE, TRUE); dt.value = ⁢ cal_component_set_dtend (comp, &dt); } @@ -632,7 +632,7 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit, if (!appt.repeatForever) { time_t t = mktime (&appt.repeatEnd); t = time_add_day (t, 1); - recur.until = icaltime_from_timet (t, FALSE, FALSE); + recur.until = icaltime_from_timet (t, FALSE, TRUE); } list = g_slist_append (list, &recur); diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c index 236345afa1..2ef5bc0b76 100644 --- a/calendar/conduits/todo/todo-conduit.c +++ b/calendar/conduits/todo/todo-conduit.c @@ -395,7 +395,7 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit, { CalComponent *comp; struct ToDo todo; - struct icaltimetype now = icaltime_from_timet (time (NULL), FALSE, FALSE); + struct icaltimetype now = icaltime_from_timet (time (NULL), FALSE, TRUE); CalComponentText summary = {NULL, NULL}; CalComponentDateTime dt = {NULL, NULL}; struct icaltimetype due; @@ -444,7 +444,7 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit, */ if (todo.due.tm_sec || todo.due.tm_min || todo.due.tm_hour || todo.due.tm_mday || todo.due.tm_mon || todo.due.tm_year) { - due = icaltime_from_timet (mktime (&todo.due), FALSE, FALSE); + due = icaltime_from_timet (mktime (&todo.due), FALSE, TRUE); dt.value = &due; cal_component_set_due (comp, &dt); } diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c index cbf8a1195c..6cf6501910 100644 --- a/calendar/gui/calendar-model.c +++ b/calendar/gui/calendar-model.c @@ -1932,8 +1932,7 @@ ensure_task_complete (CalComponent *comp, } if (set_completed) { - new_completed = icaltime_from_timet (completed_date, FALSE, - TRUE); + new_completed = icaltime_from_timet (completed_date, FALSE, TRUE); cal_component_set_completed (comp, &new_completed); } diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index 34b62ba61e..b5e47cfdb7 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -942,7 +942,7 @@ dialog_to_comp_object (TaskEditor *tedit) /* Due Date. */ t = e_date_edit_get_time (E_DATE_EDIT (priv->due_date)); if (t != -1) { - *date.value = icaltime_from_timet (t, FALSE, FALSE); + *date.value = icaltime_from_timet (t, FALSE, TRUE); cal_component_set_due (comp, &date); } else { cal_component_set_due (comp, NULL); @@ -951,7 +951,7 @@ dialog_to_comp_object (TaskEditor *tedit) /* Start Date. */ t = e_date_edit_get_time (E_DATE_EDIT (priv->start_date)); if (t != -1) { - *date.value = icaltime_from_timet (t, FALSE, FALSE); + *date.value = icaltime_from_timet (t, FALSE, TRUE); cal_component_set_dtstart (comp, &date); } else { cal_component_set_dtstart (comp, NULL); @@ -960,7 +960,7 @@ dialog_to_comp_object (TaskEditor *tedit) /* Completed Date. */ t = e_date_edit_get_time (E_DATE_EDIT (priv->completed_date)); if (t != -1) { - *date.value = icaltime_from_timet (t, FALSE, FALSE); + *date.value = icaltime_from_timet (t, FALSE, TRUE); cal_component_set_completed (comp, date.value); } else { cal_component_set_completed (comp, NULL); diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c index 0d941caaff..861b2e04ad 100644 --- a/calendar/gui/e-day-view.c +++ b/calendar/gui/e-day-view.c @@ -3024,10 +3024,10 @@ e_day_view_on_new_appointment (GtkWidget *widget, gpointer data) date.value = &itt; date.tzid = NULL; - *date.value = icaltime_from_timet (dtstart, FALSE, FALSE); + *date.value = icaltime_from_timet (dtstart, FALSE, TRUE); cal_component_set_dtstart (comp, &date); - *date.value = icaltime_from_timet (dtend, FALSE, FALSE); + *date.value = icaltime_from_timet (dtend, FALSE, TRUE); cal_component_set_dtend (comp, &date); cal_component_commit_sequence (comp); @@ -3076,7 +3076,7 @@ e_day_view_on_delete_occurrence (GtkWidget *widget, gpointer data) /* We must duplicate the CalComponent, or we won't know it has changed when we get the "update_event" callback. */ comp = cal_component_clone (event->comp); - cal_comp_util_add_exdate (comp, icaltime_from_timet (event->start, FALSE, FALSE)); + cal_comp_util_add_exdate (comp, icaltime_from_timet (event->start, FALSE, TRUE)); if (!cal_client_update_object (day_view->client, comp)) g_message ("e_day_view_on_delete_occurrence(): Could not update the object!"); @@ -3135,7 +3135,7 @@ e_day_view_on_unrecur_appointment (GtkWidget *widget, gpointer data) instance. */ comp = cal_component_clone (event->comp); - cal_comp_util_add_exdate (comp, icaltime_from_timet (event->start, FALSE, FALSE)); + cal_comp_util_add_exdate (comp, icaltime_from_timet (event->start, FALSE, TRUE)); /* For the unrecurred instance we duplicate the original object, create a new uid for it, get rid of the recurrence rules, and set @@ -3150,9 +3150,9 @@ e_day_view_on_unrecur_appointment (GtkWidget *widget, gpointer data) date.value = &itt; date.tzid = NULL; - *date.value = icaltime_from_timet (event->start, FALSE, FALSE); + *date.value = icaltime_from_timet (event->start, FALSE, TRUE); cal_component_set_dtstart (new_comp, &date); - *date.value = icaltime_from_timet (event->end, FALSE, FALSE); + *date.value = icaltime_from_timet (event->end, FALSE, TRUE); cal_component_set_dtend (new_comp, &date); /* Now update both CalComponents. Note that we do this last since at @@ -3678,11 +3678,11 @@ e_day_view_finish_long_event_resize (EDayView *day_view) if (day_view->resize_drag_pos == E_DAY_VIEW_POS_LEFT_EDGE) { dt = day_view->day_starts[day_view->resize_start_row]; - *date.value = icaltime_from_timet (dt, FALSE, FALSE); + *date.value = icaltime_from_timet (dt, FALSE, TRUE); cal_component_set_dtstart (comp, &date); } else { dt = day_view->day_starts[day_view->resize_end_row + 1]; - *date.value = icaltime_from_timet (dt, FALSE, FALSE); + *date.value = icaltime_from_timet (dt, FALSE, TRUE); cal_component_set_dtend (comp, &date); } @@ -3724,11 +3724,11 @@ e_day_view_finish_resize (EDayView *day_view) if (day_view->resize_drag_pos == E_DAY_VIEW_POS_TOP_EDGE) { dt = e_day_view_convert_grid_position_to_time (day_view, day, day_view->resize_start_row); - *date.value = icaltime_from_timet (dt, FALSE, FALSE); + *date.value = icaltime_from_timet (dt, FALSE, TRUE); cal_component_set_dtstart (comp, &date); } else { dt = e_day_view_convert_grid_position_to_time (day_view, day, day_view->resize_end_row + 1); - *date.value = icaltime_from_timet (dt, FALSE, FALSE); + *date.value = icaltime_from_timet (dt, FALSE, TRUE); cal_component_set_dtend (comp, &date); } @@ -4783,10 +4783,10 @@ e_day_view_key_press (GtkWidget *widget, GdkEventKey *event) dt.value = &itt; dt.tzid = NULL; - *dt.value = icaltime_from_timet (dtstart, FALSE, FALSE); + *dt.value = icaltime_from_timet (dtstart, FALSE, TRUE); cal_component_set_dtstart (comp, &dt); - *dt.value = icaltime_from_timet (dtend, FALSE, FALSE); + *dt.value = icaltime_from_timet (dtend, FALSE, TRUE); cal_component_set_dtend (comp, &dt); /* We add the event locally and start editing it. When we get the @@ -6297,13 +6297,13 @@ e_day_view_on_top_canvas_drag_data_received (GtkWidget *widget, date.tzid = NULL; dt = day_view->day_starts[day] + start_offset * 60; - *date.value = icaltime_from_timet (dt, FALSE, FALSE); + *date.value = icaltime_from_timet (dt, FALSE, TRUE); cal_component_set_dtstart (comp, &date); if (end_offset == -1 || end_offset == 0) dt = day_view->day_starts[day + num_days]; else dt = day_view->day_starts[day + num_days - 1] + end_offset * 60; - *date.value = icaltime_from_timet (dt, FALSE, FALSE); + *date.value = icaltime_from_timet (dt, FALSE, TRUE); cal_component_set_dtend (comp, &date); gtk_drag_finish (context, TRUE, TRUE, time); @@ -6401,10 +6401,10 @@ e_day_view_on_main_canvas_drag_data_received (GtkWidget *widget, date.tzid = NULL; dt = e_day_view_convert_grid_position_to_time (day_view, day, row) + start_offset * 60; - *date.value = icaltime_from_timet (dt, FALSE, FALSE); + *date.value = icaltime_from_timet (dt, FALSE, TRUE); cal_component_set_dtstart (comp, &date); dt = e_day_view_convert_grid_position_to_time (day_view, day, row + num_rows) - end_offset * 60; - *date.value = icaltime_from_timet (dt, FALSE, FALSE); + *date.value = icaltime_from_timet (dt, FALSE, TRUE); cal_component_set_dtend (comp, &date); gtk_drag_finish (context, TRUE, TRUE, time); diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index a6d42b8bbd..916034991b 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -3127,9 +3127,9 @@ e_week_view_key_press (GtkWidget *widget, GdkEventKey *event) date.value = &itt; date.tzid = NULL; - *date.value = icaltime_from_timet (dtstart, FALSE, FALSE); + *date.value = icaltime_from_timet (dtstart, FALSE, TRUE); cal_component_set_dtstart (comp, &date); - *date.value = icaltime_from_timet (dtend, FALSE, FALSE); + *date.value = icaltime_from_timet (dtend, FALSE, TRUE); cal_component_set_dtend (comp, &date); /* We add the event locally and start editing it. When we get the @@ -3242,11 +3242,11 @@ e_week_view_on_new_appointment (GtkWidget *widget, gpointer data) date.tzid = NULL; dt = week_view->day_starts[week_view->selection_start_day]; - *date.value = icaltime_from_timet (dt, TRUE, FALSE); + *date.value = icaltime_from_timet (dt, TRUE, TRUE); cal_component_set_dtstart (comp, &date); dt = week_view->day_starts[week_view->selection_end_day + 1]; - *date.value = icaltime_from_timet (dt, TRUE, FALSE); + *date.value = icaltime_from_timet (dt, TRUE, TRUE); cal_component_set_dtend (comp, &date); cal_component_commit_sequence (comp); @@ -3300,7 +3300,7 @@ e_week_view_on_delete_occurrence (GtkWidget *widget, gpointer data) when we get the "update_event" callback. */ comp = cal_component_clone (event->comp); - cal_comp_util_add_exdate (comp, icaltime_from_timet (event->start, TRUE, FALSE)); + cal_comp_util_add_exdate (comp, icaltime_from_timet (event->start, TRUE, TRUE)); if (!cal_client_update_object (week_view->client, comp)) g_message ("e_week_view_on_delete_occurrence(): Could not update the object!"); @@ -3356,7 +3356,7 @@ e_week_view_on_unrecur_appointment (GtkWidget *widget, gpointer data) /* For the recurring object, we add a exception to get rid of the instance. */ comp = cal_component_clone (event->comp); - cal_comp_util_add_exdate (comp, icaltime_from_timet (event->start, TRUE, FALSE)); + cal_comp_util_add_exdate (comp, icaltime_from_timet (event->start, TRUE, TRUE)); /* For the unrecurred instance we duplicate the original object, create a new uid for it, get rid of the recurrence rules, and set @@ -3371,9 +3371,9 @@ e_week_view_on_unrecur_appointment (GtkWidget *widget, gpointer data) date.value = &itt; date.tzid = NULL; - *date.value = icaltime_from_timet (event->start, TRUE, FALSE); + *date.value = icaltime_from_timet (event->start, TRUE, TRUE); cal_component_set_dtstart (new_comp, &date); - *date.value = icaltime_from_timet (event->end, TRUE, FALSE); + *date.value = icaltime_from_timet (event->end, TRUE, TRUE); cal_component_set_dtend (new_comp, &date); /* Now update both CalComponents. Note that we do this last since at diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c index 85dc3025ef..6f30b45797 100644 --- a/calendar/gui/event-editor.c +++ b/calendar/gui/event-editor.c @@ -2155,7 +2155,7 @@ simple_recur_to_comp_object (EventEditor *ee, CalComponent *comp) r.until = icaltime_from_timet ( e_date_edit_get_time (E_DATE_EDIT (priv->recurrence_ending_date_edit)), - TRUE, FALSE); + TRUE, TRUE); break; case ENDING_FOREVER: @@ -2224,7 +2224,7 @@ recur_to_comp_object (EventEditor *ee, CalComponent *comp) cdt->tzid = NULL; tim = gtk_clist_get_row_data (exception_list, i); - *cdt->value = icaltime_from_timet (*tim, FALSE, FALSE); + *cdt->value = icaltime_from_timet (*tim, FALSE, TRUE); list = g_slist_prepend (list, cdt); } @@ -2289,7 +2289,7 @@ dialog_to_comp_object (EventEditor *ee, CalComponent *comp) t = e_date_edit_get_time (E_DATE_EDIT (priv->start_time)); if (t != -1) { - *date.value = icaltime_from_timet (t, FALSE, FALSE); + *date.value = icaltime_from_timet (t, FALSE, TRUE); cal_component_set_dtstart (comp, &date); } else { /* FIXME: What do we do here? */ @@ -2303,7 +2303,7 @@ dialog_to_comp_object (EventEditor *ee, CalComponent *comp) if (all_day_event) t = time_day_end (t); - *date.value = icaltime_from_timet (t, FALSE, FALSE); + *date.value = icaltime_from_timet (t, FALSE, TRUE); cal_component_set_dtend (comp, &date); } else { /* FIXME: What do we do here? */ diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index bbc0e0e1b9..e64ecbe706 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -1804,10 +1804,10 @@ gnome_calendar_new_appointment (GnomeCalendar *gcal) comp = cal_component_new (); cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT); - itt = icaltime_from_timet (dtstart, FALSE, FALSE); + itt = icaltime_from_timet (dtstart, FALSE, TRUE); cal_component_set_dtstart (comp, &dt); - itt = icaltime_from_timet (dtend, FALSE, FALSE); + itt = icaltime_from_timet (dtend, FALSE, TRUE); cal_component_set_dtend (comp, &dt); cal_component_commit_sequence (comp); -- cgit v1.2.3