diff options
| -rw-r--r-- | calendar/ChangeLog | 5 | ||||
| -rw-r--r-- | calendar/gui/migration.c | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 76636bb79f..3fbd851847 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,8 @@ +2004-01-26 JP Rosevear <jpr@ximian.com> + + * gui/migration.c (migrate_ical_folder): add the source to the + group so it actually shows up + 2004-01-27 JP Rosevear <jpr@ximian.com> * gui/migration.c (migrate_calendars): get the source name with diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c index 9cb04167b2..fdc73eca7f 100644 --- a/calendar/gui/migration.c +++ b/calendar/gui/migration.c @@ -305,19 +305,21 @@ migrate_ical_folder (char *old_path, ESourceGroup *dest_group, char *source_name new_source = e_source_new (source_name, source_name); e_source_set_relative_uri (new_source, e_source_peek_uid (new_source)); - e_source_set_group (new_source, dest_group); + e_source_group_add_source (dest_group, new_source, -1); dialog_set_folder_name (source_name); old_ecal = e_cal_new (old_source, type); if (!e_cal_open (old_ecal, TRUE, &error)) { - g_warning ("failed to load source ecal for migration: `%s'", error->message); + g_warning ("failed to load source ecal for migration: '%s' (%s)", error->message, + e_source_get_uri (old_source)); goto finish; } new_ecal = e_cal_new (new_source, type); if (!e_cal_open (new_ecal, FALSE, &error)) { - g_warning ("failed to load destination ecal for migration: `%s'", error->message); + g_warning ("failed to load destination ecal for migration: '%s' (%s)", error->message, + e_source_get_uri (new_source)); goto finish; } @@ -326,7 +328,8 @@ migrate_ical_folder (char *old_path, ESourceGroup *dest_group, char *source_name finish: g_clear_error (&error); g_object_unref (old_ecal); - g_object_unref (new_ecal); + if (new_ecal) + g_object_unref (new_ecal); g_free (old_uri); return retval; |