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

nightly testing: fixed caching of Evolution sources (BMC #5864) 

"text" stands for Evolution memos and depends on
EvolutionCalendarSource. Added.

The name lookup differs for local and for sync indices, must do
the name lookup before calling checkEvolutionSource(). Fixed.
This commit is contained in:
Patrick Ohly 2010-09-01 18:05:27 +02:00
parent 19f703588f
commit b7d9f26f69
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/client-test-app.cpp
View File

@ -389,8 +389,9 @@ public:
filter[SyncSourceConfig::m_sourcePropSync.getName()] =
PrettyPrintSyncMode(options.m_syncMode);
for(int i = 0; sources[i] >= 0; i++) {
client.setConfigFilter(false, m_syncSource2Config[sources[i]], filter);
checkEvolutionSource(sources[i]);
std::string &name = m_syncSource2Config[sources[i]];
client.setConfigFilter(false, name, filter);
checkEvolutionSource(name);
}
SyncReport report;
@ -431,7 +432,7 @@ private:
string name = evClient.m_localSource2Config[source];
// implement Evolution shutdown workaround (see lockEvolution above)
evClient.checkEvolutionSource(source);
evClient.checkEvolutionSource(name);
return evClient.createSource(name, isSourceA);
}
@ -479,9 +480,8 @@ private:
}
}
void checkEvolutionSource(int source)
void checkEvolutionSource(std::string &name)
{
string name = m_localSource2Config[source];
string basename;
// hard-coded names as used by src/backends/evolution;
@ -490,7 +490,8 @@ private:
if (name == "vcard21" ||
name == "vcard30") {
basename = "ebook";
} else if (name == "ical20") {
} else if (name == "ical20" ||
name == "text") {
basename = "ecal";
}