evolution-data-server r9351 - in trunk: calendar calendar/backends/groupwise calendar/libecal servers/groupwise

[mcrha svn gnome org]

Author: mcrha
Date: Thu Aug 14 14:48:12 2008
New Revision: 9351
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9351&view=rev

Log:
2008-08-14  Milan Crha  <mcrha redhat com>

	** Partial fix for bug #510949

	* servers/groupwise/e-gw-item.c: (e_gw_item_dispose), (e_gw_item_set_organizer):
	Memory leak fix.

	* calendar/backends/groupwise/e-cal-backend-groupwise.c: (get_deltas),
	(e_cal_backend_groupwise_refresh_calendar):
	Memory leak fix and compiler warnings fix.
	* calendar/libecal/e-cal-component.c: (e_cal_component_get_recurid_as_string):
	Possible memory leak fix.



Modified:
   trunk/calendar/ChangeLog
   trunk/calendar/backends/groupwise/e-cal-backend-groupwise.c
   trunk/calendar/libecal/e-cal-component.c
   trunk/servers/groupwise/ChangeLog
   trunk/servers/groupwise/e-gw-item.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	Thu Aug 14 14:48:12 2008
@@ -537,7 +537,7 @@
 		const char *recur_key;
 
 		if (calid->recur_key && calid->ical_id) {
-			const char *rid = NULL;
+			char *rid = NULL;
 			char *temp = NULL;
 			icaltimetype tt = icaltime_from_string (calid->ical_id);
 			if (!tt.is_date) {
@@ -628,6 +628,7 @@
 
 	e_file_cache_thaw_changes (E_FILE_CACHE (cache));
 
+	g_ptr_array_foreach (uid_array, (GFunc) g_free, NULL);
 	g_ptr_array_free (uid_array, TRUE);
 
 	if (item_list) {
@@ -747,7 +748,7 @@
 	return FALSE;
 }
 
-
+#if 0
 /* TODO call it when a user presses SEND/RECEIVE or refresh*/
 static void
 e_cal_backend_groupwise_refresh_calendar (ECalBackendGroupwise *cbgw)
@@ -766,6 +767,7 @@
 	if (!delta_started)
 		g_cond_signal (priv->dlock->cond);
 }
+#endif
 
 static char*
 form_uri (ESource *source)

Modified: trunk/calendar/libecal/e-cal-component.c
==============================================================================
--- trunk/calendar/libecal/e-cal-component.c	(original)
+++ trunk/calendar/libecal/e-cal-component.c	Thu Aug 14 14:48:12 2008
@@ -3579,8 +3579,11 @@
 		return NULL;
 
         e_cal_component_get_recurid (comp, &range);
-        if (!range.datetime.value)
+        if (!range.datetime.value) {
+		e_cal_component_free_range (&range);
                 return g_strdup ("0");
+	}
+
         tt = *range.datetime.value;
         e_cal_component_free_range (&range);
 

Modified: trunk/servers/groupwise/e-gw-item.c
==============================================================================
--- trunk/servers/groupwise/e-gw-item.c	(original)
+++ trunk/servers/groupwise/e-gw-item.c	Thu Aug 14 14:48:12 2008
@@ -375,6 +375,7 @@
 		if (priv->organizer) {
 			g_free (priv->organizer->display_name);
 			g_free (priv->organizer->email);
+			g_free (priv->organizer);
 			priv->organizer = NULL;
 		}
 
@@ -2492,7 +2493,11 @@
 e_gw_item_set_organizer (EGwItem  *item, EGwItemOrganizer *organizer)
 {
 	/* free organizer */
-	g_free (item->priv->organizer);
+	if (item->priv->organizer) {
+		g_free (item->priv->organizer->display_name);
+		g_free (item->priv->organizer->email);
+		g_free (item->priv->organizer);
+	}
 	item->priv->organizer = organizer;
 }