[arch-commits] Commit in kdepim/trunk (PKGBUILD fix-ldap-crash.path)
Pierre Schmitz
pierre at archlinux.org
Wed Sep 23 17:40:50 UTC 2009
Date: Wednesday, September 23, 2009 @ 13:40:49
Author: pierre
Revision: 52951
incomplete patch
Modified:
kdepim/trunk/PKGBUILD
kdepim/trunk/fix-ldap-crash.path
---------------------+
PKGBUILD | 4 ++--
fix-ldap-crash.path | 17 +++++++++++++----
2 files changed, 15 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-09-23 17:31:57 UTC (rev 52950)
+++ PKGBUILD 2009-09-23 17:40:49 UTC (rev 52951)
@@ -19,7 +19,7 @@
'kdepim-libkdepim'
'kdepim-wizards')
pkgver=4.3.1
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL' 'LGPL' 'FDL')
@@ -29,7 +29,7 @@
'kmail-delete-mails-from-server.patch' 'fix-ldap-crash.path')
md5sums=('1029bc586f29c262f5f60eb079623e62'
'a3c32cf5d25195c73c6a278861a3629f'
- '0b1cfd0a7d3a58688f47225e168d9014')
+ '0fbb85217984859097e4f8213759f221')
build() {
cd ${srcdir}/${pkgbase}-${pkgver}
Modified: fix-ldap-crash.path
===================================================================
--- fix-ldap-crash.path 2009-09-23 17:31:57 UTC (rev 52950)
+++ fix-ldap-crash.path 2009-09-23 17:40:49 UTC (rev 52951)
@@ -1,7 +1,6 @@
-Index: libkdepim/addresseelineedit.cpp
-===================================================================
---- libkdepim/addresseelineedit.cpp (Revision 1019118)
-+++ libkdepim/addresseelineedit.cpp (Revision 1019119)
+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 )
@@ -11,3 +10,13 @@
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 );
+ }
+ }
More information about the arch-commits
mailing list