aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/conduits/calendar/calendar-conduit.c2
-rw-r--r--calendar/conduits/todo/todo-conduit.c2
3 files changed, 9 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index a2f8310211..72d437649f 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-25 JP Rosevear <jpr@novell.com>
+
+ * conduits/todo/todo-conduit.c (for_each): prepare the local
+ record correctly, should fix copy to/from problems when syncing
+
+ * conduits/calendar/calendar-conduit.c (for_each): ditto
+
2004-08-25 Frederic Crozat <fcrozat@mandrakesoft.com>
* gui/dialogs/recur-comp.c: (recur_component_dialog):
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 7885dadb9e..4c56422513 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -1576,7 +1576,7 @@ for_each (GnomePilotConduitSyncAbs *conduit,
iterator = g_list_next (iterator);
*local = g_new0 (ECalLocalRecord, 1);
- local_record_from_uid (*local, iterator->data, ctxt);
+ local_record_from_comp (*local, iterator->data, ctxt);
g_list_prepend (ctxt->locals, *local);
} else {
LOG (g_message ( "for_each ending" ));
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index 5e500b141a..1767741270 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -1070,7 +1070,7 @@ for_each (GnomePilotConduitSyncAbs *conduit,
iterator = g_list_next (iterator);
*local = g_new0 (EToDoLocalRecord, 1);
- local_record_from_uid (*local, iterator->data, ctxt);
+ local_record_from_comp (*local, iterator->data, ctxt);
g_list_prepend (ctxt->locals, *local);
} else {
LOG (g_message ( "for_each ending" ));