diff options
| author | JP Rosevear <jpr@ximian.com> | 2004-04-19 06:23:48 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2004-04-19 06:23:48 +0800 |
| commit | 8e470eb614af61dd4aaf6fa91bc106588579e499 (patch) | |
| tree | a21a65622aaaa98d1a84136e750b0cfac4bc6f6a /calendar | |
| parent | 2b14db9d6023aff8b64abc4ed9b977596795b632 (diff) | |
| download | gsoc2013-evolution-8e470eb614af61dd4aaf6fa91bc106588579e499.tar.gz gsoc2013-evolution-8e470eb614af61dd4aaf6fa91bc106588579e499.tar.zst gsoc2013-evolution-8e470eb614af61dd4aaf6fa91bc106588579e499.zip | |
Fixes #54021
2004-04-18 JP Rosevear <jpr@ximian.com>
Fixes #54021
* importers/icalendar-importer.c (update_single_object): ensure
UID exists
svn path=/trunk/; revision=25506
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/importers/icalendar-importer.c | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 585a27cd01..ef3a556cc0 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,12 @@ 2004-04-18 JP Rosevear <jpr@ximian.com> + Fixes #54021 + + * importers/icalendar-importer.c (update_single_object): ensure + UID exists + +2004-04-18 JP Rosevear <jpr@ximian.com> + Fixes #53124 * gui/e-tasks.c: remove preview pieces, they are in their own diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c index 954253be53..d3ff28d645 100644 --- a/calendar/importers/icalendar-importer.c +++ b/calendar/importers/icalendar-importer.c @@ -169,8 +169,10 @@ update_single_object (ECal *client, icalcomponent *icalcomp) icalcomponent *tmp_icalcomp; uid = (char *) icalcomponent_get_uid (icalcomp); - - if (e_cal_get_object (client, uid, NULL, &tmp_icalcomp, NULL)) + + /* FIXME Shouldn't we check for RIDs here? */ + /* FIXME Should we always create a new UID? */ + if (uid && e_cal_get_object (client, uid, NULL, &tmp_icalcomp, NULL)) return e_cal_modify_object (client, icalcomp, CALOBJ_MOD_ALL, NULL); return e_cal_create_object (client, icalcomp, &uid, NULL); |