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/conduits/todo/todo-conduit.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'calendar/conduits/todo/todo-conduit.c') diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c index 99da43b13f..4964860e22 100644 --- a/calendar/conduits/todo/todo-conduit.c +++ b/calendar/conduits/todo/todo-conduit.c @@ -265,14 +265,16 @@ get_default_timezone (void) CORBA_exception_free (&ev); - location = bonobo_config_get_string (db, "/Calendar/Display/Timezone", NULL); - if (location == NULL) - goto cleanup; + location = bonobo_config_get_string_with_default (db, + "/Calendar/Display/Timezone", "UTC", NULL); + if (!location || !location[0]) { + g_free (location); + location = g_strdup ("UTC"); + } timezone = icaltimezone_get_builtin_timezone (location); g_free (location); - cleanup: bonobo_object_release_unref (db, NULL); return timezone; -- cgit v1.2.3