diff options
Diffstat (limited to 'calendar/gui')
| -rw-r--r-- | calendar/gui/dialogs/recurrence-page.c | 9 | ||||
| -rw-r--r-- | calendar/gui/e-timezone-entry.c | 2 |
2 files changed, 7 insertions, 4 deletions
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); diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c index e7e64f0934..2b4f06af6d 100644 --- a/calendar/gui/e-timezone-entry.c +++ b/calendar/gui/e-timezone-entry.c @@ -286,7 +286,7 @@ e_timezone_entry_set_timezone (ETimezoneEntry *tentry, priv->changed = FALSE; gtk_entry_set_text (GTK_ENTRY (priv->entry), - e_timezone_entry_get_display_name (zone)); + zone ? e_timezone_entry_get_display_name (zone) : ""); } |