diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/gui/dialogs/recurrence-page.c | 16 |
2 files changed, 17 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 43fb30da85..6b186560e2 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2006-11-06 Chenthill Palanisamy <pchenthill@novell.com> + + Committing for Ben Gamari <bgamari@gmail.com> + + * recurrence-page.c: Correct recurrence editor default behavior. + Fixes #354875 + 2006-10-16 Kjartan Maraas <kmaraas@gnome.org> * gui/cal-search-bar.c: (notify_e_cal_view_contains), diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c index d04c9abbed..e2696026b2 100644 --- a/calendar/gui/dialogs/recurrence-page.c +++ b/calendar/gui/dialogs/recurrence-page.c @@ -1359,12 +1359,16 @@ make_ending_until_special (RecurrencePage *rpage) gtk_widget_show_all (GTK_WIDGET (de)); /* Set the value */ - - e_cal_component_get_dtstart (priv->comp, &dt_start); - /* Setting the default until time to 2 weeks */ - icaltime_adjust (dt_start.value, 14, 0, 0, 0); - e_date_edit_set_date (de, dt_start.value->year, dt_start.value->month, dt_start.value->day); - e_cal_component_free_datetime (&dt_start); + + if (COMP_EDITOR_PAGE (rpage)->flags & COMP_EDITOR_PAGE_NEW_ITEM) { + e_cal_component_get_dtstart (priv->comp, &dt_start); + /* Setting the default until time to 2 weeks */ + icaltime_adjust (dt_start.value, 14, 0, 0, 0); + e_date_edit_set_date (de, dt_start.value->year, dt_start.value->month, dt_start.value->day); + e_cal_component_free_datetime (&dt_start); + } else { + e_date_edit_set_date (de, priv->ending_date_tt.year, priv->ending_date_tt.month, priv->ending_date_tt.day); + } g_signal_connect((de), "changed", G_CALLBACK (ending_until_changed_cb), rpage); |