evolution-data-server r8697 - in branches/gnome-2-22/calendar: . backends/http

[abharath svn gnome org]

Author: abharath
Date: Tue Apr 29 08:03:18 2008
New Revision: 8697
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8697&view=rev

Log:
Committing on behalf of Chenthill Palanisamy  <pchenthill novell com>

2008-04-29  Chenthill Palanisamy  <pchenthill novell com>

        ** Fixes #358584 (bnc)
           Display of web calendars ignores timezones


Modified:
   branches/gnome-2-22/calendar/ChangeLog
   branches/gnome-2-22/calendar/backends/http/e-cal-backend-http.c

Modified: branches/gnome-2-22/calendar/backends/http/e-cal-backend-http.c
==============================================================================
--- branches/gnome-2-22/calendar/backends/http/e-cal-backend-http.c	(original)
+++ branches/gnome-2-22/calendar/backends/http/e-cal-backend-http.c	Tue Apr 29 08:03:18 2008
@@ -323,9 +323,9 @@
 
 		subcomp_kind = icalcomponent_isa (subcomp);
 		prop = icalcomponent_get_first_property (subcomp, ICAL_UID_PROPERTY);
-		if (!prop) {
+		if (!prop && subcomp_kind == kind) {
 			g_warning (" The component does not have the  mandatory property UID \n");
-			subcomp = icalcomponent_get_next_component (icalcomp, kind);
+			subcomp = icalcomponent_get_next_component (icalcomp, ICAL_ANY_COMPONENT);
 			continue;
 		}
 
@@ -365,7 +365,7 @@
 			icaltimezone_free (zone, 1);
 		}
 
-		subcomp = icalcomponent_get_next_component (icalcomp, kind);
+		subcomp = icalcomponent_get_next_component (icalcomp, ICAL_ANY_COMPONENT);
 	}
 
 	e_file_cache_thaw_changes (E_FILE_CACHE (priv->cache));