From 0c26a779918ea2188d2944f17e0213862acef21b Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Tue, 30 Oct 2001 19:55:33 +0000 Subject: move in whole day increments if we are in all day mode 2001-10-30 JP Rosevear * 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 --- calendar/gui/e-meeting-time-sel-item.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'calendar/gui/e-meeting-time-sel-item.c') diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c index 136b43e408..1cc2ac516b 100644 --- a/calendar/gui/e-meeting-time-sel-item.c +++ b/calendar/gui/e-meeting-time-sel-item.c @@ -857,16 +857,22 @@ e_meeting_time_selector_item_button_press (EMeetingTimeSelectorItem *mts_item, /* Find the nearest half-hour or hour interval, depending on whether zoomed_out is set. */ - if (mts->zoomed_out) { - start_time.minute = 0; - end_time = start_time; - end_time.hour += 1; + if (e_date_edit_get_show_time (E_DATE_EDIT (mts->end_date_edit))) { + if (mts->zoomed_out) { + start_time.minute = 0; + end_time = start_time; + end_time.hour += 1; + } else { + start_time.minute -= start_time.minute % 30; + end_time = start_time; + end_time.minute += 30; + } } else { - start_time.minute -= start_time.minute % 30; + start_time.hour = 0; + start_time.minute = 0; end_time = start_time; - end_time.minute += 30; } - + /* Fix any overflows. */ e_meeting_time_selector_fix_time_overflows (&end_time); -- cgit v1.2.3