From 8d2d08837d5e8969db0a62547124bab9c6507459 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Wed, 16 Apr 2003 16:23:58 +0000 Subject: Fixes #39735 and 40257 2003-04-15 JP Rosevear Fixes #39735 and 40257 * gui/gnome-cal.c: convert float pane positions to ints (setup_widgets): set the initial position after realization and track the drags to get the new position, pack the panes slightly differently (gnome_calendar_set_pane_positions): set purely pixel oriented positions (gnome_calendar_update_config_settings): no need to update quanta setting (gnome_calendar_hpane_realized): realization callback (gnome_calendar_vpane_realized): ditto (gnome_calendar_vpane_resized): resize callback, store new size (gnome_calendar_hpane_resized): ditto * gui/calendar-model.c (get_due_status): handle an error getting the timezone * gui/calendar-config.c (calendar_config_get_hpane_pos): return an int (calendar_config_set_hpane_pos): take an int (calendar_config_get_vpane_pos): return an int (calendar_config_set_vpane_pos): take an int * gui/calendar-config.h: update protos * gui/apps_evolution_calendar.schemas: update defaults for pane positions svn path=/trunk/; revision=20863 --- calendar/gui/calendar-model.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'calendar/gui/calendar-model.c') diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c index ebe38ab6a3..9ee184cee6 100644 --- a/calendar/gui/calendar-model.c +++ b/calendar/gui/calendar-model.c @@ -673,9 +673,13 @@ get_due_status (CalendarModel *model, CalComponent *comp) retval = CALENDAR_MODEL_DUE_FUTURE; } else { /* Get the current time in the same timezone as the DUE date.*/ - /* FIXME: TIMEZONES: Handle error. */ status = cal_client_get_timezone (model->priv->client, dt.tzid, &zone); + if (status != CAL_CLIENT_GET_SUCCESS) { + retval = CALENDAR_MODEL_DUE_FUTURE; + goto out; + } + now_tt = icaltime_current_time_with_zone (zone); if (icaltime_compare (*dt.value, now_tt) <= 0) -- cgit v1.2.3