conduit r1819 - in trunk: . conduit/modules/EvolutionModule

[jstowers svn gnome org]

Author: jstowers
Date: Tue Jan 20 01:54:27 2009
New Revision: 1819
URL: http://svn.gnome.org/viewvc/conduit?rev=1819&view=rev

Log:
2009-01-20  John Stowers  <john stowers gmail com>

	* conduit/modules/EvolutionModule/EvolutionModule.py: 
	Modify EvoCalendar's _get_object to return a VEVENT instead of a VCALENDAR. 
	Fixes #564141 (Brian Teague)



Modified:
   trunk/ChangeLog
   trunk/conduit/modules/EvolutionModule/EvolutionModule.py

Modified: trunk/conduit/modules/EvolutionModule/EvolutionModule.py
==============================================================================
--- trunk/conduit/modules/EvolutionModule/EvolutionModule.py	(original)
+++ trunk/conduit/modules/EvolutionModule/EvolutionModule.py	Tue Jan 20 01:54:27 2009
@@ -213,7 +213,11 @@
         """
         raw = self.calendar.get_object(LUID, "")
         event = Event.Event()
-        event.set_from_ical_string(self.calendar.get_object_as_string(raw))
+        #http://bugzilla.gnome.org/show_bug.cgi?id=564141
+        #EvoCalendar's _get_object returns an iCal VCALENDAR containing a single VEVENT
+        #for each event on the calendar.  However, EvoCalendar's _create_object expects
+        #an iCal VEVENT.  The evolution-data-server can't parse the VCALENDAR and fails.
+        event.set_from_ical_string(raw.get_as_string())
         event.set_UID(raw.get_uid())
         event.set_mtime(datetime.datetime.fromtimestamp(raw.get_modified()))
         return event