diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-07-28 10:31:47 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-07-28 23:24:49 +0800 |
| commit | 2c4510e858fcf96e8f3d02f3f92564460752e983 (patch) | |
| tree | 777c673d5fdaf649fb1c9eabd9357eac622b15f6 /widgets/e-timezone-dialog | |
| parent | 3fe8269156da1b57b0fc7391f5cf07cab6f61606 (diff) | |
| parent | 067ef5580fc287809958d4503691bfcba2b29ee5 (diff) | |
| download | gsoc2013-evolution-2c4510e858fcf96e8f3d02f3f92564460752e983.tar.gz gsoc2013-evolution-2c4510e858fcf96e8f3d02f3f92564460752e983.tar.zst gsoc2013-evolution-2c4510e858fcf96e8f3d02f3f92564460752e983.zip | |
Merge commit 'EVOLUTION_2_27_5' into kill-bonobo
Diffstat (limited to 'widgets/e-timezone-dialog')
| -rw-r--r-- | widgets/e-timezone-dialog/e-timezone-dialog.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c index 4625a63e1c..8f22695916 100644 --- a/widgets/e-timezone-dialog/e-timezone-dialog.c +++ b/widgets/e-timezone-dialog/e-timezone-dialog.c @@ -30,6 +30,7 @@ #include <glade/glade.h> #include <misc/e-map.h> #include <libecal/e-cal-time-util.h> +#include <libecal/e-cal-system-timezone.h> #include "e-util/e-util-private.h" @@ -342,9 +343,15 @@ static icaltimezone* get_local_timezone(void) { icaltimezone *zone; + gchar *location; tzset(); - zone = icaltimezone_get_builtin_timezone_from_offset (-timezone, tzname[0]); + location = e_cal_system_timezone_get_location (); + + if (location) + zone = icaltimezone_get_builtin_timezone (location); + + g_free (location); return zone; } |