diff options
-rw-r--r-- | calendar/ChangeLog | 16 | ||||
-rw-r--r-- | calendar/gui/dialogs/calendar-setup.c | 3 | ||||
-rw-r--r-- | calendar/gui/migration.c | 3 |
3 files changed, 22 insertions, 0 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 0560b2facf..d5d782b0b2 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,19 @@ +2004-01-27 Rodrigo Moya <rodrigo@ximian.com> + + Fixes #53338 + + * gui/dialogs/calendar-setup.c (dialog_to_source): set the relative + URI on the source for remote sources. + +2004-01-27 Rodrigo Moya <rodrigo@ximian.com> + + Fixes #52312 + + * gui/dialogs/calendar-setup.c (create_new_source_with_group): + * gui/migration.c (migrate_ical_folder, create_calendar_sources, + create_task_sources): set the relative URI for local calendars and + task lists to be the source UID. + 2004-01-24 Rodrigo Moya <rodrigo@ximian.com> * gui/calendar-component.[ch] diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c index 149ff5c33f..fc82881b28 100644 --- a/calendar/gui/dialogs/calendar-setup.c +++ b/calendar/gui/dialogs/calendar-setup.c @@ -247,6 +247,7 @@ create_new_source_with_group (GtkWindow *parent, } else { /* Local source */ source = e_source_new (source_name, source_name); + e_source_set_relative_uri (source, e_source_peek_uid (source)); } e_source_group_add_source (group, source, -1); @@ -340,6 +341,8 @@ dialog_to_source (SourceDialog *source_dialog) } relative_uri = print_uri_noproto (uri); + e_source_set_relative_uri (source, relative_uri); + g_free (relative_uri); e_uri_free (uri); refresh_str = g_strdup_printf ("%d", diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c index 2ba2739ebd..6ce155f239 100644 --- a/calendar/gui/migration.c +++ b/calendar/gui/migration.c @@ -304,6 +304,7 @@ migrate_ical_folder (char *old_path, ESourceGroup *dest_group, char *source_name g_object_unref (group); 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); dialog_set_folder_name (source_name); @@ -389,6 +390,7 @@ create_calendar_sources (CalendarComponent *component, new_dir = g_build_filename (base_uri, "Personal/", NULL); if (!e_mkdir_hier (new_dir, 0700)) { source = e_source_new (_("Personal"), "Personal"); + e_source_set_relative_uri (source, e_source_peek_uid (source)); e_source_group_add_source (group, source, -1); g_object_unref (source); } @@ -454,6 +456,7 @@ create_task_sources (TasksComponent *component, new_dir = g_build_filename (base_uri, "Personal/", NULL); if (!e_mkdir_hier (new_dir, 0700)) { source = e_source_new (_("Personal"), "Personal"); + e_source_set_relative_uri (source, e_source_peek_uid (source)); e_source_group_add_source (group, source, -1); g_object_unref (source); } |