Re: [evolution-patches] seek review the patch for #51052 (calendar)

[jack jia <jack jia sun com>]

Hello Rodrigo:
Sorry for my mistake.   I  attach the wrong patch by mistake.
Could you review the new patch?  It is similiar with the previous one 
and remove the error.

Thanks
jack


Rodrigo Moya wrote:

> On Mon, 2003-11-17 at 05:22, jack jia wrote:
>  
>
> > Hello JPR and Rodrigo:
> >   
> > Could you review the patch for the bug 51052?
> >
> > I Checked the src code of evolution. In the prepare_events and
> > prepare_tasks of calendar/importers/icalendar-importer.c 
> >
> >    
> looks ok to me, although it seems to have an error:
>
> static void
> prepare_tasks (icalcomponent *icalcomp, GList *vtodos)
> -{
> +
>
> why did you remove the { ?
>
> cheers
>
>  

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.1802.2.36
diff -u -r1.1802.2.36 ChangeLog
--- ChangeLog	3 Nov 2003 02:58:28 -0000	1.1802.2.36
+++ ChangeLog	18 Nov 2003 02:56:50 -0000
@@ -1,3 +1,12 @@
+2003-11-17  Jack Jia <jack jia sun com>
+
+	Fix for #51052.
+
+	* importers/icalendar-importer.c (prepare_events):
+	call icalcompiter_next to move the pointer to the next before
+	removing a component avoid breaking the link.
+	* importers/icalendar-importer.c (prepare_tasks): ditto.
+
 2003-10-31  Harry Lu <harry lu sun com>
 
 	Fix for #50387.
Index: importers/icalendar-importer.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/importers/icalendar-importer.c,v
retrieving revision 1.20.4.1
diff -u -r1.20.4.1 icalendar-importer.c
--- importers/icalendar-importer.c	3 Nov 2003 02:58:29 -0000	1.20.4.1
+++ importers/icalendar-importer.c	18 Nov 2003 02:56:51 -0000
@@ -137,11 +137,15 @@
 		if (child_kind != ICAL_VEVENT_COMPONENT
 		    && child_kind != ICAL_VTIMEZONE_COMPONENT) {
 
+			icalcompiter_next (&iter);
+
 			icalcomponent_remove_component (icalcomp, subcomp);
 			if (child_kind == ICAL_VTODO_COMPONENT)
 				vtodos = g_list_prepend (vtodos, subcomp);
 			else
 				icalcomponent_free (subcomp);
+
+			continue;
 		}
 
 		icalcompiter_next (&iter);
@@ -166,8 +170,12 @@
 		icalcomponent_kind child_kind = icalcomponent_isa (subcomp);
 		if (child_kind != ICAL_VTODO_COMPONENT
 		    && child_kind != ICAL_VTIMEZONE_COMPONENT) {
+			icalcompiter_next (&iter);
+			
 			icalcomponent_remove_component (icalcomp, subcomp);
 			icalcomponent_free (subcomp);
+
+			continue;
 		}
 
 		icalcompiter_next (&iter);