diff options
| author |   Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> | 2009-10-02 23:18:15 +0000 |
|---|---|---|
| committer | Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> | 2009-10-02 23:18:15 +0000 |
| commit | 2915133d614c3343ff8a7fec30fd5e893d63e634 (patch) | |
| tree | 76f37fae25c241340f50cff206fdc2bf7b40e567 /kde-base/libkdepim/files | |
| parent | stable sparc, bug 282596 (diff) | |
| download | gentoo-2-2915133d614c3343ff8a7fec30fd5e893d63e634.tar.gz gentoo-2-2915133d614c3343ff8a7fec30fd5e893d63e634.tar.bz2 gentoo-2-2915133d614c3343ff8a7fec30fd5e893d63e634.zip | |
Moved updated kdm ebuild from kde-testing overlay to the tree - thanks to Maciej Mrozowski (reavertm).
Added patch to supposedly fix LDAP crashes introduced in 4.3.1.
(Portage version: 2.2_rc42/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/libkdepim/files')
| -rw-r--r-- | kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff b/kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff new file mode 100644 index 000000000000..a3092f058762 --- /dev/null +++ b/kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff @@ -0,0 +1,22 @@ +diff -u libkdepim/addresseelineedit.cpp libkdepim/addresseelineedit.cpp +--- libkdepim/addresseelineedit.cpp (revision 1019119) ++++ libkdepim/addresseelineedit.cpp (revision 1019358) +@@ -800,7 +800,7 @@ + + void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList &adrs ) + { +- if ( s_LDAPLineEdit != this ) { ++ if ( adrs.isEmpty() || s_LDAPLineEdit != this ) { + return; + } + +@@ -817,7 +817,8 @@ + setText( m_previousAddresses + m_searchString ); + // only complete again if the user didn't change the selection while + // we were waiting; otherwise the completion box will be closed +- if ( m_searchString.trimmed() != completionBox()->currentItem()->text().trimmed() ) { ++ QListWidgetItem *current = completionBox()->currentItem(); ++ if ( !current || m_searchString.trimmed() != current->text().trimmed() ) { + doCompletion( m_lastSearchMode ); + } + } |