rpms/sylpheed/devel sylpheed-2.6.0-addrbook-csv-import.patch, NONE, 1.1 sylpheed.spec, 1.97, 1.98

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/sylpheed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8497

Modified Files:
	sylpheed.spec 
Added Files:
	sylpheed-2.6.0-addrbook-csv-import.patch 
Log Message:
* Tue Feb 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.6.0-4
- fix crash in import of csv address-books with empty Name fields


sylpheed-2.6.0-addrbook-csv-import.patch:

--- NEW FILE sylpheed-2.6.0-addrbook-csv-import.patch ---
diff -Nur sylpheed-2.6.0-orig/src/addr_compl.c sylpheed-2.6.0/src/addr_compl.c
--- sylpheed-2.6.0-orig/src/addr_compl.c	2008-11-20 02:49:38.000000000 +0100
+++ sylpheed-2.6.0/src/addr_compl.c	2009-02-24 11:47:11.000000000 +0100
@@ -174,7 +174,7 @@
 	addr_ce = g_new0(completion_entry, 1);
 
 	ae = g_new0(address_entry, 1);
-	ae->name    = g_strdup(name);
+	ae->name    = g_strdup(name ? name : "");
 	ae->address = g_strdup(address);		
 	if ((found = g_list_find_custom(address_list, ae,
 					address_entry_find_func))) {


Index: sylpheed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sylpheed/devel/sylpheed.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- sylpheed.spec	13 Feb 2009 19:08:02 -0000	1.97
+++ sylpheed.spec	24 Feb 2009 10:50:58 -0000	1.98
@@ -7,7 +7,7 @@
 Summary: GTK+ based, lightweight, and fast email client
 Name: sylpheed
 Version: 2.6.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 URL: http://sylpheed.sraoss.jp/
 Group: Applications/Internet
@@ -34,6 +34,8 @@
 Patch3: sylpheed-2.5.0-certsdir.patch
 # customisation for default Folder View preferences to mimic older Sylpheed
 Patch4: sylpheed-2.5.0-prefs_common.patch
+# crash-fix
+Patch5: sylpheed-2.6.0-addrbook-csv-import.patch
 
 # For xdg-open in patch1.
 Requires: xdg-utils
@@ -59,6 +61,7 @@
 %patch2 -p1 -b .desktop
 %patch3 -p1 -b .certsdir
 %patch4 -p1 -b .prefs_common
+%patch5 -p1 -b .addrbook-csv-import
 
 %build
 %configure --enable-ssl %{!?_without_gpgme:--enable-gpgme} \
@@ -107,6 +110,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Tue Feb 24 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.6.0-4
+- fix crash in import of csv address-books with empty Name fields
+
 * Fri Feb 13 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.6.0-3
 - no build, add comments to spec file, remove old cruft