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

WebDAV: fix server-specific workarounds

Browse source 
The code checking the session URL was never used because the
session did not exist yet during syncing. Adding a contactServer()
call fixes that.

The default WebDAV code in the dead code was redundant. The
default is set before checking for a specific server.
This commit is contained in:
Patrick Ohly 2014-05-13 07:03:32 -07:00
parent d90c952b4c
commit 93b9b57e7d
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/backends/webdav/WebDAVSource.cpp
View file

@ -1510,6 +1510,8 @@ WebDAVSource::Databases WebDAVSource::getDatabases()
void WebDAVSource::getSynthesisInfo(SynthesisInfo &info,
XMLConfigFragments &fragments)
{
contactServer();
TrackingSyncSource::getSynthesisInfo(info, fragments);
// only CalDAV enforces unique UID
@ -1526,7 +1528,7 @@ void WebDAVSource::getSynthesisInfo(SynthesisInfo &info,
// TODO: instead of identifying the peer based on the
// session URI, use some information gathered about
// it during open()
// it during contactServer()
if (m_session) {
string host = m_session->getURI().m_host;
if (host.find("google") != host.npos) {
@ -1558,19 +1560,9 @@ void WebDAVSource::getSynthesisInfo(SynthesisInfo &info,
" <include rule=\"ALL\"/>\n"
" <include rule=\"HAVE-VCARD-UID\">\n"
" </remoterule>";
} else {
// fallback: generic CalDAV/CardDAV, with all properties
// enabled (for example, X-EVOLUTION-UI-SLOT)
info.m_backendRule = "WEBDAV";
fragments.m_remoterules["WEBDAV"] =
" <remoterule name='WEBDAV'>\n"
" <deviceid>none</deviceid>\n"
" <include rule=\"ALL\"/>\n"
" <include rule=\"HAVE-VCARD-UID\">\n"
" </remoterule>";
}
SE_LOG_DEBUG(getDisplayName(), "using data conversion rules for '%s'", info.m_backendRule.c_str());
}
SE_LOG_DEBUG(getDisplayName(), "using data conversion rules for '%s'", info.m_backendRule.c_str());
}
void WebDAVSource::storeServerInfos()