aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJP Rosevear <jpr@novell.com>2005-01-14 23:09:11 +0800
committerJP Rosevear <jpr@src.gnome.org>2005-01-14 23:09:11 +0800
commit2995dc7ab7582876e0f59a5d948aee97c8502485 (patch)
treebe4a30a4104c14e7e9bc4306e17b691ecd87b41c
parenta701566b167fc216e842d17bfd890599de72ac58 (diff)
downloadgsoc2013-evolution-2995dc7ab7582876e0f59a5d948aee97c8502485.tar.gz
gsoc2013-evolution-2995dc7ab7582876e0f59a5d948aee97c8502485.tar.zst
gsoc2013-evolution-2995dc7ab7582876e0f59a5d948aee97c8502485.zip
handle UTC dtstart/dtend properly
2005-01-14 JP Rosevear <jpr@novell.com> * itip-formatter.c (format_itip_object): handle UTC dtstart/dtend properly svn path=/trunk/; revision=28401
-rw-r--r--plugins/itip-formatter/ChangeLog5
-rw-r--r--plugins/itip-formatter/itip-formatter.c8
2 files changed, 11 insertions, 2 deletions
diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index 5f1457eccc..2892eac91a 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-14 JP Rosevear <jpr@novell.com>
+
+ * itip-formatter.c (format_itip_object): handle UTC dtstart/dtend
+ properly
+
2005-01-11 JP Rosevear <jpr@novell.com>
Fixes #29985
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 09dde217ff..ca194ad9ae 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -1430,7 +1430,9 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
/* If the timezone is not in the component, guess the local time */
/* Should we guess if the timezone is an olsen name somehow? */
- if (!datetime.value->is_utc && datetime.tzid)
+ if (datetime.value->is_utc)
+ from_zone = icaltimezone_get_utc_timezone ();
+ else if (!datetime.value->is_utc && datetime.tzid)
from_zone = icalcomponent_get_timezone (pitip->top_level, datetime.tzid);
else
from_zone = NULL;
@@ -1449,7 +1451,9 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
/* If the timezone is not in the component, guess the local time */
/* Should we guess if the timezone is an olsen name somehow? */
- if (!datetime.value->is_utc && datetime.tzid)
+ if (datetime.value->is_utc)
+ from_zone = icaltimezone_get_utc_timezone ();
+ else if (!datetime.value->is_utc && datetime.tzid)
from_zone = icalcomponent_get_timezone (pitip->top_level, datetime.tzid);
else
from_zone = NULL;