diff options
| author | Rodrigo Moya <rodrigo@ximian.com> | 2001-10-30 04:08:39 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@src.gnome.org> | 2001-10-30 04:08:39 +0800 |
| commit | f828accd314674f31de652bf4cd5d0b5e136f9ab (patch) | |
| tree | d5059283e0b166bf916a35b549657d3fd485640d | |
| parent | df5427ac094df5011fe6decec383c3e71a8c68a3 (diff) | |
| download | gsoc2013-evolution-f828accd314674f31de652bf4cd5d0b5e136f9ab.tar gsoc2013-evolution-f828accd314674f31de652bf4cd5d0b5e136f9ab.tar.gz gsoc2013-evolution-f828accd314674f31de652bf4cd5d0b5e136f9ab.tar.bz2 gsoc2013-evolution-f828accd314674f31de652bf4cd5d0b5e136f9ab.tar.lz gsoc2013-evolution-f828accd314674f31de652bf4cd5d0b5e136f9ab.tar.xz gsoc2013-evolution-f828accd314674f31de652bf4cd5d0b5e136f9ab.tar.zst gsoc2013-evolution-f828accd314674f31de652bf4cd5d0b5e136f9ab.zip | |
fixed URI construction, which was preventing importing into the root
2001-10-29 Rodrigo Moya <rodrigo@ximian.com>
* importers/icalendar-importer.c (load_file_fn): fixed URI
construction, which was preventing importing into the root
calendar (~/evo/local/Calendar/)
svn path=/trunk/; revision=14358
| -rw-r--r-- | calendar/ChangeLog | 6 | ||||
| -rw-r--r-- | calendar/importers/icalendar-importer.c | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 53b6c7e950..548b4c0e2c 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2001-10-29 Rodrigo Moya <rodrigo@ximian.com> + + * importers/icalendar-importer.c (load_file_fn): fixed URI + construction, which was preventing importing into the root + calendar (~/evo/local/Calendar/) + 2001-10-29 JP Rosevear <jpr@ximian.com> * conduits/calendar/calendar-conduit.c (is_all_day): handle date diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index ab3cffcfa2..262c925b74 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -120,9 +120,12 @@ load_file_fn (EvolutionImporter *importer, char *parent; name = strrchr (folderpath, '/'); - if (!name) { + if (name == NULL || name == folderpath) { parent = g_strdup ("evolution/local/"); - name = folderpath; + if (folderpath[0] == '/') + name = folderpath + 1; + else + name = folderpath; } else { name += 1; |