From 7c6861ba11143038d33d6c57a8890775020f4610 Mon Sep 17 00:00:00 2001 From: Damon Chaplin Date: Tue, 13 Nov 2001 23:55:26 +0000 Subject: make the timezone default to UTC. Fixes bug #14362. 2001-11-13 Damon Chaplin * gui/alarm-notify/config-data.c (ensure_inited): * gui/calendar-config.c (config_read): * conduits/todo/todo-conduit.c (get_default_timezone): * conduits/calendar/calendar-conduit.c (get_default_timezone): make the timezone default to UTC. Fixes bug #14362. svn path=/trunk/; revision=14691 --- calendar/gui/alarm-notify/config-data.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'calendar/gui/alarm-notify/config-data.c') diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c index cea1d252f9..71170a3ad6 100644 --- a/calendar/gui/alarm-notify/config-data.c +++ b/calendar/gui/alarm-notify/config-data.c @@ -72,12 +72,14 @@ ensure_inited (void) return; } - location = bonobo_config_get_string (db, "/Calendar/Display/Timezone", NULL); - if (location) { + location = bonobo_config_get_string_with_default (db, + "/Calendar/Display/Timezone", "UTC", NULL); + if (location && location[0]) { local_timezone = icaltimezone_get_builtin_timezone (location); - g_free (location); - } else + } else { local_timezone = icaltimezone_get_utc_timezone (); + } + g_free (location); if (locale_supports_12_hour_format ()) { /* Wasn't the whole point of a configuration engine *NOT* to -- cgit v1.2.3