aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2011-02-24 16:23:03 +0800
committerMilan Crha <mcrha@redhat.com>2011-02-24 16:23:03 +0800
commit3d3717365d022bc9a7b2d50b0aa33927416cd165 (patch)
tree7637901a1936dc592ccfd5eea627091df50c0509
parent7a7d6cd2f114e93fe321865abffd297d8743651b (diff)
downloadgsoc2013-evolution-3d3717365d022bc9a7b2d50b0aa33927416cd165.tar
gsoc2013-evolution-3d3717365d022bc9a7b2d50b0aa33927416cd165.tar.gz
gsoc2013-evolution-3d3717365d022bc9a7b2d50b0aa33927416cd165.tar.bz2
gsoc2013-evolution-3d3717365d022bc9a7b2d50b0aa33927416cd165.tar.lz
gsoc2013-evolution-3d3717365d022bc9a7b2d50b0aa33927416cd165.tar.xz
gsoc2013-evolution-3d3717365d022bc9a7b2d50b0aa33927416cd165.tar.zst
gsoc2013-evolution-3d3717365d022bc9a7b2d50b0aa33927416cd165.zip
Bug #642954 - Doesn't commit/abort sequence on modification error
-rw-r--r--calendar/gui/dialogs/comp-editor.c7
1 files 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);