remove the uid from the map if was archived and is now deleted

001-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

svn path=/trunk/; revision=14151
This commit is contained in:
JP Rosevear
2001-10-26 18:15:27 +00:00
committed by JP Rosevear
parent b4fe462986
commit 86a201c22b
3 changed files with 13 additions and 2 deletions

View File

@ -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):

View File

@ -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;

View File

@ -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;