aboutsummaryrefslogtreecommitdiffstats
path: root/composer/e-msg-composer.c
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2002-10-02 05:30:15 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2002-10-02 05:30:15 +0800
commitebbafa91b45e61e932f92c592558a052a0048f6d (patch)
treedbc3fff1d7304781faa46577698c28c3d3cc93a1 /composer/e-msg-composer.c
parent8427b2c852ed5200e28aaee5f8a74c678d931b25 (diff)
downloadgsoc2013-evolution-ebbafa91b45e61e932f92c592558a052a0048f6d.tar.gz
gsoc2013-evolution-ebbafa91b45e61e932f92c592558a052a0048f6d.tar.zst
gsoc2013-evolution-ebbafa91b45e61e932f92c592558a052a0048f6d.zip
If the user hits cancel when signing/encrypting, don't continue
2002-10-01 Jeffrey Stedfast <fejj@ximian.com> * e-msg-composer.c (build_message): If the user hits cancel when signing/encrypting, don't continue constructing the message, instead abort (and just don't pop up a dialog). svn path=/trunk/; revision=18291
Diffstat (limited to 'composer/e-msg-composer.c')
-rw-r--r--composer/e-msg-composer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 383f8e5475..4ed027b41b 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -534,8 +534,8 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
if (camel_exception_is_set (&ex)) {
if (camel_exception_get_id (&ex) == CAMEL_EXCEPTION_USER_CANCEL) {
camel_exception_clear (&ex);
+ goto exception;
} else {
- camel_object_unref (part);
camel_object_unref (mps);
goto exception;
}
@@ -615,9 +615,9 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
if (camel_exception_is_set (&ex)) {
if (camel_exception_get_id (&ex) == CAMEL_EXCEPTION_USER_CANCEL) {
camel_exception_clear (&ex);
+ goto exception;
} else {
camel_object_unref (mpe);
- camel_object_unref (part);
goto exception;
}
} else {