diff options
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/gui/gnome-cal.c | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 4eae5d4d1d..f4182b9c41 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2004-07-05 Rodrigo Moya <rodrigo@novell.com> + + * gui/gnome-cal.c (setup_widgets): don't set the timezone on the views + here. + (set_timezone): do it here. + (client_cal_opened_cb): call set_timezone() here. + 2004-07-02 Rodrigo Moya <rodrigo@novell.com> * gui/gnome-cal.c (set_view): update the internal current_view_type diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 0a1a0c8478..87f8d280d3 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -956,6 +956,9 @@ set_timezone (GnomeCalendar *calendar) priv->zone = calendar_config_get_icaltimezone (); + for (i = 0; i < GNOME_CAL_LAST_VIEW; i++) + e_calendar_view_set_timezone (priv->views[i], priv->zone); + for (i = 0; i < E_CAL_SOURCE_TYPE_LAST; i++) { GList *l; @@ -1201,7 +1204,6 @@ setup_widgets (GnomeCalendar *gcal) /* The Day View. */ priv->day_view = e_day_view_new (); e_calendar_view_set_calendar (E_CALENDAR_VIEW (priv->day_view), gcal); - e_calendar_view_set_timezone (E_CALENDAR_VIEW (priv->day_view), priv->zone); g_signal_connect (priv->day_view, "selection_changed", G_CALLBACK (view_selection_changed_cb), gcal); connect_day_view_focus (gcal, E_DAY_VIEW (priv->day_view)); @@ -1212,14 +1214,11 @@ setup_widgets (GnomeCalendar *gcal) TRUE); e_day_view_set_days_shown (E_DAY_VIEW (priv->work_week_view), 5); e_calendar_view_set_calendar (E_CALENDAR_VIEW (priv->work_week_view), gcal); - e_calendar_view_set_timezone (E_CALENDAR_VIEW (priv->work_week_view), priv->zone); - connect_day_view_focus (gcal, E_DAY_VIEW (priv->work_week_view)); /* The Week View. */ priv->week_view = e_week_view_new (); e_calendar_view_set_calendar (E_CALENDAR_VIEW (priv->week_view), gcal); - e_calendar_view_set_timezone (E_CALENDAR_VIEW (priv->week_view), priv->zone); g_signal_connect (priv->week_view, "selection_changed", G_CALLBACK (view_selection_changed_cb), gcal); @@ -1233,7 +1232,6 @@ setup_widgets (GnomeCalendar *gcal) /* The Month View. */ priv->month_view = e_week_view_new (); e_calendar_view_set_calendar (E_CALENDAR_VIEW (priv->month_view), gcal); - e_calendar_view_set_timezone (E_CALENDAR_VIEW (priv->month_view), priv->zone); e_week_view_set_multi_week_view (E_WEEK_VIEW (priv->month_view), TRUE); e_week_view_set_weeks_shown (E_WEEK_VIEW (priv->month_view), 6); g_signal_connect (priv->month_view, "selection_changed", @@ -1250,7 +1248,6 @@ setup_widgets (GnomeCalendar *gcal) priv->list_view = e_cal_list_view_new (); e_calendar_view_set_calendar (E_CALENDAR_VIEW (priv->list_view), gcal); - e_calendar_view_set_timezone (E_CALENDAR_VIEW (priv->list_view), priv->zone); connect_list_view_focus (gcal, E_CAL_LIST_VIEW (priv->list_view)); @@ -2001,6 +1998,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal) return; } + set_timezone (gcal); e_cal_set_default_timezone (ecal, priv->zone, NULL); switch (source_type) { |