Re: [evolution-patches] 55389

[Rodrigo Moya <rodrigo ximian com>]

On Wed, 2004-03-10 at 10:42 -0500, JP Rosevear wrote:

> On Wed, 2004-03-10 at 07:07, Rodrigo Moya wrote:
> > On Tue, 2004-03-09 at 18:52 -0500, JP Rosevear wrote:
> > 
> > hmm, I thought send_objects should return only the objects it modified.
> > If that's not the case, the patch looks ok.
> 
> Committed.
> 
the same patch but for the contacts and http backends.

cheers

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/ChangeLog,v
retrieving revision 1.202
diff -u -p -r1.202 ChangeLog
--- ChangeLog	10 Mar 2004 15:48:21 -0000	1.202
+++ ChangeLog	10 Mar 2004 15:59:55 -0000
@@ -1,3 +1,20 @@
+2004-03-10  Rodrigo Moya <rodrigo ximian com>
+
+	* backends/http/e-cal-backend-http.c (e_cal_backend_http_send_objects):
+	* backends/contacts/e-cal-backend-contacts.c
+	(e_cal_backend_contacts_send_objects): return the calendar object properly.
+
 2004-03-09  JP Rosevear <jpr ximian com>
 
 	Fixes #55389
Index: backends/contacts/e-cal-backend-contacts.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/contacts/e-cal-backend-contacts.c,v
retrieving revision 1.6
diff -u -p -r1.6 e-cal-backend-contacts.c
--- backends/contacts/e-cal-backend-contacts.c	9 Mar 2004 23:43:46 -0000	1.6
+++ backends/contacts/e-cal-backend-contacts.c	10 Mar 2004 15:59:55 -0000
@@ -600,7 +600,7 @@ e_cal_backend_contacts_send_objects (ECa
 				     const char *calobj, GList **users, char **modified_calobj)
 {
 	*users = NULL;
-	*modified_calobj = NULL;
+	*modified_calobj = g_strdup (calobj);
 	/* TODO: Investigate this */
 	return GNOME_Evolution_Calendar_Success;
 }
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.14
diff -u -p -r1.14 e-cal-backend-http.c
--- backends/http/e-cal-backend-http.c	1 Mar 2004 15:45:56 -0000	1.14
+++ backends/http/e-cal-backend-http.c	10 Mar 2004 15:59:55 -0000
@@ -755,7 +755,7 @@ e_cal_backend_http_send_objects (ECalBac
 	priv = cbhttp->priv;
 
 	*users = NULL;
-	*modified_calobj = NULL;
+	*modified_calobj = g_strdup (calobj);
 
 	return GNOME_Evolution_Calendar_PermissionDenied;
 }