rpms/evolution/devel evolution-2.10.1-check-uri-before-strcmp.patch, NONE, 1.1 evolution.spec, 1.255, 1.256 evolution-2.10.1-calendar-component.patch, 1.1, NONE

[Matthew Barnes (mbarnes)]

Author: mbarnes

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

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.10.1-check-uri-before-strcmp.patch 
Removed Files:
	evolution-2.10.1-calendar-component.patch 
Log Message:

* Mon May 14 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-14.fc7
- Revise patch for RH bug #238155 (crash on startup).


evolution-2.10.1-check-uri-before-strcmp.patch:

--- NEW FILE evolution-2.10.1-check-uri-before-strcmp.patch ---
--- 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;
 			}


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- evolution.spec	7 May 2007 19:51:12 -0000	1.255
+++ evolution.spec	14 May 2007 16:56:18 -0000	1.256
@@ -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 @@
 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 @@
 %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 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon May 14 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-14.fc7
+- Revise patch for RH bug #238155 (crash on startup).
+
 * Mon May 07 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-13.fc7
 - Add patch for RH bug #238155 (crash on startup).
 


--- evolution-2.10.1-calendar-component.patch DELETED ---