rpms/sylpheed/devel sylpheed-2.4.7-ldap.patch, NONE, 1.1 sylpheed.spec, 1.60, 1.61

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/pkgs/rpms/sylpheed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7807

Modified Files:
	sylpheed.spec 
Added Files:
	sylpheed-2.4.7-ldap.patch 
Log Message:
* Fri Nov 02 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4.7-2
- Patch a memory leak and glib critical warning in LDAP syldap.c.


sylpheed-2.4.7-ldap.patch:

--- NEW FILE sylpheed-2.4.7-ldap.patch ---
diff -Nur sylpheed-2.4.7-orig/src/syldap.c sylpheed-2.4.7/src/syldap.c
--- sylpheed-2.4.7-orig/src/syldap.c	2006-08-31 10:21:21.000000000 +0200
+++ sylpheed-2.4.7/src/syldap.c	2007-11-02 00:08:27.000000000 +0100
@@ -602,11 +602,10 @@
 			if( g_ascii_strcasecmp( attribute, SYLDAP_ATTR_DN ) == 0 ) {
 				listDN = syldap_add_single_value( ld, e, attribute );
 			}
+			/* Free memory used to store attribute */
+			ldap_memfree( attribute );
 		}
 
-		/* Free memory used to store attribute */
-		ldap_memfree( attribute );
-
 		/* Format and add items to cache */
 		syldap_build_items_fl( ldapServer, listAddress, listFirst, listLast );
 
@@ -637,16 +636,15 @@
 
 /* syldap_display_search_results() - updates the ui. this function is called from the
  * main thread (the thread running the GTK event loop). */
-static gint syldap_display_search_results(SyldapServer *ldapServer)
+static gboolean syldap_display_search_results(SyldapServer *ldapServer)
 {
 	/* NOTE: when this function is called the accompanying thread should
 	 * already be terminated. */
-	gtk_idle_remove(ldapServer->idleId);
 	ldapServer->callBack(ldapServer);
 	/* FIXME:  match should know whether to free this SyldapServer stuff. */
 	g_free(ldapServer->thread);
 	ldapServer->thread = NULL;
-	return TRUE;
+	return FALSE;
 }
 
 /* ============================================================================================ */


Index: sylpheed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- sylpheed.spec	5 Oct 2007 16:09:15 -0000	1.60
+++ sylpheed.spec	1 Nov 2007 23:24:01 -0000	1.61
@@ -5,7 +5,7 @@
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
 Version: 2.4.7
-Release: 1
+Release: 2
 License: GPLv2+
 URL: http://sylpheed.sraoss.jp/
 Group: Applications/Internet
@@ -24,6 +24,7 @@
 Patch2: sylpheed-2.4.2-desktop.patch
 Patch3: sylpheed-2.3.1-certsdir.patch
 Patch4: sylpheed-2.2.5-prefs_common.patch
+Patch5: sylpheed-2.4.7-ldap.patch
 
 # For xdg-open in patch1.
 Requires: xdg-utils
@@ -49,6 +50,7 @@
 %patch2 -p1 -b .desktop
 %patch3 -p1 -b .certsdir
 %patch4 -p1 -b .prefs_common
+%patch5 -p1 -b .ldap
 
 %build
 %configure --enable-ssl %{!?_without_gpgme:--enable-gpgme} \
@@ -88,6 +90,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Fri Nov 02 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4.7-2
+- Patch a memory leak and glib critical warning in LDAP syldap.c.
+
 * Fri Oct 05 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4.7-1
 - Update to 2.4.7 (bug-fixes).
 - Add more %%doc files.