summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Montel <[email protected]>2018-03-22 06:47:46 +0100
committerLaurent Montel <[email protected]>2018-03-22 06:47:46 +0100
commit409e75042323d5fa104c864b155081ed8e94bcbe (patch)
treee77fee8ebd25a03ebcc398975309bcb24a82a2dd
parenta0e38974d12fd67ed72864ce0f1f943a078c0e8c (diff)
Disable for the moment this feature as it locks sometime
-rw-r--r--messagecomposer/src/composer/keyresolver.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/messagecomposer/src/composer/keyresolver.cpp b/messagecomposer/src/composer/keyresolver.cpp
index d9f3629..c761439 100644
--- a/messagecomposer/src/composer/keyresolver.cpp
+++ b/messagecomposer/src/composer/keyresolver.cpp
@@ -1920,6 +1920,7 @@ void Kleo::KeyResolver::addKeys(const std::vector<Item> &items)
Kleo::KeyResolver::ContactPreferences Kleo::KeyResolver::lookupContactPreferences(const QString &address) const
{
+#ifdef HAVE_A_FIX_FOR_LOCK
const Private::ContactPreferencesMap::iterator it
= d->mContactPreferencesMap.find(address);
if (it != d->mContactPreferencesMap.end()) {
@@ -1947,6 +1948,10 @@ Kleo::KeyResolver::ContactPreferences Kleo::KeyResolver::lookupContactPreference
// insert into map and grab resulting iterator
d->mContactPreferencesMap.insert(std::make_pair(address, pref));
return pref;
+#else
+ Q_UNUSED(address)
+ return ContactPreferences();
+#endif
}
void Kleo::KeyResolver::saveContactPreference(const QString &email, const ContactPreferences &pref) const