diff options
| author | Suman Manjunath <msuman@src.gnome.org> | 2008-05-23 19:17:05 +0800 |
|---|---|---|
| committer | Suman Manjunath <msuman@src.gnome.org> | 2008-05-23 19:17:05 +0800 |
| commit | cc0db3c0467c8568eaba5f7e3386342af3941c09 (patch) | |
| tree | e3abe72f5c5cb919a332f0f4aa7f4912cf888eb5 | |
| parent | f56c123ee3655187e43f99bf0a3629af057226d6 (diff) | |
| download | gsoc2013-evolution-cc0db3c0467c8568eaba5f7e3386342af3941c09.tar gsoc2013-evolution-cc0db3c0467c8568eaba5f7e3386342af3941c09.tar.gz gsoc2013-evolution-cc0db3c0467c8568eaba5f7e3386342af3941c09.tar.bz2 gsoc2013-evolution-cc0db3c0467c8568eaba5f7e3386342af3941c09.tar.lz gsoc2013-evolution-cc0db3c0467c8568eaba5f7e3386342af3941c09.tar.xz gsoc2013-evolution-cc0db3c0467c8568eaba5f7e3386342af3941c09.tar.zst gsoc2013-evolution-cc0db3c0467c8568eaba5f7e3386342af3941c09.zip | |
Patch from Milan Crha <mcrha@redhat.com> ** Part of fix for bug #523402 (leak fix, reassign back the old values before freeing)
svn path=/branches/gnome-2-22/; revision=35532
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/conduits/calendar/calendar-conduit.c | 2 | ||||
| -rw-r--r-- | calendar/gui/e-calendar-view.c | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index f9d088f5a1..1d31f38ec6 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2008-05-23 Milan Crha <mcrha@redhat.com> + + ** Part of fix for bug #523402 + + * gui/e-calendar-view.c: (e_calendar_view_add_event): Do not leak. + * conduits/calendar/calendar-conduit.c: (process_multi_day): + Reassign back the old values before freeing. + 2008-05-22 Chenthill Palanisamy <pchenthill@novell.com> ** Fix for bug #533820 diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c index bdf6e4b01a..19f0dbd8ec 100644 --- a/calendar/conduits/calendar/calendar-conduit.c +++ b/calendar/conduits/calendar/calendar-conduit.c @@ -709,6 +709,8 @@ process_multi_day (ECalConduitContext *ctxt, ECalChange *ccc, GList **multi_comp ret = FALSE; g_free (new_uid); g_object_unref (clone); + dt_start.value = old_start_value; + dt_end.value = old_end_value; goto cleanup; } diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index c90d2c51d5..a9840690e6 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -364,12 +364,14 @@ e_calendar_view_add_event (ECalendarView *cal_view, ECal *client, time_t dtstart /* 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; |