From 405cdd1ea2729f05512a3d9052a5683c34f556b1 Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Thu, 12 Jul 2001 00:57:31 +0000 Subject: Fixes bug #4380 as well as some leftovers from the days of struct tm and 2001-07-11 Federico Mena Quintero Fixes bug #4380 as well as some leftovers from the days of struct tm and some uninitialized values. * gui/gnome-cal.c (gnome_calendar_on_date_navigator_selection_changed): Initialize the icaltimetype structures completely. (gnome_calendar_init): Do not reset priv->zone to NULL here, since it was set by gnome_calendar_update_config_settings() from setup_widgets(). * gui/calendar-model.c (set_completed): Do not set is_daylight. * gui/e-day-view.c (e_day_view_convert_grid_position_to_time): Likewise. * gui/e-week-view.c (e_week_view_set_timezone): Likewise. * cal-util/cal-recur.c (generate_instances_for_chunk): Likewise, and initialize start_tt and end_tt completely. * cal-util/timeutil.c (time_year_begin_with_zone): Likewise. (time_month_begin_with_zone): Likewise. (time_week_begin_with_zone): Likewise. (time_day_begin_with_zone): Likewise. (time_day_end_with_zone): Likewise. (time_from_isodate): Likewise. * gui/dialogs/task-page.c (task_page_fill_component): Initialize icaltime before using it. * gui/dialogs/event-page.c (event_page_fill_component): Likewise. * gui/dialogs/recurrence-page.c (simple_recur_to_comp): Removed an unused icaltimetype. * gui/dialogs/task-details-page.c (task_details_page_fill_component): Initialize icaltime before using it. svn path=/trunk/; revision=11024 --- calendar/gui/dialogs/event-page.c | 6 ++---- calendar/gui/dialogs/recurrence-page.c | 7 ------- calendar/gui/dialogs/task-details-page.c | 4 ++-- calendar/gui/dialogs/task-page.c | 6 ++---- 4 files changed, 6 insertions(+), 17 deletions(-) (limited to 'calendar/gui/dialogs') diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 5d0249bbd0..367412cbab 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -498,14 +498,12 @@ event_page_fill_component (CompEditorPage *page, CalComponent *comp) /* Dates */ + icaltime = icaltime_null_time (); + date.value = &icaltime; date.tzid = NULL; - icaltime.is_utc = 0; /* FIXME: We should use is_date at some point. */ - icaltime.is_date = 0; - icaltime.is_daylight = 0; - icaltime.second = 0; date_set = e_date_edit_get_date (E_DATE_EDIT (priv->start_time), &icaltime.year, diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c index 54cd1e25c3..4938877133 100644 --- a/calendar/gui/dialogs/recurrence-page.c +++ b/calendar/gui/dialogs/recurrence-page.c @@ -614,7 +614,6 @@ simple_recur_to_comp (RecurrencePage *rpage, CalComponent *comp) GSList l; enum ending_type ending_type; gboolean date_set; - struct icaltimetype icaltime = icaltime_null_time (); priv = rpage->priv; @@ -756,12 +755,6 @@ simple_recur_to_comp (RecurrencePage *rpage, CalComponent *comp) g_assert (priv->ending_date_edit != NULL); g_assert (E_IS_DATE_EDIT (priv->ending_date_edit)); - /* UNTIL must be in UTC, unless it is a date. So we probably - want to convert it to local time when showing. */ - icaltime.is_utc = 0; - icaltime.is_date = 1; - icaltime.is_daylight = 0; - date_set = e_date_edit_get_date (E_DATE_EDIT (priv->ending_date_edit), &r.until.year, &r.until.month, diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c index 52a1fe2706..1af190a201 100644 --- a/calendar/gui/dialogs/task-details-page.c +++ b/calendar/gui/dialogs/task-details-page.c @@ -301,10 +301,10 @@ task_details_page_fill_component (CompEditorPage *page, CalComponent *comp) tdpage = TASK_DETAILS_PAGE (page); priv = tdpage->priv; + icaltime = icaltime_null_time (); + /* COMPLETED must be in UTC. */ icaltime.is_utc = 1; - icaltime.is_date = 0; - icaltime.is_daylight = 0; /* Completed Date. */ date_set = e_date_edit_get_date (E_DATE_EDIT (priv->completed_date), diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index 6127087b3b..2ba37b7c6a 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -554,14 +554,12 @@ task_page_fill_component (CompEditorPage *page, CalComponent *comp) /* Dates */ + icaltime = icaltime_null_time (); + date.value = &icaltime; date.tzid = NULL; - icaltime.is_utc = 0; /* FIXME: We should use is_date at some point. */ - icaltime.is_date = 0; - icaltime.is_daylight = 0; - icaltime.second = 0; /* Due Date. */ date_set = e_date_edit_get_date (E_DATE_EDIT (priv->due_date), -- cgit