1431fd4a7b
When handling an update/update conflict (both sides of the sync have an updated contact) and photo data was moved into a local file by EDS, the engine merged the file path and the photo data together and thus corrupted the photo. The engine does not know about the special role of the photo property. This needs to be handled by the merge script, and that script did not cover this particular situation. Now the loosing side is cleared, causing the engine to then copy the winning side over into the loosing one. Found by Renato Filho/Canonical when testing SyncEvolution for Ubuntu 14.04. |
||
|---|---|---|
| .. | ||
| backends | ||
| dbus | ||
| gdbus | ||
| gdbusxx | ||
| gnome-bluetooth | ||
| gtk-ui | ||
| gtk3-ui | ||
| syncevo | ||
| synthesis-includes | ||
| templates | ||
| async.patch | ||
| client-test-app.cpp | ||
| README.h | ||
| README.templates | ||
| shlibs.local | ||
| src.am | ||
| syncevo-local-sync.cpp | ||
| syncevolution.cpp | ||
| testcases.am | ||
| valgrind.supp | ||
The configuration templates in "templates" get installed into $(datadir)/syncevolution/templates. When adding/changing a new server, then only enter the properties which need to be changed here so that the default values can be used for the remaining properties. An icon can be added here for servers. The file name must start with "icon". Server configurations must be kept in sync in three different places: - here (if a server is installed as files) - in SyncEvolutionConfig.cpp's EvolutionSyncConfig::createServerTemplate() - in SyncEvolutionCmdline.cpp's test server configs - in test/test-dbus.py testGetConfigsTemplates() Note that server icons must come with a suitable license that allows redistribution.