From b93ab66792aa3a24e5a360a4710ed0a03c5c8c8e Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Thu, 21 May 2009 11:11:12 +0200
Subject: Bug #583360 - Be able to select UTC as day view's second timezone

---
 calendar/gui/calendar-config.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'calendar/gui/calendar-config.c')

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);
-- 
cgit