From ebbafa91b45e61e932f92c592558a052a0048f6d Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Tue, 1 Oct 2002 21:30:15 +0000 Subject: If the user hits cancel when signing/encrypting, don't continue 2002-10-01 Jeffrey Stedfast * 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 --- composer/e-msg-composer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'composer/e-msg-composer.c') 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 { -- cgit v1.2.3