X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=mime-node.c;h=4ca51fe93a34987a35d914714ee06724fc181c3b;hb=be8f0ba92a302798b21cf02ef73c4ad783b66cba;hp=3492bcd039463bca7f0c6421b32437210f7d5471;hpb=d187a6993e25b1e100790e918156f5d95d371899;p=notmuch diff --git a/mime-node.c b/mime-node.c index 3492bcd0..4ca51fe9 100644 --- a/mime-node.c +++ b/mime-node.c @@ -185,8 +185,8 @@ node_verify (mime_node_t *node, GMimeObject *part) notmuch_status_t status; node->verify_attempted = true; - node->sig_list = g_mime_multipart_signed_verify - (GMIME_MULTIPART_SIGNED (part), GMIME_ENCRYPT_NONE, &err); + node->sig_list = g_mime_multipart_signed_verify ( + GMIME_MULTIPART_SIGNED (part), GMIME_ENCRYPT_NONE, &err); if (node->sig_list) set_signature_list_destructor (node); @@ -339,11 +339,11 @@ mime_node_child (mime_node_t *parent, int child) return NULL; if (GMIME_IS_MULTIPART (parent->part)) { - if (child == 1 && parent->decrypted_child) + if (child == GMIME_MULTIPART_ENCRYPTED_CONTENT && parent->decrypted_child) sub = parent->decrypted_child; else - sub = g_mime_multipart_get_part - (GMIME_MULTIPART (parent->part), child); + sub = g_mime_multipart_get_part ( + GMIME_MULTIPART (parent->part), child); } else if (GMIME_IS_MESSAGE (parent->part)) { sub = g_mime_message_get_mime_part (GMIME_MESSAGE (parent->part)); } else {