rev 15910 - in trunk/packages/kdepim/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2009-09-06 07:56:53 +0000 (Sun, 06 Sep 2009)
New Revision: 15910

Added:
   trunk/packages/kdepim/debian/patches/01_crash_when_autocompleting_ldap_address_r1019115.diff
Modified:
   trunk/packages/kdepim/debian/changelog
   trunk/packages/kdepim/debian/patches/30_debianize_akregator_default.diff
   trunk/packages/kdepim/debian/patches/series
Log:
Add 01_crash_when_autocompleting_ldap_address_r1019115.diff patch:
- probable crash fix when autocompleting LDAP address.


Modified: trunk/packages/kdepim/debian/changelog
===================================================================
--- trunk/packages/kdepim/debian/changelog	2009-09-06 05:17:15 UTC (rev 15909)
+++ trunk/packages/kdepim/debian/changelog	2009-09-06 07:56:53 UTC (rev 15910)
@@ -1,3 +1,10 @@
+kdepim (4:4.3.1-2) unstable; urgency=low
+
+  * Add 01_crash_when_autocompleting_ldap_address_r1019115.diff patch:
+    - probable crash fix when autocompleting LDAP address.
+
+ -- Fathi Boudra <fabo at debian.org>  Sun, 06 Sep 2009 09:29:11 +0200
+
 kdepim (4:4.3.1-1) unstable; urgency=low
 
   * New upstream release.
@@ -6,7 +13,7 @@
 
   * Change depends/suggests on pinentry-qt to pinentry-qt4.
 
-  +++ Changes by Fathi Boudra:
+  +++ Chnages by Fathi Boudra:
 
   * Bump Standards-Version to 3.8.3 (no changes needed).
   * Bump KDE build dependencies to 4.3.1.

Added: trunk/packages/kdepim/debian/patches/01_crash_when_autocompleting_ldap_address_r1019115.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/01_crash_when_autocompleting_ldap_address_r1019115.diff	                        (rev 0)
+++ trunk/packages/kdepim/debian/patches/01_crash_when_autocompleting_ldap_address_r1019115.diff	2009-09-06 07:56:53 UTC (rev 15910)
@@ -0,0 +1,16 @@
+author: Allen Winter <winter at kde.org>
+KDE bug: 206024
+
+probable crash fix when autocompleting LDAP address.
+
+--- a/libkdepim/addresseelineedit.cpp
++++ b/libkdepim/addresseelineedit.cpp
+@@ -800,7 +800,7 @@ void AddresseeLineEdit::startLoadingLDAP
+ 
+ void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList &adrs )
+ {
+-  if ( s_LDAPLineEdit != this ) {
++  if ( adrs.isEmpty() || s_LDAPLineEdit != this ) {
+     return;
+   }
+ 

Modified: trunk/packages/kdepim/debian/patches/30_debianize_akregator_default.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/30_debianize_akregator_default.diff	2009-09-06 05:17:15 UTC (rev 15909)
+++ trunk/packages/kdepim/debian/patches/30_debianize_akregator_default.diff	2009-09-06 07:56:53 UTC (rev 15910)
@@ -1,6 +1,6 @@
 --- a/akregator/src/akregator_part.cpp
 +++ b/akregator/src/akregator_part.cpp
-@@ -130,6 +130,20 @@ namespace {
+@@ -131,6 +131,20 @@ namespace {
          look.setAttribute("xmlUrl","http://www.kde.org/kde-look-content.rdf");
          mainFolder.appendChild(look);
  

Modified: trunk/packages/kdepim/debian/patches/series
===================================================================
--- trunk/packages/kdepim/debian/patches/series	2009-09-06 05:17:15 UTC (rev 15909)
+++ trunk/packages/kdepim/debian/patches/series	2009-09-06 07:56:53 UTC (rev 15910)
@@ -1 +1,2 @@
+01_crash_when_autocompleting_ldap_address_r1019115.diff
 30_debianize_akregator_default.diff