aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2010-01-09 00:39:32 +0800
committerMilan Crha <mcrha@redhat.com>2010-01-09 00:39:32 +0800
commit2a4fc64569a14030a74c7215b5202cc7b3d57a26 (patch)
treecd153cbbae7b07e2d484e3344879aa3c342d7fce
parentabaecf816e8b9f2c0afc754223c75e8634702b4c (diff)
downloadgsoc2013-evolution-2a4fc64569a14030a74c7215b5202cc7b3d57a26.tar
gsoc2013-evolution-2a4fc64569a14030a74c7215b5202cc7b3d57a26.tar.gz
gsoc2013-evolution-2a4fc64569a14030a74c7215b5202cc7b3d57a26.tar.bz2
gsoc2013-evolution-2a4fc64569a14030a74c7215b5202cc7b3d57a26.tar.lz
gsoc2013-evolution-2a4fc64569a14030a74c7215b5202cc7b3d57a26.tar.xz
gsoc2013-evolution-2a4fc64569a14030a74c7215b5202cc7b3d57a26.tar.zst
gsoc2013-evolution-2a4fc64569a14030a74c7215b5202cc7b3d57a26.zip
Bug #605600 - Meeting reminders with wrong times
-rw-r--r--calendar/gui/alarm-notify/config-data.c8
1 files 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 {