From 3d3717365d022bc9a7b2d50b0aa33927416cd165 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 24 Feb 2011 09:23:03 +0100 Subject: Bug #642954 - Doesn't commit/abort sequence on modification error --- calendar/gui/dialogs/comp-editor.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 769263e88a..2bb258b0e7 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -492,12 +492,11 @@ save_comp (CompEditor *editor) } result = e_cal_modify_object (priv->client, icalcomp, priv->mod, &error); - if (result && priv->mod == CALOBJ_MOD_THIS) { - /* FIXME do we really need to do this ? */ - if ((flags & COMP_EDITOR_DELEGATE) || + if (priv->mod == CALOBJ_MOD_THIS) { + if (result && ((flags & COMP_EDITOR_DELEGATE) || !e_cal_component_has_organizer (clone) || itip_organizer_is_user (clone, priv->client) || - itip_sentby_is_user (clone, priv->client)) + itip_sentby_is_user (clone, priv->client))) e_cal_component_commit_sequence (clone); else e_cal_component_abort_sequence (clone); -- cgit