Set a limit of 1 result for search jobs where we don't need more than 1 result anyway.

Should help with bug 219687.

CCBUG: 219687

svn path=/trunk/KDE/kdepim/; revision=1081964
wilder-work
Thomas McGuire 16 years ago
parent b76d7f7556
commit d828b1e0dc
  1. 2
      keyresolver.cpp
  2. 3
      kmmainwidget.cpp
  3. 1
      kmreadermainwin.cpp
  4. 2
      kmsearchpattern.cpp
  5. 3
      xfaceconfigurator.cpp

@ -1742,6 +1742,7 @@ Kleo::KeyResolver::ContactPreferences Kleo::KeyResolver::lookupContactPreference
return it->second;
Akonadi::ContactSearchJob *job = new Akonadi::ContactSearchJob();
job->setLimit( 1 );
job->setQuery( Akonadi::ContactSearchJob::Email, address );
job->exec();
@ -1777,6 +1778,7 @@ void Kleo::KeyResolver::saveContactPreference( const QString& email, const Conta
d->mContactPreferencesMap.insert( std::make_pair( email, pref ) );
Akonadi::ContactSearchJob *job = new Akonadi::ContactSearchJob();
job->setLimit( 1 );
job->setQuery( Akonadi::ContactSearchJob::Email, email );
job->exec();

@ -2865,7 +2865,8 @@ void KMMainWidget::slotMessagePopup(const Akonadi::Item&msg ,const KUrl&aUrl,con
menu->addSeparator();
QString email = KPIMUtils::firstEmailAddress( aUrl.path() );
Akonadi::ContactSearchJob *job = new Akonadi::ContactSearchJob(this);
Akonadi::ContactSearchJob *job = new Akonadi::ContactSearchJob( this );
job->setLimit( 1 );
job->setQuery( Akonadi::ContactSearchJob::Email, email );
job->exec();

@ -360,6 +360,7 @@ void KMReaderMainWin::slotMessagePopup(const Akonadi::Item&aMsg ,const KUrl&aUrl
}
QString email = KPIMUtils::firstEmailAddress( aUrl.path() );
Akonadi::ContactSearchJob *job = new Akonadi::ContactSearchJob( this );
job->setLimit( 1 );
job->setQuery( Akonadi::ContactSearchJob::Email, email );
job->exec();

@ -485,6 +485,7 @@ bool KMSearchRuleString::matchesInternal( const QString & msgContents ) const
const QStringList addressList = KPIMUtils::splitAddressList( msgContents.toLower() );
for ( QStringList::ConstIterator it = addressList.constBegin(); ( it != addressList.constEnd() ); ++it ) {
Akonadi::ContactSearchJob *job = new Akonadi::ContactSearchJob();
job->setLimit( 1 );
job->setQuery( Akonadi::ContactSearchJob::Email, KPIMUtils::extractEmailAddress( *it ) );
job->exec();
@ -498,6 +499,7 @@ bool KMSearchRuleString::matchesInternal( const QString & msgContents ) const
const QStringList addressList = KPIMUtils::splitAddressList( msgContents.toLower() );
for ( QStringList::ConstIterator it = addressList.constBegin(); ( it != addressList.constEnd() ); ++it ) {
Akonadi::ContactSearchJob *job = new Akonadi::ContactSearchJob();
job->setLimit( 1 );
job->setQuery( Akonadi::ContactSearchJob::Email, KPIMUtils::extractEmailAddress( *it ) );
job->exec();

@ -250,7 +250,8 @@ namespace KMail {
const Identity defaultIdentity = manager.defaultIdentity();
const QString email = defaultIdentity.emailAddr();
Akonadi::ContactSearchJob *job = new Akonadi::ContactSearchJob(this);
Akonadi::ContactSearchJob *job = new Akonadi::ContactSearchJob( this );
job->setLimit( 1 );
job->setQuery( Akonadi::ContactSearchJob::Email, email );
job->exec();

Loading…
Cancel
Save