diff options
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/conduits/calendar/calendar-conduit.c | 4 | ||||
| -rw-r--r-- | calendar/conduits/todo/todo-conduit.c | 4 |
3 files changed, 13 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 9ff40080f1..ef97844ff2 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2001-10-26 JP Rosevear <jpr@ximian.com> + + * conduits/todo/todo-conduit.c (pre_sync): remove the uid from the + map if was archived and is now deleted + + * conduits/calendar/calendar-conduit.c: ditto + 2001-10-26 Rodrigo Moya <rodrigo@ximian.com> * gui/e-calendar_table.c (delete_selected_components): diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index d79c238121..01580107b8 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -1032,6 +1032,8 @@ pre_sync (GnomePilotConduit *conduit, del_records++; break; } + } else if (ccc->type == CAL_CLIENT_CHANGE_DELETED) { + e_pilot_map_remove_by_uid (ctxt->map, uid); } } @@ -1180,7 +1182,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit, g_return_val_if_fail (local != NULL, -1); if (*local == NULL) { - LOG ("beginning for_each_modified: beginning\n"); + LOG ("for_each_modified beginning\n"); iterator = ctxt->changed; diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c index 4c0b3b92da..4c6289702c 100644 --- a/calendar/conduits/todo/todo-conduit.c +++ b/calendar/conduits/todo/todo-conduit.c @@ -734,6 +734,8 @@ pre_sync (GnomePilotConduit *conduit, del_records++; break; } + } else if (ccc->type == CAL_CLIENT_CHANGE_DELETED) { + e_pilot_map_remove_by_uid (ctxt->map, uid); } } @@ -882,7 +884,7 @@ for_each_modified (GnomePilotConduitSyncAbs *conduit, g_return_val_if_fail (local != NULL, 0); if (*local == NULL) { - LOG ("beginning for_each_modified: beginning\n"); + LOG ("for_each_modified beginning\n"); iterator = ctxt->changed; |