File bgo-334900-ee-fix-crash-import-ics.diff of Package evolution-exchange-2.6

Overview Repositories Revisions Requests Users Attributes Meta

File bgo-334900-ee-fix-crash-import-ics.diff of Package evolution-exchange-2.6

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.55
diff -u -p -r1.55 e-cal-backend-exchange-calendar.c
--- calendar/e-cal-backend-exchange-calendar.c	4 Apr 2006 08:24:39 -0000	1.55
+++ calendar/e-cal-backend-exchange-calendar.c	12 Apr 2006 08:27:17 -0000
@@ -1536,11 +1536,6 @@ receive_objects (ECalBackendSync *backen
 					char *new_object = NULL;
 					CalObjModType mod = CALOBJ_MOD_ALL;
 					
-					if (rid) {
-						time_rid = icaltime_from_string (rid);
-						e_cal_util_remove_instances (ecomp->icomp, time_rid, CALOBJ_MOD_THIS);
-					}
-
 					if (e_cal_util_component_is_instance (subcomp))
 						mod = CALOBJ_MOD_THIS;
 
Index: calendar/e-cal-backend-exchange.c
===================================================================
RCS file: /cvs/gnome/evolution-exchange/calendar/e-cal-backend-exchange.c,v
retrieving revision 1.64
diff -u -p -r1.64 e-cal-backend-exchange.c
--- calendar/e-cal-backend-exchange.c	6 Mar 2006 14:06:22 -0000	1.64
+++ calendar/e-cal-backend-exchange.c	12 Apr 2006 08:27:18 -0000
@@ -675,7 +675,8 @@ e_cal_backend_exchange_modify_object (EC
 		ecomp->instances = g_list_prepend (ecomp->instances,
 						   icalcomponent_new_clone (comp));
 		/*FIXME This is a workaround to cover the timezone issue while setting rid from evolution */
-		discard_detached_instance (ecomp, rid);
+		if (ecomp->icomp)
+			e_cal_util_remove_instances (ecomp->icomp, rid, CALOBJ_MOD_THIS);
 	}
 
 	save_cache (cbex);

Places

File bgo-334900-ee-fix-crash-import-ics.diff of Package evolution-exchange-2.6

Places