From 2c95c4d8e9f237bc2428b05d976d01241d3394ba Mon Sep 17 00:00:00 2001 From: Damon Chaplin Date: Tue, 3 Jul 2001 06:06:18 +0000 Subject: added virtual method to get a VTIMEZONE component given a TZID. We need 2001-07-03 Damon Chaplin * pcs/cal-backend.[hc]: added virtual method to get a VTIMEZONE component given a TZID. We need this to resolve TZIDs when expanding an event using cal_recur_generate_instances() in query.c. * pcs/cal-backend-file.c (cal_backend_file_get_timezone): implemented virtual method. (cal_backend_file_update_object): fixed bug, kind -> child_kind. * pcs/query.c (func_occur_in_time_range): use the virtual method for resolving TZIDs. The other way didn't work anyway, as we didn't have the entire VCALENDAR with VTIMEZONEs in it. * gui/dialogs/recurrence-page.c (init_widgets): (make_ending_until_special): moved the call to e_date_edit_set_get_time_callback() from init_widgets to make_ending_until_special(), since that is where the widget gets created. * gui/e-timezone-entry.c (e_timezone_entry_set_timezone): handle zone being NULL. svn path=/trunk/; revision=10732 --- calendar/gui/dialogs/recurrence-page.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'calendar/gui/dialogs/recurrence-page.c') diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c index 4023cd6b5a..a8961fef7b 100644 --- a/calendar/gui/dialogs/recurrence-page.c +++ b/calendar/gui/dialogs/recurrence-page.c @@ -1220,6 +1220,12 @@ make_ending_until_special (RecurrencePage *rpage) gtk_signal_connect (GTK_OBJECT (de), "changed", GTK_SIGNAL_FUNC (ending_until_changed_cb), rpage); + + /* Make sure the EDateEdit widget uses our timezones to get the + current time. */ + e_date_edit_set_get_time_callback (de, + (EDateEditGetTimeCallback) comp_editor_get_current_time, + rpage, NULL); } /* Callback used when the ending-count value changes */ @@ -2113,9 +2119,6 @@ init_widgets (RecurrencePage *rpage) e_date_edit_set_get_time_callback (E_DATE_EDIT (priv->exception_date), (EDateEditGetTimeCallback) comp_editor_get_current_time, rpage, NULL); - e_date_edit_set_get_time_callback (E_DATE_EDIT (priv->ending_date_edit), - (EDateEditGetTimeCallback) comp_editor_get_current_time, - rpage, NULL); e_calendar_item_set_get_time_callback (ecal->calitem, (ECalendarItemGetTimeCallback) comp_editor_get_current_time, rpage, NULL); -- cgit v1.2.3