Commit cfc10ed5 authored by mvogt's avatar mvogt

Merge pull request #90 from matthewvogt/fix-merge-candidates

[libcontacts] Only update merge candidates with correct results
parents d1493966 9ae35978
......@@ -2398,14 +2398,13 @@ void SeasideCache::notifyNameGroupsChanged(const QSet<QString> &groups)
void SeasideCache::contactIdsAvailable()
{
if (!m_contactsToFetchCandidates.isEmpty()) {
foreach (const QContactId &id, m_contactIdRequest.ids()) {
m_candidateIds.insert(id);
if (m_syncFilter == FilterNone) {
if (!m_contactsToFetchCandidates.isEmpty()) {
foreach (const QContactId &id, m_contactIdRequest.ids()) {
m_candidateIds.insert(id);
}
}
return;
}
if (m_syncFilter != FilterNone) {
} else {
synchronizeList(this, m_contacts[m_syncFilter], m_cacheIndex, internalIds(m_contactIdRequest.ids()), m_queryIndex);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment