aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@src.gnome.org>2001-05-15 06:27:29 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2001-05-15 06:27:29 +0800
commitaa61c3f98bafdc2742bd5ac1006401405c909307 (patch)
treebe3164168e25f4d1cad6b3e1dc67c76af5da1f45 /camel
parent2798919c3c8031d9bff195b83feeb61a4583d8ee (diff)
downloadgsoc2013-evolution-aa61c3f98bafdc2742bd5ac1006401405c909307.tar
gsoc2013-evolution-aa61c3f98bafdc2742bd5ac1006401405c909307.tar.gz
gsoc2013-evolution-aa61c3f98bafdc2742bd5ac1006401405c909307.tar.bz2
gsoc2013-evolution-aa61c3f98bafdc2742bd5ac1006401405c909307.tar.lz
gsoc2013-evolution-aa61c3f98bafdc2742bd5ac1006401405c909307.tar.xz
gsoc2013-evolution-aa61c3f98bafdc2742bd5ac1006401405c909307.tar.zst
gsoc2013-evolution-aa61c3f98bafdc2742bd5ac1006401405c909307.zip
bah, just mod the pgp-context macro for camel_pgp_verify so that we don't have to pass in a useless value.
svn path=/trunk/; revision=9805
Diffstat (limited to 'camel')
-rw-r--r--camel/camel-pgp-context.h2
-rw-r--r--camel/camel-pgp-mime.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/camel/camel-pgp-context.h b/camel/camel-pgp-context.h
index ce234db5b6..77a825737f 100644
--- a/camel/camel-pgp-context.h
+++ b/camel/camel-pgp-context.h
@@ -67,7 +67,7 @@ CamelPgpContext *camel_pgp_context_new (CamelSession *session, CamelPgpType typ
#define camel_pgp_clearsign(c, u, h, i, o, e) camel_cipher_clearsign (CAMEL_CIPHER_CONTEXT (c), u, h, i, o, e)
-#define camel_pgp_verify(c, h, i, s, e) camel_cipher_verify (CAMEL_CIPHER_CONTEXT (c), h, i, s, e)
+#define camel_pgp_verify(c, i, s, e) camel_cipher_verify (CAMEL_CIPHER_CONTEXT (c), CAMEL_CIPHER_HASH_DEFAULT, i, s, e)
#define camel_pgp_encrypt(c, s, u, r, i, o, e) camel_cipher_encrypt (CAMEL_CIPHER_CONTEXT (c), s, u, r, i, o, e)
diff --git a/camel/camel-pgp-mime.c b/camel/camel-pgp-mime.c
index adbbb08d39..ba91804579 100644
--- a/camel/camel-pgp-mime.c
+++ b/camel/camel-pgp-mime.c
@@ -358,7 +358,7 @@ camel_pgp_mime_part_verify (CamelPgpContext *context, CamelMimePart *mime_part,
camel_stream_reset (sigstream);
/* verify */
- valid = camel_pgp_verify (context, CAMEL_CIPHER_HASH_DEFAULT, stream, sigstream, ex);
+ valid = camel_pgp_verify (context, stream, sigstream, ex);
camel_object_unref (CAMEL_OBJECT (sigstream));
camel_object_unref (CAMEL_OBJECT (stream));