From a44eac756d55b0210cc541e1d9b7138805a2133e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 13 Aug 2009 10:36:32 -0400 Subject: Track the timezone in one place: ECalModel --- modules/calendar/e-cal-shell-view-private.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'modules/calendar/e-cal-shell-view-private.c') diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c index 60ec3c77ab..8c18176af5 100644 --- a/modules/calendar/e-cal-shell-view-private.c +++ b/modules/calendar/e-cal-shell-view-private.c @@ -40,17 +40,6 @@ cal_shell_view_process_completed_tasks (ECalShellView *cal_shell_view, #endif } -static void -cal_shell_view_config_timezone_changed_cb (GConfClient *client, - guint id, - GConfEntry *entry, - gpointer user_data) -{ - ECalShellView *cal_shell_view = user_data; - - e_cal_shell_view_update_timezone (cal_shell_view); -} - static struct tm cal_shell_view_get_current_time (ECalendarItem *calitem, ECalShellView *cal_shell_view) @@ -666,6 +655,7 @@ e_cal_shell_view_update_sidebar (ECalShellView *cal_shell_view) ECalShellContent *cal_shell_content; GnomeCalendar *calendar; GnomeCalendarViewType view; + ECalModel *model; time_t start_time, end_time; struct tm start_tm, end_tm; struct icaltimetype start_tt, end_tt; @@ -683,7 +673,8 @@ e_cal_shell_view_update_sidebar (ECalShellView *cal_shell_view) gnome_calendar_get_visible_time_range ( calendar, &start_time, &end_time); - timezone = gnome_calendar_get_timezone (calendar); + model = gnome_calendar_get_calendar_model (calendar); + timezone = e_cal_model_get_timezone (model); view = gnome_calendar_get_view (calendar); start_tt = icaltime_from_timet_with_zone (start_time, FALSE, timezone); -- cgit v1.2.3