evolution-data-server r8456 - in trunk/calendar: . backends/groupwise

[mcrha svn gnome org]

Author: mcrha
Date: Tue Feb  5 10:39:59 2008
New Revision: 8456
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8456&view=rev

Log:
2008-02-05  Hein-Pieter van Braam  <hp syntomax com>

	** Fix for bug #514407

	* backends/groupwise/e-cal-backend-groupwise.c:
	(e_cal_backend_groupwise_compute_changes):
	Fix a NULL string being passed to strcmp.



Modified:
   trunk/calendar/ChangeLog
   trunk/calendar/backends/groupwise/e-cal-backend-groupwise.c

Modified: trunk/calendar/backends/groupwise/e-cal-backend-groupwise.c
==============================================================================
--- trunk/calendar/backends/groupwise/e-cal-backend-groupwise.c	(original)
+++ trunk/calendar/backends/groupwise/e-cal-backend-groupwise.c	Tue Feb  5 10:39:59 2008
@@ -1781,7 +1781,7 @@
 	g_free (filename);
 	g_free (unescaped_uri);
 
-        status = e_cal_backend_groupwise_get_object_list (E_CAL_BACKEND_SYNC (cbgw), NULL, NULL, &list);
+        status = e_cal_backend_groupwise_get_object_list (E_CAL_BACKEND_SYNC (cbgw), NULL, "#t", &list);
         if (status != GNOME_Evolution_Calendar_Success)
                 return status;
 
@@ -1789,9 +1789,11 @@
 	for (i = list; i != NULL; i = g_list_next (i)) {
 		const char *uid;
 		char *calobj;
+		ECalComponent *comp;
 
-		e_cal_component_get_uid (i->data, &uid);
-		calobj = e_cal_component_get_as_string (i->data);
+		comp = e_cal_component_new_from_string (i->data);
+		e_cal_component_get_uid (comp, &uid);
+		calobj = i->data;
 
 		g_assert (calobj != NULL);
 
@@ -1810,7 +1812,9 @@
 		}
 
 		g_free (calobj);
+		g_object_unref (comp);
 	}
+	g_list_free (list);
 
 	/* Calculate deletions */
 	be_data.backend = cbgw;