diff options
| -rw-r--r-- | composer/ChangeLog | 6 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 3aebb93f91..1c3a45c988 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,5 +1,11 @@ 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). + +2002-10-01 Jeffrey Stedfast <fejj@ximian.com> + * e-msg-composer.c (build_message): When signing/encrypting a part, if a USER_CANCEL occurs, re-use the part otherwise unref it and replace it with the new part. 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 { |