Re: [evolution-patches] freeze request for evolution-data-server

[Rodrigo Moya <rodrigo novell com>]

On Sun, 2005-03-06 at 03:09 +0100, Rodrigo Moya wrote:
> On Sun, 2005-03-06 at 02:59 +0100, Rodrigo Moya wrote:
> > This fixes a crash when using proxy with web calendars.
> > 
> > The bug: http://bugzilla.ximian.com/show_bug.cgi?id=72454
> 
> please discard this patch, it was wrong.

now the good one, already approved by the Evolution team.
-- 
Rodrigo Moya <rodrigo novell com>

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/ChangeLog,v
retrieving revision 1.434
diff -u -p -r1.434 ChangeLog
--- ChangeLog	6 Mar 2005 02:12:08 -0000	1.434
+++ ChangeLog	6 Mar 2005 02:33:17 -0000
@@ -1,3 +1,10 @@
+2005-03-06  Rodrigo Moya <rodrigo novell com>
+
+	Fixes #72454
+
+	* backends/http/e-cal-backend-http.c (begin_retrieval_cb): call
+	g_object_set with correct arguments.
+
 2005-02-28  Chenthill Palanisamy  <pchenthill novell com>
 
 	* backends/groupwise/e-cal-backend-groupwise.c: 
Index: backends/http/e-cal-backend-http.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/http/e-cal-backend-http.c,v
retrieving revision 1.33
diff -u -p -r1.33 e-cal-backend-http.c
--- backends/http/e-cal-backend-http.c	6 Mar 2005 02:12:09 -0000	1.33
+++ backends/http/e-cal-backend-http.c	6 Mar 2005 02:33:17 -0000
@@ -387,6 +387,7 @@ begin_retrieval_cb (ECalBackendHttp *cbh
 			port = gconf_client_get_int (conf_client, "/system/http_proxy/port", NULL);
 
 			if (server && server[0]) {
+				SoupUri *suri;
 				if (gconf_client_get_bool (conf_client, "/system/http_proxy/use_authentication", NULL)) {
 					char *user, *password;
 
@@ -404,8 +405,10 @@ begin_retrieval_cb (ECalBackendHttp *cbh
 				} else
 					proxy_uri = g_strdup_printf ("http://%s:%d";, server, port);
 
-				g_object_set (G_OBJECT (priv->soup_session), SOUP_SESSION_PROXY_URI, proxy_uri);
+				suri = soup_uri_new (proxy_uri);
+				g_object_set (G_OBJECT (priv->soup_session), SOUP_SESSION_PROXY_URI, suri, NULL);
 
+				soup_uri_free (suri);
 				g_free (server);
 				g_free (proxy_uri);
 			}