[gentoo-commits] gentoo-x86 commit in kde-base/libkdepim/files: libkdepim-4.3.1-ldap_crash.diff

[Jorge Manuel B. S. Vicetto (jmbsvicetto)]

jmbsvicetto    09/10/02 23:18:16

  Added:                libkdepim-4.3.1-ldap_crash.diff
  Log:
  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)

Revision  Changes    Path
1.1                  kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff?rev=1.1&content-type=text/plain

Index: libkdepim-4.3.1-ldap_crash.diff
===================================================================
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 );
     }
   }