diff options
| author | JP Rosevear <jpr@ximian.com> | 2001-10-31 03:55:33 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2001-10-31 03:55:33 +0800 |
| commit | 0c26a779918ea2188d2944f17e0213862acef21b (patch) | |
| tree | 870dff3ca4b61b964afb5285b0b9d1d5d745fa81 /calendar/conduits | |
| parent | b7443fb873ade1ac0f4bdd39b1c2d72fc545e52e (diff) | |
| download | gsoc2013-evolution-0c26a779918ea2188d2944f17e0213862acef21b.tar gsoc2013-evolution-0c26a779918ea2188d2944f17e0213862acef21b.tar.gz gsoc2013-evolution-0c26a779918ea2188d2944f17e0213862acef21b.tar.bz2 gsoc2013-evolution-0c26a779918ea2188d2944f17e0213862acef21b.tar.lz gsoc2013-evolution-0c26a779918ea2188d2944f17e0213862acef21b.tar.xz gsoc2013-evolution-0c26a779918ea2188d2944f17e0213862acef21b.tar.zst gsoc2013-evolution-0c26a779918ea2188d2944f17e0213862acef21b.zip | |
move in whole day increments if we are in all day mode
2001-10-30 JP Rosevear <jpr@ximian.com>
* gui/e-meeting-time-sel-item.c
(e_meeting_time_selector_item_button_press): move in whole day
increments if we are in all day mode
* gui/e-meeting-time-sel.c
(e_meeting_time_selector_on_start_time_changed): get rid of
localtime call
(e_meeting_time_selector_on_end_time_changed): ditto
(e_meeting_time_selector_update_start_date_edit): set the date
editor using the meeting time fields directly
(e_meeting_time_selector_update_end_date_edit): ditto
* gui/dialogs/schedule-page.c (update_time): do the set_show_time
stuff first
* conduits/calendar/calendar-conduit.c (process_multi_day): don't
adjust the time, set the default timezone for date values
svn path=/trunk/; revision=14475
Diffstat (limited to 'calendar/conduits')
| -rw-r--r-- | calendar/conduits/calendar/calendar-conduit.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index c845fc4516..552ba41e69 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -386,12 +386,10 @@ process_multi_day (ECalConduitContext *ctxt, CalClientChange *ccc, GList **multi event_start = icaltime_as_timet_with_zone (*dt_start.value, tz_start); cal_component_get_dtend (ccc->comp, &dt_end); - if (dt_end.value->is_date) { - icaltime_adjust (dt_end.value, 1, 0, 0, 0); + if (dt_end.value->is_date) tz_end = ctxt->timezone; - } else { + else tz_end = get_timezone (ctxt->client, dt_end.tzid); - } event_end = icaltime_as_timet_with_zone (*dt_end.value, tz_end); day_end = time_day_end_with_zone (event_start, ctxt->timezone); @@ -403,7 +401,6 @@ process_multi_day (ECalConduitContext *ctxt, CalClientChange *ccc, GList **multi goto cleanup; } - INFO ("Split info: %lu, %lu, %lu", event_start, event_end, day_end); old_start_value = dt_start.value; old_end_value = dt_end.value; while (!last) { |