rpms/evolution/devel evolution-2.10.3-server-message-double-free.patch, NONE, 1.1 evolution.spec, 1.329, 1.330

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.10.3-server-message-double-free.patch 
Log Message:
* Tue Mar 25 2008 Dan Williams <dcbw at redhat.com> - 2.22.0-4.fc9
- Add patch for GNOME bug #524310



evolution-2.10.3-server-message-double-free.patch:

--- NEW FILE evolution-2.10.3-server-message-double-free.patch ---
diff -up evolution-2.10.3/mail/mail-session.c.server-message-double-free evolution-2.10.3/mail/mail-session.c
--- evolution-2.10.3/mail/mail-session.c.server-message-double-free	2008-03-25 10:01:13.000000000 -0400
+++ evolution-2.10.3/mail/mail-session.c	2008-03-25 10:01:25.000000000 -0400
@@ -389,10 +389,8 @@ alert_user(CamelSession *session, CamelS
 		mail_msg_unref (m);
 	}
 
-	if (m->ismain) {
-		user_message_free (m);
+	if (m->ismain)
 		mail_msg_unref (m);
-	}
 
 	return result;
 }


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -r1.329 -r1.330
--- evolution.spec	14 Mar 2008 20:10:05 -0000	1.329
+++ evolution.spec	25 Mar 2008 15:26:56 -0000	1.330
@@ -46,7 +46,7 @@
 
 Name: evolution
 Version: 2.22.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -84,6 +84,9 @@
 # RH bug #437208 / GNOME bug #518103
 Patch16: evolution-2.22.0-line-status.patch
 
+# GNOME bug #524310
+Patch17: evolution-2.10.3-server-message-double-free.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -230,6 +233,7 @@
 %patch14 -p1 -b .no-gnome-common
 %patch15 -p1 -b .im-context-reset
 %patch16 -p1 -b .line-status
+%patch17 -p1 -b .server-message-double-free
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -657,6 +661,9 @@
 %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
 
 %changelog
+* Tue Mar 25 2008 Dan Williams <dcbw at redhat.com> - 2.22.0-4.fc9
+- Add patch for GNOME bug #524310
+
 * Fri Mar 14 2008 Matthew Barnes <mbarnes at redhat.com> - 2.22.0-3.fc9
 - Explicit require evolution-data-server since its shared object names
   still can't be trusted (RH bug #426511).