[evolution-patches] fix for the bug 73969 [exchange calendar]

[chenthill <pchenthill novell com>]

Hi,
   Have attached the fix for the bug.

thanks, chenthill.

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2703
diff -u -p -r1.2703 ChangeLog
--- ChangeLog	28 Mar 2005 11:27:17 -0000	1.2703
+++ ChangeLog	29 Mar 2005 13:30:13 -0000
@@ -1,3 +1,9 @@
+2005-03-29  Chenthill Palanisamy  <pchenthill novell com>
+
+	Fixes #73969
+	* gui/e-calendar-view.c: (delete_event): Remove the
+	recurrence id property if its present.
+
 2005-03-28  Rodrigo Moya <rodrigo novell com>
 
 	Fixes #44719
Index: gui/e-calendar-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-calendar-view.c,v
retrieving revision 1.77
diff -u -p -r1.77 e-calendar-view.c
--- gui/e-calendar-view.c	21 Mar 2005 14:29:15 -0000	1.77
+++ gui/e-calendar-view.c	29 Mar 2005 13:30:13 -0000
@@ -813,6 +813,7 @@ delete_event (ECalendarView *cal_view, E
 	comp = e_cal_component_new ();
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 	vtype = e_cal_component_get_vtype (comp);
+	e_cal_component_set_recurid (comp, NULL);
 
 	if (delete_component_dialog (comp, FALSE, 1, vtype, GTK_WIDGET (cal_view))) {
 		const char *uid;

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-exchange/ChangeLog,v
retrieving revision 1.310
diff -u -p -r1.310 ChangeLog
--- ChangeLog	29 Mar 2005 07:54:13 -0000	1.310
+++ ChangeLog	29 Mar 2005 13:32:16 -0000
@@ -1,3 +1,10 @@
+2005-03-29  Chenthill Palanisamy  <pchenthill novell com>
+
+	Fixes #73929
+	* calendar/e-cal-backend-exchange-calendar.c: (receive_objects): If the 
+	rid is not present and the method is CANCEL remove the recurrence event
+      	completely.
+
 2005-03-29  Sushma Rai  <rsushma novell com>
 
 	* storage/exchange-folder-size.[ch] (free_fsize_table): Freeing the key
Index: calendar/e-cal-backend-exchange-calendar.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/calendar/e-cal-backend-exchange-calendar.c,v
retrieving revision 1.40
diff -u -p -r1.40 e-cal-backend-exchange-calendar.c
--- calendar/e-cal-backend-exchange-calendar.c	14 Mar 2005 09:23:37 -0000	1.40
+++ calendar/e-cal-backend-exchange-calendar.c	29 Mar 2005 13:32:16 -0000
@@ -1321,8 +1321,12 @@ receive_objects (ECalBackendSync *backen
 
 		case ICAL_METHOD_CANCEL:
 			calobj = (char *) icalcomponent_as_ical_string (subcomp);
-			status = remove_object (backend, cal, uid, rid, CALOBJ_MOD_THIS, &calobj, NULL);
-			e_cal_backend_notify_object_removed (E_CAL_BACKEND (backend), uid, calobj, NULL);
+			if (rid)
+				status = remove_object (backend, cal, uid, rid, CALOBJ_MOD_THIS, &calobj, NULL);
+			else
+				status = remove_object (backend, cal, uid, NULL, CALOBJ_MOD_ALL, &calobj, NULL);
+			if (status == GNOME_Evolution_Calendar_Success) 
+				e_cal_backend_notify_object_removed (E_CAL_BACKEND (backend), uid, calobj, NULL);
 			break;
 		default:
 			status = GNOME_Evolution_Calendar_UnsupportedMethod;