From 2a4fc64569a14030a74c7215b5202cc7b3d57a26 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 8 Jan 2010 17:39:32 +0100 Subject: Bug #605600 - Meeting reminders with wrong times --- calendar/gui/alarm-notify/config-data.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c index db2322945b..a55a9ddd29 100644 --- a/calendar/gui/alarm-notify/config-data.c +++ b/calendar/gui/alarm-notify/config-data.c @@ -209,9 +209,11 @@ config_data_get_timezone (void) ensure_inited (); - location = gconf_client_get_string (conf_client, - "/apps/evolution/calendar/display/timezone", - NULL); + if (gconf_client_get_bool (conf_client, "/apps/evolution/calendar/display/use_system_timezone", NULL)) + location = e_cal_util_get_system_timezone_location (); + else + location = gconf_client_get_string (conf_client, "/apps/evolution/calendar/display/timezone", NULL); + if (location && location[0]) { local_timezone = icaltimezone_get_builtin_timezone (location); } else { -- cgit