diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-10-25 07:52:05 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-10-25 07:52:05 +0800 |
| commit | 85b2913a380c69f14ae0254ad23b10fabfb33667 (patch) | |
| tree | c1cf143e37294dd9dd3667ebbe0a1d0c00b04b56 /calendar/gui/e-week-view.c | |
| parent | e7a31c5035a0afeed6c1675e30487c1e2bdc139f (diff) | |
| download | gsoc2013-evolution-85b2913a380c69f14ae0254ad23b10fabfb33667.tar.gz gsoc2013-evolution-85b2913a380c69f14ae0254ad23b10fabfb33667.tar.zst gsoc2013-evolution-85b2913a380c69f14ae0254ad23b10fabfb33667.zip | |
Merge revisions 36534:36684 from trunk.
svn path=/branches/kill-bonobo/; revision=36685
Diffstat (limited to 'calendar/gui/e-week-view.c')
| -rw-r--r-- | calendar/gui/e-week-view.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 2b8f303acd..3a5dd92e2f 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -1402,6 +1402,11 @@ e_week_view_set_selected_time_range (ECalendarView *cal_view, g_return_if_fail (E_IS_WEEK_VIEW (week_view)); + if (!g_date_valid (&week_view->base_date)) { + /* This view has not been initialized/shown yet, thus skip this. */ + return; + } + time_to_gdate_with_zone (&date, start_time, e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view))); /* Set the selection to the given days. */ @@ -3607,12 +3612,12 @@ e_week_view_on_editing_stopped (EWeekView *week_view, e_cal_component_get_dtend (comp, &dt); if (dt.value->zone) { - *dt.value = icaltime_from_timet_with_zone ( + tt = icaltime_from_timet_with_zone ( event->comp_data->instance_end, dt.value->is_date, dt.value->zone); } else { - *dt.value = icaltime_from_timet_with_zone ( + tt = icaltime_from_timet_with_zone ( event->comp_data->instance_end, dt.value->is_date, e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view))); |