aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2009-05-21 17:11:12 +0800
committerMilan Crha <mcrha@redhat.com>2009-05-21 17:33:34 +0800
commitb93ab66792aa3a24e5a360a4710ed0a03c5c8c8e (patch)
treef611adabbc4ecc8b37f157df6ffcaaccced678ae
parent45dc56b4735d3727c520a060564433455c6cf378 (diff)
downloadgsoc2013-evolution-b93ab66792aa3a24e5a360a4710ed0a03c5c8c8e.tar.gz
gsoc2013-evolution-b93ab66792aa3a24e5a360a4710ed0a03c5c8c8e.tar.zst
gsoc2013-evolution-b93ab66792aa3a24e5a360a4710ed0a03c5c8c8e.zip
Bug #583360 - Be able to select UTC as day view's second timezone
-rw-r--r--calendar/gui/calendar-config.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index 8af8230efd..285490b8f4 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -1725,8 +1725,16 @@ calendar_config_select_day_second_zone (void)
dialog = e_timezone_dialog_get_toplevel (tzdlg);
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
+ const char *location = NULL;
+
zone = e_timezone_dialog_get_timezone (tzdlg);
- calendar_config_set_day_second_zone (zone ? icaltimezone_get_location (zone) : NULL);
+ if (zone == icaltimezone_get_utc_timezone ()) {
+ location = "UTC";
+ } else if (zone) {
+ location = icaltimezone_get_location (zone);
+ }
+
+ calendar_config_set_day_second_zone (location);
}
g_object_unref (tzdlg);