diff options
| author |   Jonathan Callen <abcd@gentoo.org> | 2009-12-12 09:29:11 +0000 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2009-12-12 09:29:11 +0000 |
| commit | 54b98b495f3c8b03e157573936b2a3a7dae56fd3 (patch) | |
| tree | fd8f09658a90bf9101574c902fac3d41b1dc748d /kde-base | |
| parent | Version bump. Set SUPPORT_PYTHON_ABIS. (diff) | |
| download | gentoo-2-54b98b495f3c8b03e157573936b2a3a7dae56fd3.tar.gz gentoo-2-54b98b495f3c8b03e157573936b2a3a7dae56fd3.tar.bz2 gentoo-2-54b98b495f3c8b03e157573936b2a3a7dae56fd3.zip | |
Drop old patch
(Portage version: -svn/cvs/Linux i686)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/libkdepim/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff | 22 |
2 files changed, 5 insertions, 23 deletions
diff --git a/kde-base/libkdepim/ChangeLog b/kde-base/libkdepim/ChangeLog index 845c5bba0b31..a52807d5735b 100644 --- a/kde-base/libkdepim/ChangeLog +++ b/kde-base/libkdepim/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/libkdepim # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.145 2009/12/10 23:17:09 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.146 2009/12/12 09:29:10 abcd Exp $ + + 12 Dec 2009; Jonathan Callen <abcd@gentoo.org> + -files/libkdepim-4.3.1-ldap_crash.diff: + Drop old patch 10 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> -libkdepim-4.3.1.ebuild, -libkdepim-4.3.1-r1.ebuild: 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 deleted file mode 100644 index a3092f058762..000000000000 --- a/kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff +++ /dev/null @@ -1,22 +0,0 @@ -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 ); - } - } |