diff options
| -rw-r--r-- | calendar/ChangeLog | 6 | ||||
| -rw-r--r-- | calendar/gui/migration.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index d5d782b0b2..76636bb79f 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2004-01-27 JP Rosevear <jpr@ximian.com> + + * gui/migration.c (migrate_calendars): get the source name with + out using freed memory + (migrate_tasks): ditto + 2004-01-27 Rodrigo Moya <rodrigo@ximian.com> Fixes #53338 diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c index 6ce155f239..9cb04167b2 100644 --- a/calendar/gui/migration.c +++ b/calendar/gui/migration.c @@ -526,7 +526,7 @@ migrate_calendars (CalendarComponent *component, int major, int minor, int revis if (!strcmp (l->data, local_cal_folder)) source_name = g_strdup (_("Personal")); else - source_name = get_source_name (on_this_computer, (char*)l->data + strlen (path) + 1); + source_name = get_source_name (on_this_computer, (char*)l->data); if (!migrate_ical_folder (l->data, on_this_computer, source_name, E_CAL_SOURCE_TYPE_EVENT)) retval = FALSE; @@ -613,7 +613,7 @@ migrate_tasks (TasksComponent *component, int major, int minor, int revision) if (!strcmp (l->data, local_task_folder)) source_name = g_strdup (_("Personal")); else - source_name = get_source_name (on_this_computer, (char*)l->data + strlen (path) + 1); + source_name = get_source_name (on_this_computer, (char*)l->data); if (!migrate_ical_folder (l->data, on_this_computer, source_name, E_CAL_SOURCE_TYPE_TODO)) retval = FALSE; |