aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/conduits/calendar/calendar-conduit.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index e91c205e30..749e4a5f49 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,12 @@
2009-01-16 Milan Crha <mcrha@redhat.com>
+ ** Fix for bug #360813
+
+ * conduits/calendar/calendar-conduit.c: (comp_from_remote_record):
+ RFC 2445 - CREATED/DTSTAMP/LAST-MODIFIED always in UTC.
+
+2009-01-16 Milan Crha <mcrha@redhat.com>
+
** Partial fix for bug #310844
* gui/e-calendar-view.c: (transfer_item_to):
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index b5d2e1abe1..f936e33fe7 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -1203,7 +1203,7 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
{
ECalComponent *comp;
struct Appointment appt;
- struct icaltimetype now = icaltime_from_timet_with_zone (time (NULL), FALSE, timezone), it;
+ struct icaltimetype now = icaltime_current_time_with_zone (icaltimezone_get_utc_timezone ()), it;
struct icalrecurrencetype recur;
ECalComponentText summary = {NULL, NULL};
ECalComponentDateTime dt = {NULL, NULL};