From ab00f5b08adb1d74a0c70d935a32ffd982e86f34 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Wed, 21 Jan 2009 02:52:05 +0000
Subject: Merge revisions 37075:37107 from trunk.

svn path=/branches/kill-bonobo/; revision=37112
---
 calendar/conduits/calendar/calendar-conduit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'calendar/conduits')

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