rpms/evolution/F-7 evolution-2.10.3-todo-conduit.patch, NONE, 1.1 evolution.spec, 1.270, 1.271

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7024

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.10.3-todo-conduit.patch 
Log Message:

* Sat Nov 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.3-7.fc7
- Add patch for RH bug #249640 (todo conduit crash).


evolution-2.10.3-todo-conduit.patch:

--- NEW FILE evolution-2.10.3-todo-conduit.patch ---
diff -up evolution-2.10.3/calendar/conduits/todo/todo-conduit.c.todo-conduit evolution-2.10.3/calendar/conduits/todo/todo-conduit.c
--- evolution-2.10.3/calendar/conduits/todo/todo-conduit.c.todo-conduit	2007-11-03 15:21:56.000000000 -0400
+++ evolution-2.10.3/calendar/conduits/todo/todo-conduit.c	2007-11-03 15:22:10.000000000 -0400
@@ -992,7 +992,7 @@ comp_from_remote_record (GnomePilotCondu
 			e_cal_component_set_status (comp, ICAL_STATUS_NEEDSACTION);
 	}
 
-	if (!is_empty_time (todo.due)) {
+	if (!todo.indefinite && !is_empty_time (todo.due)) {
 		due = tm_to_icaltimetype (&todo.due, TRUE);
 		dt.value = &due;
 		e_cal_component_set_due (comp, &dt);


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-7/evolution.spec,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- evolution.spec	1 Nov 2007 20:41:33 -0000	1.270
+++ evolution.spec	3 Nov 2007 19:26:30 -0000	1.271
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -176,6 +176,9 @@
 # GNOME bug #239441
 Patch56: evolution-2.10.3-fix-ETreeTableAdapter-crash.patch
 
+# RH bug #249640 / GNOME bug #442329
+Patch57: evolution-2.10.3-todo-conduit.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -334,6 +337,7 @@
 %patch54 -p1 -b .send-recv-dialog
 %patch55 -p1 -b .version-checks
 %patch56 -p1 -b .ETreeTableAdapter-idle-crash
+%patch57 -p1 -b .todo-conduit
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -755,6 +759,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Sat Nov 03 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.3-7.fc7
+- Add patch for RH bug #249640 (todo conduit crash).
+
 * Wed Oct 31 2007 Dan Williams <dcbw at redhat.com> - 2.10.3-6.fc7
 - Backport fix for GNOME bug #239441