diff options
| author | Not Zed <NotZed@Ximian.com> | 2004-03-29 13:56:39 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2004-03-29 13:56:39 +0800 |
| commit | d4b41af00d2cee605499381395af3c19ba2a3081 (patch) | |
| tree | 898f1f9bd730687dc56f715975015e231a43207e | |
| parent | c2e50c15bb32ecfee61040609745aff4415bbc1e (diff) | |
| download | gsoc2013-evolution-d4b41af00d2cee605499381395af3c19ba2a3081.tar.gz gsoc2013-evolution-d4b41af00d2cee605499381395af3c19ba2a3081.tar.zst gsoc2013-evolution-d4b41af00d2cee605499381395af3c19ba2a3081.zip | |
get the content-type off of the multipart-signed, not its container. This
2004-03-29 Not Zed <NotZed@Ximian.com>
* camel-gpg-context.c (gpg_verify): get the content-type off of
the multipart-signed, not its container. This seems wrong
... but might fix #56084.
svn path=/trunk/; revision=25218
| -rw-r--r-- | camel/ChangeLog | 4 | ||||
| -rw-r--r-- | camel/camel-gpg-context.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index f6738c99ea..9f7ea67b15 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,5 +1,9 @@ 2004-03-29 Not Zed <NotZed@Ximian.com> + * camel-gpg-context.c (gpg_verify): get the content-type off of + the multipart-signed, not its container. This seems wrong + ... but might fix #56084. + * providers/imap/camel-imap-store.c (get_folder_counts): remove locking here, we're locked whne we enter. (fill_fi): call refresh_info unlocked. More for #56045. diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c index 9f55fc4b65..130610f642 100644 --- a/camel/camel-gpg-context.c +++ b/camel/camel-gpg-context.c @@ -1370,9 +1370,9 @@ gpg_verify (CamelCipherContext *context, CamelMimePart *ipart, CamelException *e CamelStream *istream = NULL; CamelMultipart *mps; - ct = camel_mime_part_get_content_type(ipart); - tmp = camel_content_type_param(ct, "protocol"); mps = (CamelMultipart *)camel_medium_get_content_object((CamelMedium *)ipart); + ct = ((CamelDataWrapper *)mps)->mime_type; + tmp = camel_content_type_param(ct, "protocol"); if (!camel_content_type_is(ct, "multipart", "signed") || !CAMEL_IS_MULTIPART_SIGNED(mps) || tmp == NULL |