From 642d32d63f226cd1ba049a9d979132e1a1cef94d Mon Sep 17 00:00:00 2001
From: Damon Chaplin <damon@ximian.com>
Date: Tue, 3 Jul 2001 04:21:37 +0000
Subject: cal-client/cal-client.[hc] cal-util/cal-component.c

2001-07-03  Damon Chaplin  <damon@ximian.com>

	* cal-client/cal-client.[hc]
	* cal-util/cal-component.c
	* cal-util/cal-recur.[hc]
	* cal-util/test-recur.c
	* cal-util/timeutil.c
	* gui/calendar-config.c
	* gui/calendar-model.[hc]
	* gui/comp-util.[hc]
	* gui/e-calendar-table.c
	* gui/e-day-view-main-item.c
	* gui/e-day-view-top-item.c
	* gui/e-day-view.[hc]
	* gui/e-itip-control.c
	* gui/e-timezone-entry.[hc]
	* gui/e-week-view.[hc]
	* gui/gnome-cal.[hc]
	* gui/goto.c
	* gui/tag-calendar.[hc]
	* gui/dialogs/cal-prefs-dialog.c
	* gui/dialogs/comp-editor-page.[hc]
	* gui/dialogs/comp-editor-util.[hc]
	* gui/dialogs/comp-editor.c
	* gui/dialogs/e-timezone-dialog.[hc]
	* gui/dialogs/event-page.c
	* gui/dialogs/meeting-page.c
	* gui/dialogs/recurrence-page.c
	* gui/dialogs/task-details-page.c
	* gui/dialogs/task-details-page.glade
	* gui/dialogs/task-page.c
	* idl/evolution-calendar.idl
	* pcs/cal-backend-file.c
	* pcs/cal-backend.c
	* pcs/cal-backend.h
	* pcs/cal.c
	* pcs/query.c: timezone changes everywhere. There's still quite a
	few things to update, and its not working well at present.

svn path=/trunk/; revision=10729
---
 calendar/gui/calendar-config.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'calendar/gui/calendar-config.c')

diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index f4678ab098..41c55ab91c 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -582,6 +582,8 @@ calendar_config_configure_e_calendar_table	(ECalendarTable	*cal_table)
 {
 	CalendarModel *model;
 	gboolean use_24_hour;
+	char *location;
+	icaltimezone *zone;
 
 	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));
 
@@ -590,6 +592,10 @@ calendar_config_configure_e_calendar_table	(ECalendarTable	*cal_table)
 	model = e_calendar_table_get_model (cal_table);
 	calendar_model_set_use_24_hour_format (model, use_24_hour);
 
+	location = calendar_config_get_timezone ();
+	zone = icaltimezone_get_builtin_timezone (location);
+	calendar_model_set_timezone (model, zone);
+
 	calendar_config_configure_e_cell_date_edit (cal_table->dates_cell);
 
 	/* This is for changing the colors of the text; they will be re-fetched
@@ -636,12 +642,12 @@ on_timezone_set			(GnomeDialog	*dialog,
 				 int		 button,
 				 ETimezoneDialog *etd)
 {
-	char *zone;
+	char *display_name;
 
-	zone = e_timezone_dialog_get_timezone (etd);
+	e_timezone_dialog_get_timezone (etd, &display_name);
 
-	if (zone && zone[0]) {
-		calendar_config_set_timezone (zone);
+	if (display_name && display_name[0]) {
+		calendar_config_set_timezone (display_name);
 
 		calendar_config_write ();
 		update_all_config_settings ();
-- 
cgit v1.2.3