From d67d2bcbf76e02e0abbe7a38e6e9b2c93675093c Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Mon, 14 May 2007 16:56:18 +0000
Subject: [PATCH] - Revise patch for RH bug #238155 (crash on startup).

---
 evolution-2.10.1-check-uri-before-strcmp.patch | 17 +++++++++++++++++
 evolution.spec                                 |  9 ++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 evolution-2.10.1-check-uri-before-strcmp.patch

diff --git a/evolution-2.10.1-check-uri-before-strcmp.patch b/evolution-2.10.1-check-uri-before-strcmp.patch
new file mode 100644
index 0000000..59982b5
--- /dev/null
+++ b/evolution-2.10.1-check-uri-before-strcmp.patch
@@ -0,0 +1,17 @@
+--- evolution-2.10.1/calendar/gui/calendar-component.c.calendar-component	2007-05-07 14:07:16.000000000 -0400
++++ evolution-2.10.1/calendar/gui/calendar-component.c	2007-05-07 14:11:48.000000000 -0400
+@@ -210,7 +210,13 @@
+ 		GSList *s;
+ 		for (s = sources; s; s = s->next) {
+ 			ESource *source = E_SOURCE (s->data);
+-			if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
++			const gchar *relative_uri;
++
++			g_assert (source != NULL);
++			relative_uri = e_source_peek_relative_uri (source);
++			if (relative_uri == NULL)
++				continue;
++			if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) {
+ 				personal_source = source;
+ 				break;
+ 			}
diff --git a/evolution.spec b/evolution.spec
index 02d94b4..15df3f4 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.1
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -174,7 +174,7 @@ Patch51: evolution-2.10.1-en_CA-attribution-format.patch
 Patch52: evolution-2.10.1-e-attachment-bar.patch
 
 # RH bug #238155 / GNOME bug #427232
-Patch53: evolution-2.10.1-calendar-component.patch
+Patch53: evolution-2.10.1-check-uri-before-strcmp.patch
 
 ## Dependencies ###
 
@@ -333,7 +333,7 @@ Development files needed for building things which link against evolution.
 %patch50 -p1 -b .fix-uri-handling
 %patch51 -p1 -b .en_CA-attribution-format
 %patch52 -p1 -b .e-attachment-bar
-%patch53 -p1 -b .calendar-component
+%patch53 -p1 -b .check-uri-before-strcmp
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -755,6 +755,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon May 14 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-14.fc7
+- Revise patch for RH bug #238155 (crash on startup).
+
 * Mon May 07 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-13.fc7
 - Add patch for RH bug #238155 (crash on startup).