maryjane/syncevolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

do not overwrite the UID in an addItem operation even if we fall back to an update

Browse source 
git-svn-id: https://zeitsenke.de/svn/SyncEvolution/trunk@244 15ad00c4-1369-45f4-8270-35d70d36bdcd
This commit is contained in:
Patrick Ohly 2006-09-09 14:58:05 +00:00
parent 67e7b1cb74
commit 9a2e1cf30a
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/EvolutionCalendarSource.cpp
View file

@ -335,7 +335,7 @@ int EvolutionCalendarSource::insertItem(SyncItem& item, bool update)
gerror->code == E_CALENDAR_STATUS_OBJECT_ID_ALREADY_EXISTS) {
// Deal with error due to adding already existing item, that can happen,
// for example with a "dumb" server which cannot pair items by UID.
update = true;
logItem(item, "exists already, updating instead");
fallback = true;
g_clear_error(&gerror);
} else {
@ -348,9 +348,11 @@ int EvolutionCalendarSource::insertItem(SyncItem& item, bool update)
}
}
if (update) {
if (update || fallback) {
// ensure that the component has the right UID - some servers replace it
if (item.getKey() && item.getKey()[0]) {
// inside the VEVENT, but luckily the SyncML standard requires them to
// provide the original UID in an update
if (update && item.getKey() && item.getKey()[0]) {
icalcomponent_set_uid(subcomp, item.getKey());
}