diff options
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/gui/migration.c | 19 |
2 files changed, 20 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 409bda9fc2..5111eedbe3 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,12 @@ 2004-03-26 JP Rosevear <jpr@ximian.com> + * gui/migration.c (migrate_calendars): make sure we always sync + the source list and just do it once; unref the sources we get + (migrate_tasks): make sure we always sync + the source list and just do it once + +2004-03-26 JP Rosevear <jpr@ximian.com> + Fixes #55648 * gui/print.c (print_todo_details): get the default from the model diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c index 979c4822af..731affe6d8 100644 --- a/calendar/gui/migration.c +++ b/calendar/gui/migration.c @@ -594,8 +594,6 @@ migrate_calendars (CalendarComponent *component, int major, int minor, int revis } g_free (local_cal_folder); - - e_source_list_sync (calendar_component_peek_source_list (component), NULL); dialog_close (); } @@ -605,8 +603,6 @@ migrate_calendars (CalendarComponent *component, int major, int minor, int revis group = create_calendar_contact_source (calendar_component_peek_source_list (component)); g_object_unref (group); - - e_source_list_sync (calendar_component_peek_source_list (component), NULL); } if (minor == 5 && revision < 5) { @@ -635,6 +631,17 @@ migrate_calendars (CalendarComponent *component, int major, int minor, int revis } + e_source_list_sync (calendar_component_peek_source_list (component), NULL); + + if (on_this_computer) + g_object_unref (on_this_computer); + if (on_the_web) + g_object_unref (on_the_web); + if (contacts) + g_object_unref (contacts); + if (personal_source) + g_object_unref (personal_source); + return retval; } @@ -708,13 +715,13 @@ migrate_tasks (TasksComponent *component, int major, int minor, int revision) } g_free (local_task_folder); - - e_source_list_sync (tasks_component_peek_source_list (component), NULL); dialog_close (); } } + e_source_list_sync (tasks_component_peek_source_list (component), NULL); + if (on_this_computer) g_object_unref (on_this_computer); if (personal_source) |