rpms/evolution/FC-5 evolution-2.6.2-fix-crash-on-paste.patch, NONE, 1.1 evolution.spec, 1.142, 1.143

[fedora-cvs-commits redhat com]

Author: mbarnes

Update of /cvs/dist/rpms/evolution/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv1479

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.6.2-fix-crash-on-paste.patch 
Log Message:
- Add patch for RH bug #167157.


evolution-2.6.2-fix-crash-on-paste.patch:
 e-calendar-view.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

--- NEW FILE evolution-2.6.2-fix-crash-on-paste.patch ---
--- evolution-2.6.2/calendar/gui/e-calendar-view.c.fix-crash-on-paste	2006-07-29 03:16:34.000000000 -0400
+++ evolution-2.6.2/calendar/gui/e-calendar-view.c	2006-07-29 03:16:58.000000000 -0400
@@ -376,10 +376,8 @@
 	/* FIXME Error handling */
 	uid = NULL;
 	if (e_cal_create_object (client, e_cal_component_get_icalcomponent (comp), &uid, NULL)) {
-		if (uid) {
+		if (uid)
 			e_cal_component_set_uid (comp, uid);
-			g_free (uid);
-		}
 
 		if (itip_organizer_is_user (comp, client) &&
 		    send_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)),


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/evolution.spec,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- evolution.spec	7 Jun 2006 21:39:17 -0000	1.142
+++ evolution.spec	29 Jul 2006 07:21:24 -0000	1.143
@@ -39,7 +39,7 @@
 
 Name: evolution
 Version: 2.6.2
-Release: 1.fc5.6
+Release: 1.fc5.7
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -102,6 +102,9 @@
 Patch808: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
 Patch809: evolution-2.6.0-prototypes.patch
 
+# RH bug #167157 / Gnome.org bug #334464
+Patch810: evolution-2.6.2-fix-crash-on-paste.patch
+
 # Removed to placate the build system.  Feel free to try to re-add it, but,
 # wash your dog first.
 ExcludeArch: s390 s390x
@@ -250,6 +253,7 @@
 %patch806 -p1 -b .notification-cleanups
 %patch808 -p1 -b .fix-missing-declarations-2.5.5.1
 %patch809 -p1 -b .prototypes
+%patch810 -p1 -b .fix-crash-on-paste
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -639,6 +643,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Sat Jul 29 2006 Matthew Barnes <mbarnes redhat com> - 2.6.2-1.fc5.7
+- Add patch for RH bug #167157.
+
 * Wed Jun  7 2006 Matthias Clasen <mclasen redhat com> - 2.6.2-1.fc5.6
 - Rebuild