aboutsummaryrefslogtreecommitdiffstats
path: root/modules/calendar
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-08-13 22:36:32 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-08-13 23:21:00 +0800
commita44eac756d55b0210cc541e1d9b7138805a2133e (patch)
tree69f199d2df4a858466e9f98cd363cc1ebfe9174d /modules/calendar
parent311c8dd1226555f81c2eaca738969f5d9e123d1f (diff)
downloadgsoc2013-evolution-a44eac756d55b0210cc541e1d9b7138805a2133e.tar
gsoc2013-evolution-a44eac756d55b0210cc541e1d9b7138805a2133e.tar.gz
gsoc2013-evolution-a44eac756d55b0210cc541e1d9b7138805a2133e.tar.bz2
gsoc2013-evolution-a44eac756d55b0210cc541e1d9b7138805a2133e.tar.lz
gsoc2013-evolution-a44eac756d55b0210cc541e1d9b7138805a2133e.tar.xz
gsoc2013-evolution-a44eac756d55b0210cc541e1d9b7138805a2133e.tar.zst
gsoc2013-evolution-a44eac756d55b0210cc541e1d9b7138805a2133e.zip
Track the timezone in one place: ECalModel
Diffstat (limited to 'modules/calendar')
-rw-r--r--modules/calendar/e-cal-shell-view-private.c15
1 files changed, 3 insertions, 12 deletions
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);