← Back to branch summary

~ubuntu-branches/ubuntu/karmic/kdepim/karmic-backports

« back to all changes in this revision

Viewing changes to libkdepim/addresseelineedit.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2009-10-03 22:27:55 UTC
  • mfrom: (1.1.44 upstream)
  • Revision ID: james.westby@ubuntu.com-20091003222755-nm1u1hm80385m8h3
Tags: 4:4.3.2-0ubuntu1
* New upstream release
  - Bump build-deps
  - Remove kubuntu_02_dimap_folder_rename_fix.diff fixed by upstream
  - Remove ktimeticker obsolete package from kontact suggests
  - Remove several oxygen icons which also are in kde-icons-oxygen,
    add in not-installed

Show diffs side-by-side

added added

removed removed

Lines of Context:
libkdepim/addresseelineedit.cpp
800
800
 
801
801
void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList &adrs )
802
802
{
803
 
  if ( s_LDAPLineEdit != this ) {
 
803
  if ( adrs.isEmpty() || s_LDAPLineEdit != this ) {
804
804
    return;
805
805
  }
806
806
 
817
817
    setText( m_previousAddresses + m_searchString );
818
818
    // only complete again if the user didn't change the selection while
819
819
    // we were waiting; otherwise the completion box will be closed
820
 
    if ( m_searchString.trimmed() != completionBox()->currentItem()->text().trimmed() ) {
 
820
    QListWidgetItem *current = completionBox()->currentItem();
 
821
    if ( !current || m_searchString.trimmed() != current->text().trimmed() ) {
821
822
      doCompletion( m_lastSearchMode );
822
823
    }
823
824
  }