rpms/evolution-data-server/devel evolution-data-server-1.7.91-maybe-fix-crash.patch, NONE, 1.1 evolution-data-server.spec, 1.113, 1.114

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28649

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-1.7.91-maybe-fix-crash.patch 
Log Message:
- Add fix from Matthias Clasen that might help bug 202309.


evolution-data-server-1.7.91-maybe-fix-crash.patch:
 camel-imap-search.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE evolution-data-server-1.7.91-maybe-fix-crash.patch ---
--- evolution-data-server-1.7.91/camel/providers/imap/camel-imap-search.c.maybe-fix-crash	2006-08-16 15:56:44.000000000 -0400
+++ evolution-data-server-1.7.91/camel/providers/imap/camel-imap-search.c	2006-08-16 15:57:09.000000000 -0400
@@ -342,8 +342,6 @@ sync_match(CamelImapSearch *is, struct _
 		}
 		g_string_append_c (search, '"');
 	}
-	camel_search_words_free (words);
-	
 	/* We only try search using utf8 if its non us-ascii text? */
 	if ((words->type & CAMEL_SEARCH_WORD_8BIT) &&  (store->capabilities & IMAP_CAPABILITY_utf8_search)) {
 		response = camel_imap_command (store, folder, NULL,
@@ -352,6 +350,8 @@ sync_match(CamelImapSearch *is, struct _
 		if (response == NULL)
 			store->capabilities &= ~IMAP_CAPABILITY_utf8_search;
 	}
+	camel_search_words_free (words);
+	
 	if (response == NULL)
 		response = camel_imap_command (store, folder, NULL,
 					       "UID SEARCH %s", search->str);


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- evolution-data-server.spec	14 Aug 2006 16:39:54 -0000	1.113
+++ evolution-data-server.spec	16 Aug 2006 20:01:46 -0000	1.114
@@ -22,7 +22,7 @@
 
 Name: evolution-data-server
 Version: 1.7.91
-Release: 2
+Release: 3%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -41,6 +41,9 @@
 # RH bug #202329 / Gnome.org bug #351317
 Patch15: evolution-data-server-1.7.91-fix-edataserverui-libs.patch
 
+# RH bug #202309
+Patch16: evolution-data-server-1.7.91-may-fix-crash.patch
+
 ### Dependencies ###
 
 Requires: GConf2
@@ -123,6 +126,7 @@
 %patch13 -p1 -b .fix-implicit-function-declarations
 %patch14 -p1 -b .make_imap4_optional
 %patch15 -p1 -b .fix-edataserverui-libs
+%patch16 -p1 -b .maybe-fix-crash
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -325,6 +329,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Wed Aug 16 2006 Ray Strode <rstrode at redhat.com> - 1.7.91-3
+- Add fix from Matthias Clasen that might help bug 202309.
+
 * Mon Aug 14 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.91-2
 - Add patch for RH bug #202329.