[evolution/webkit] Bug #642954 - Doesn't commit/abort sequence on modification error

[Dan VrÃtil <dvratil src gnome org>]

commit 8c932eb4d26942ca2fd5d6177c80c3081a4665a6
Author: Milan Crha <mcrha redhat com>
Date:   Thu Feb 24 09:23:03 2011 +0100

    Bug #642954 - Doesn't commit/abort sequence on modification error

 calendar/gui/dialogs/comp-editor.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 769263e..2bb258b 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);