evolution r35533 - in trunk/calendar: . conduits/calendar gui

[msuman svn gnome org]

Author: msuman
Date: Fri May 23 11:17:20 2008
New Revision: 35533
URL: http://svn.gnome.org/viewvc/evolution?rev=35533&view=rev

Log:
Patch from Milan Crha  <mcrha redhat com> ** Part of fix for bug #523402 (leak fix, reassign back the old values before freeing)

Modified:
   trunk/calendar/ChangeLog
   trunk/calendar/conduits/calendar/calendar-conduit.c
   trunk/calendar/gui/e-calendar-view.c

Modified: trunk/calendar/conduits/calendar/calendar-conduit.c
==============================================================================
--- trunk/calendar/conduits/calendar/calendar-conduit.c	(original)
+++ trunk/calendar/conduits/calendar/calendar-conduit.c	Fri May 23 11:17:20 2008
@@ -709,6 +709,8 @@
 			ret = FALSE;
 			g_free (new_uid);
 			g_object_unref (clone);
+			dt_start.value = old_start_value;
+			dt_end.value = old_end_value;
 			goto cleanup;
 		}
 

Modified: trunk/calendar/gui/e-calendar-view.c
==============================================================================
--- trunk/calendar/gui/e-calendar-view.c	(original)
+++ trunk/calendar/gui/e-calendar-view.c	Fri May 23 11:17:20 2008
@@ -364,12 +364,14 @@
 
 	/* set the timezone properly */
 	e_cal_component_get_dtstart (comp, &dt);
+	g_free ((char *) dt.tzid);
 	dt.tzid = icaltimezone_get_tzid (default_zone);
 	e_cal_component_set_dtstart (comp, &dt);
 	dt.tzid = NULL;
 	e_cal_component_free_datetime (&dt);
 
 	e_cal_component_get_dtend (comp, &dt);
+	g_free ((char *) dt.tzid);
 	dt.tzid = icaltimezone_get_tzid (default_zone);
 	e_cal_component_set_dtend (comp, &dt);
 	dt.tzid = NULL;