aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog8
-rw-r--r--composer/e-msg-composer.c8
2 files changed, 13 insertions, 3 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 50e9af6afb..5cb0cd874d 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,11 @@
+2004-05-11 Jeffrey Stedfast <fejj@novell.com>
+
+ * e-msg-composer.c (build_message): Use CAMEL_EXCEPTION_SYSTEM
+ instead of '1', also don't use camel_exception_setv() if we aren't
+ using the printf-style arguments. Just use camel_exception_set() -
+ safer anyway, since then we don't have to worry about translated
+ strings containing printf-style formatters that could break stuff.
+
2004-05-08 Enver ALTIN <enver.altin@frontsite.com.tr>
* e-msg-composer.c: Fixing parts of #53466.
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index ef30c38ec4..6f4348bd0f 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -700,13 +700,15 @@ build_message (EMsgComposer *composer, gboolean save_html_object_data)
if (composer->smime_sign
&& (hdrs->account == NULL || hdrs->account->smime_sign_key == NULL || hdrs->account->smime_sign_key[0] == 0)) {
- camel_exception_setv(&ex, 1, _("Cannot sign outgoing message: No signing certificate set for this account"));
+ camel_exception_set (&ex, CAMEL_EXCEPTION_SYSTEM,
+ _("Cannot sign outgoing message: No signing certificate set for this account"));
goto exception;
}
-
+
if (composer->smime_encrypt
&& (hdrs->account == NULL || hdrs->account->smime_sign_key == NULL || hdrs->account->smime_sign_key[0] == 0)) {
- camel_exception_setv(&ex, 1, _("Cannot encrypt outgoing message: No encryption certificate set for this account"));
+ camel_exception_set (&ex, CAMEL_EXCEPTION_SYSTEM,
+ _("Cannot encrypt outgoing message: No encryption certificate set for this account"));
goto exception;
}