First effort on reading multiple VEVENTS in one VCALENDAR component: Bug 135192

calendar/libxpical/oeICalEventImpl.cpp

@@ -897,9 +897,9 @@ NS_IMETHODIMP oeICalEventImpl::ParseIcalString(const char *aNewVal)
     printf( "ParseIcalString( %s )\n", aNewVal );
 #endif
     
-    icalcomponent *vcalendar = icalparser_parse_string( aNewVal );
-    ParseIcalComponent( vcalendar );
-    icalcomponent_free( vcalendar );
+    icalcomponent *vevent = icalparser_parse_string( aNewVal );
+    ParseIcalComponent( vevent );
+    icalcomponent_free( vevent );
 
     return NS_OK;
 }
@@ -974,16 +974,15 @@ NS_IMETHODIMP oeICalEventImpl::SetSnoozeTime( PRTime snoozetime )
     return NS_OK;
 }
 
-void oeICalEventImpl::ParseIcalComponent( icalcomponent *vcalendar )
+void oeICalEventImpl::ParseIcalComponent( icalcomponent *vevent )
 {
 #ifdef ICAL_DEBUG_ALL
     printf( "ParseIcalComponent()\n" );
 #endif
 
-    icalcomponent *vevent = icalcomponent_get_first_component( vcalendar, ICAL_VEVENT_COMPONENT );
     if ( !vevent ) {
         #ifdef ICAL_DEBUG
-        printf( "oeICalEventImpl::ParseIcalComponent() failed: VEVENT not found!\n" );
+        printf( "oeICalEventImpl::ParseIcalComponent() failed: vevent is NULL!\n" );
         #endif
         return;
     }

calendar/libxpical/oeICalImpl.cpp

@@ -658,20 +658,24 @@ oeICalImpl::SetServer( const char *str ) {
         return NS_OK;
     }
     
-    icalcomponent *comp;
-    for( comp = icalfileset_get_first_component( stream );
-        comp != 0;
-        comp = icalfileset_get_next_component( stream ) ) {
+    nsresult rv;
+    icalcomponent *vcalendar;
+    icalcomponent *vevent;
+    oeICalEventImpl *icalevent;
+    for( vcalendar = icalfileset_get_first_component( stream );
+        vcalendar != 0;
+        vcalendar = icalfileset_get_next_component( stream ) ) {
         
-        nsresult rv;
-        oeICalEventImpl *icalevent;
-        if( NS_FAILED( rv = NS_NewICalEvent((oeIICalEvent**) &icalevent ))) {
-            return rv;
-        }
-        
-        icalevent->ParseIcalComponent( comp );
+        for( vevent = icalcomponent_get_first_component( vcalendar, ICAL_VEVENT_COMPONENT );
+            vevent != 0;
+            vevent = icalcomponent_get_next_component( vcalendar, ICAL_VEVENT_COMPONENT ) ) {
 
-        m_eventlist.Add( icalevent );
+            if( NS_FAILED( rv = NS_NewICalEvent((oeIICalEvent**) &icalevent ))) {
+                return rv;
+            }
+            icalevent->ParseIcalComponent( vevent );
+            m_eventlist.Add( icalevent );
+        }
     }
     
     icalfileset_free(stream);