aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--camel/ChangeLog5
-rw-r--r--camel/camel-pgp-context.c32
-rw-r--r--camel/camel-pgp-mime.c3
3 files changed, 23 insertions, 17 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index ffcb2bd8e4..4b2de388aa 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,10 @@
2001-09-19 Jeffrey Stedfast <fejj@ximian.com>
+ * camel-pgp-context.c: Updated exception strings to be more clear.
+
+ * camel-pgp-mime.c (pgp_mime_part_sign_restore_part): Stupid
+ mistake, fixes bug #9975.
+
* camel-tcp-stream-ssl.c (ssl_bad_cert): Oops, don't fail if
`data' isn't a CamelService...cuz it's not supposed to be! It's a
CamelTcpStreamSSL object...doh!
diff --git a/camel/camel-pgp-context.c b/camel/camel-pgp-context.c
index 13a94b449f..95fafdc652 100644
--- a/camel/camel-pgp-context.c
+++ b/camel/camel-pgp-context.c
@@ -515,20 +515,20 @@ pgp_sign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash,
if (!plaintext->len) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("No plaintext to sign."));
+ _("Cannot sign this message: no plaintext to sign"));
goto exception;
}
passphrase = pgp_get_passphrase (ctx->session, context->priv->type, (char *) userid);
if (!passphrase) {
camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
- _("No password provided."));
+ _("Cannot sign this message: no password provided"));
goto exception;
}
if (pipe (passwd_fds) < 0) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Couldn't create pipe to GPG/PGP: %s"),
+ _("Cannot sign this message: couldn't create pipe to GPG/PGP: %s"),
g_strerror (errno));
goto exception;
}
@@ -690,20 +690,20 @@ pgp_clearsign (CamelCipherContext *ctx, const char *userid, CamelCipherHash hash
if (!plaintext->len) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("No plaintext to clearsign."));
+ _("Cannot sign this message: no plaintext to clearsign"));
goto exception;
}
passphrase = pgp_get_passphrase (ctx->session, context->priv->type, (char *) userid);
if (!passphrase) {
camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
- _("No password provided."));
+ _("Cannot sign this message: no password provided"));
goto exception;
}
if (pipe (passwd_fds) < 0) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Couldn't create pipe to GPG/PGP: %s"),
+ _("Cannot sign this message: couldn't create pipe to GPG/PGP: %s"),
g_strerror (errno));
goto exception;
}
@@ -883,13 +883,13 @@ pgp_verify (CamelCipherContext *ctx, CamelCipherHash hash, CamelStream *istream,
if (!plaintext->len) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("No plaintext to verify."));
+ _("Cannot verify this message: no plaintext to verify"));
goto exception;
}
if (pipe (passwd_fds) < 0) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Couldn't create pipe to GPG/PGP: %s"),
+ _("Cannot verify this message: couldn't create pipe to GPG/PGP: %s"),
g_strerror (errno));
goto exception;
}
@@ -900,7 +900,7 @@ pgp_verify (CamelCipherContext *ctx, CamelCipherHash hash, CamelStream *istream,
sigfile = swrite (sigstream);
if (!sigfile) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Couldn't create temp file: %s"),
+ _("Cannot verify this message: couldn't create temp file: %s"),
g_strerror (errno));
goto exception;
}
@@ -1066,7 +1066,7 @@ pgp_encrypt (CamelCipherContext *ctx, gboolean sign, const char *userid, GPtrArr
if (!plaintext->len) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("No plaintext to encrypt."));
+ _("Cannot encrypt this message: no plaintext to encrypt"));
goto exception;
}
@@ -1076,14 +1076,14 @@ pgp_encrypt (CamelCipherContext *ctx, gboolean sign, const char *userid, GPtrArr
(char *) userid);
if (!passphrase) {
camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
- _("No password provided."));
+ _("Cannot encrypt this message: no password provided"));
goto exception;
}
}
if (pipe (passwd_fds) < 0) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Couldn't create pipe to GPG/PGP: %s"),
+ _("Cannot encrypt this message: couldn't create pipe to GPG/PGP: %s"),
g_strerror (errno));
goto exception;
@@ -1092,7 +1092,7 @@ pgp_encrypt (CamelCipherContext *ctx, gboolean sign, const char *userid, GPtrArr
/* check to make sure we have recipients */
if (recipients->len == 0) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("No recipients specified"));
+ _("Cannot encrypt this message: no recipients specified"));
goto exception;
}
@@ -1255,7 +1255,7 @@ pgp_decrypt (CamelCipherContext *ctx, CamelStream *istream,
if (!ciphertext->len) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("No ciphertext to decrypt."));
+ _("Cannot decrypt this message: no ciphertext to decrypt"));
goto exception;
}
@@ -1263,14 +1263,14 @@ pgp_decrypt (CamelCipherContext *ctx, CamelStream *istream,
passphrase = pgp_get_passphrase (ctx->session, context->priv->type, NULL);
if (!passphrase) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("No password provided."));
+ _("Cannot decrypt this message: no password provided"));
goto exception;
}
if (pipe (passwd_fds) < 0) {
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Couldn't create pipe to GPG/PGP: %s"),
+ _("Cannot decrypt this message: couldn't create pipe to GPG/PGP: %s"),
g_strerror (errno));
goto exception;
diff --git a/camel/camel-pgp-mime.c b/camel/camel-pgp-mime.c
index 0a852fe244..4b38b829da 100644
--- a/camel/camel-pgp-mime.c
+++ b/camel/camel-pgp-mime.c
@@ -149,7 +149,6 @@ pgp_mime_part_sign_restore_part (CamelMimePart *mime_part, GSList **encodings)
CamelMimePart *part = camel_multipart_get_part (CAMEL_MULTIPART (wrapper), i);
pgp_mime_part_sign_restore_part (part, encodings);
- *encodings = (*encodings)->next;
}
} else {
CamelMimePartEncodingType encoding;
@@ -161,6 +160,8 @@ pgp_mime_part_sign_restore_part (CamelMimePart *mime_part, GSList **encodings)
encoding = GPOINTER_TO_INT ((*encodings)->data);
camel_mime_part_set_encoding (mime_part, encoding);
+
+ *encodings = (*encodings)->next;
}
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 15:58:43 +0800