rpms/evolution-data-server/devel evolution-data-server-1.8.0-fix-ecal-crash.patch, 1.1, 1.2 evolution-data-server.spec, 1.123, 1.124

[fedora-cvs-commits at redhat.com]

Author: mbarnes

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5271

Modified Files:
	evolution-data-server-1.8.0-fix-ecal-crash.patch 
	evolution-data-server.spec 
Log Message:

* Mon Sep 18 2006 Matthew Barnes <mbarnes at redhat.com> - 1.8.0-5.fc6
- Revise patch for RH bug #205187 (use upstream's version).


evolution-data-server-1.8.0-fix-ecal-crash.patch:
 e-cal-backend-http.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

Index: evolution-data-server-1.8.0-fix-ecal-crash.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server-1.8.0-fix-ecal-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-data-server-1.8.0-fix-ecal-crash.patch	16 Sep 2006 19:53:17 -0000	1.1
+++ evolution-data-server-1.8.0-fix-ecal-crash.patch	18 Sep 2006 16:58:17 -0000	1.2
@@ -1,26 +1,11 @@
---- evolution-data-server-1.8.0/calendar/backends/http/e-cal-backend-http.c.fix-http-cal-crash	2006-09-16 12:23:11.000000000 -0400
-+++ evolution-data-server-1.8.0/calendar/backends/http/e-cal-backend-http.c	2006-09-16 12:31:36.000000000 -0400
-@@ -444,11 +444,18 @@
- 	}
- 
- 	if (priv->uri == NULL) {
--		ESource *source = e_cal_backend_get_source (E_CAL_BACKEND (cbhttp));
--		const char *secure_prop = e_source_get_property (source, "use_ssl");
--		
--		priv->uri = webcal_to_http_method (e_cal_backend_get_uri (E_CAL_BACKEND (cbhttp)),
+--- evolution-data-server-1.8.0/calendar/backends/http/e-cal-backend-http.c.fix-ecal-crash	2006-09-18 12:32:35.000000000 -0400
++++ evolution-data-server-1.8.0/calendar/backends/http/e-cal-backend-http.c	2006-09-18 12:32:56.000000000 -0400
+@@ -448,7 +448,7 @@
+ 		const char *secure_prop = e_source_get_property (source, "use_ssl");
+ 		
+ 		priv->uri = webcal_to_http_method (e_cal_backend_get_uri (E_CAL_BACKEND (cbhttp)),
 -		                                   (secure_prop && g_str_equal(e_source_get_property (source, "secure"), "1")));
-+		ESource *source;
-+		const gchar *secure_prop;
-+		const gchar *use_ssl_prop;
-+
-+		source = e_cal_backend_get_source (E_CAL_BACKEND (cbhttp));
-+		secure_prop = e_source_get_property (source, "secure");
-+		use_ssl_prop = e_source_get_property (source, "use_ssl");
-+
-+		priv->uri = webcal_to_http_method (
-+			e_cal_backend_get_uri (E_CAL_BACKEND (cbhttp)),
-+			(use_ssl_prop != NULL && secure_prop != NULL &&
-+			g_str_equal (secure_prop, "1")));
++		                                   (secure_prop && g_str_equal(secure_prop, "1")));
  	}
  
  	/* create message to be sent to server */


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- evolution-data-server.spec	16 Sep 2006 19:53:17 -0000	1.123
+++ evolution-data-server.spec	18 Sep 2006 16:58:17 -0000	1.124
@@ -22,7 +22,7 @@
 
 Name: evolution-data-server
 Version: 1.8.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -344,6 +344,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Mon Sep 18 2006 Matthew Barnes <mbarnes at redhat.com> - 1.8.0-5.fc6
+- Revise patch for RH bug #205187 (use upstream's version).
+
 * Sat Sep 16 2006 Matthew Barnes <mbarnes at redhat.com> - 1.8.0-4.fc6
 - Add patch for RH bug #205187 (crash on startup).