aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/conduits/calendar/calendar-conduit.c3
-rw-r--r--calendar/conduits/todo/todo-conduit.c3
3 files changed, 11 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index b5d16bd41f..91a3b049ed 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2000-11-10 JP Rosevear <jpr@helixcode.com>
+
+ * conduits/calendar/calendar-conduit.c (for_each_modified): Inc the
+ iterator before finding the next changed item.
+
+ * conduits/todo/todo-conduit.c (for_each_modified): ditto
+
2000-11-09 Jesse Pavel <jpavel@helixcode.com>
* gui/e-itip-control.c: I wrote the code so that recipients of meeting requests
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 90bcb5e685..7341d7a292 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -849,7 +849,8 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit,
}
} else {
count++;
- if ((iterator = next_changed_item (ctxt, iterator))) {
+ iterator = g_list_next (iterator);
+ if (iterator && (iterator = next_changed_item (ctxt, iterator))) {
CalObjChange *coc = NULL;
coc = iterator->data;
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index 12b04ad78c..b41dead5cc 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -723,7 +723,8 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit,
}
} else {
count++;
- if ((iterator = next_changed_item (ctxt, iterator))) {
+ iterator = g_list_next (iterator);
+ if (iterator && (iterator = next_changed_item (ctxt, iterator))) {
CalObjChange *coc = NULL;
coc = iterator->data;