diff -u evolution-2.28.1/debian/changelog evolution-2.28.1/debian/changelog --- evolution-2.28.1/debian/changelog +++ evolution-2.28.1/debian/changelog @@ -1,3 +1,11 @@ +evolution (2.28.1-0ubuntu2) karmic-proposed; urgency=low + + * debian/patches/81_crash_when_adding_new_task.patch: cherry-pick from GIT, + fix a double-free when creating a new task/memo. Already in 2.28.2 GIT + (LP: 460050) + + -- C de-Avillez Tue, 03 Nov 2009 09:02:14 -0600 + evolution (2.28.1-0ubuntu1) karmic; urgency=low * New upstream version: only in patch2: unchanged: --- evolution-2.28.1.orig/debian/patches/81_crash_when_adding_new_task.patch +++ evolution-2.28.1/debian/patches/81_crash_when_adding_new_task.patch @@ -0,0 +1,28 @@ +commit fbbb865ed40f4342d62225543f25ffe23b3f35e4 +Author: C de-Avillez +Date: Tue Nov 3 15:03:39 2009 +0100 + + Bug #599627 - Crash when adding a new task in a table + +diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c +index 33c209e..b04e7b7 100644 +--- a/calendar/gui/e-cal-model.c ++++ b/calendar/gui/e-cal-model.c +@@ -1106,15 +1106,11 @@ ecm_append_row (ETableModel *etm, ETableModel *source, gint row) + g_warning (G_STRLOC ": Could not create the object!"); + + /* FIXME: show error dialog */ +- icalcomponent_free (comp_data->icalcomp); +- g_object_unref (comp_data); +- return; ++ } else { ++ g_signal_emit (G_OBJECT (model), signals[ROW_APPENDED], 0); + } + +- icalcomponent_free (comp_data->icalcomp); + g_object_unref (comp_data); +- +- g_signal_emit (G_OBJECT (model), signals[ROW_APPENDED], 0); + } + + static gpointer