summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJP Rosevear <jpr@ximian.com>2003-12-21 16:49:21 +0000
committerJP Rosevear <jpr@src.gnome.org>2003-12-21 16:49:21 +0000
commitf165aca04fdc814a2ce8617f7a997a3f85841f8d (patch)
treea8971b41757be9c19133db0ec6936cad85bc9d16
parent185ab78161cb8efb88da87d4ebfde52a4e7bc943 (diff)
downloadevolution-data-server-f165aca04fdc814a2ce8617f7a997a3f85841f8d.tar.gz
set the uri before scanning the vcalendar because we may have to fix
2003-12-21 JP Rosevear <jpr@ximian.com> * backends/file/e-cal-backend-file.c (open_cal): set the uri before scanning the vcalendar because we may have to fix duplicate UIDs (and hence save the calendar)
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/backends/file/e-cal-backend-file.c3
2 files changed, 7 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index c48629967..122a90ae9 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-21 JP Rosevear <jpr@ximian.com>
+
+ * backends/file/e-cal-backend-file.c (open_cal): set the uri
+ before scanning the vcalendar because we may have to fix duplicate
+ UIDs (and hence save the calendar)
+
2003-12-19 JP Rosevear <jpr@ximian.com>
* libecal/e-cal.c (e_cal_get_alarms_in_range): create a valid sexp
diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c
index 433f0fd84..3bba1296f 100644
--- a/calendar/backends/file/e-cal-backend-file.c
+++ b/calendar/backends/file/e-cal-backend-file.c
@@ -644,12 +644,11 @@ open_cal (ECalBackendFile *cbfile, const char *uristr)
}
priv->icalcomp = icalcomp;
+ priv->uri = get_uri_string_for_gnome_vfs (E_CAL_BACKEND (cbfile));
priv->comp_uid_hash = g_hash_table_new (g_str_hash, g_str_equal);
scan_vcalendar (cbfile);
- priv->uri = get_uri_string_for_gnome_vfs (E_CAL_BACKEND (cbfile));
-
return GNOME_Evolution_Calendar_Success;
}