• Patch: Elm ME+ 2.5 PLalpha54 -> Elm ME+ 2.5 PLalpha60 [12/13] (6/6)

    From Kari Hurtta@21:1/5 to All on Thu Nov 24 20:32:48 2022
    [continued from previous message]

    get_major_type_name(hdr->mime_rec.TYPE),
    get_subtype_name(hdr->mime_rec.TYPE),
    ! X,mime_debug_classify_f(X)));

    DPRINT(Debug,11,(&Debug,
    "need_meta: status %d%s%s%s\n",
    ***************
    *** 1799,1817 ****

    if (0 != (X & NOTPLAIN_metamail_blacklisted))

    ! result = prompt_programs (hdr,metamail_disabled,
    ! current,message_count,
    ! cancel_ret);

    else if (have_metamail()) {
    if (prompt_metamail)
    ! result = prompt_programs (hdr,metamail_disabled,
    ! current,message_count,
    ! cancel_ret);
    else
    ! result = TRUE;
    } else
    ! result = FALSE;

    /* Do not call metamail if Disposition is not inline */
    } else if ((hdr->status & MIME_MESSAGE) &&
    --- 2186,2204 ----

    if (0 != (X & NOTPLAIN_metamail_blacklisted))

    ! result = prompt_programs(hdr,metamail_disabled,
    ! current,message_count,
    ! cancel_ret);

    else if (have_metamail()) {
    if (prompt_metamail)
    ! result = prompt_programs(hdr,metamail_ask,
    ! current,message_count,
    ! cancel_ret);
    else
    ! result = metamail_needed;
    } else
    ! result = metamail_none;

    /* Do not call metamail if Disposition is not inline */
    } else if ((hdr->status & MIME_MESSAGE) &&
    ***************
    *** 1820,1826 ****
    DPRINT(Debug,11,(&Debug,
    "need_meta: Disposition is not inline\n"));

    ! result = FALSE;

    } else if (hdr->status & (MIME_MESSAGE | PRE_MIME_CONTENT)) {

    --- 2207,2213 ----
    DPRINT(Debug,11,(&Debug,
    "need_meta: Disposition is not inline\n"));

    ! result = metamail_none;

    } else if (hdr->status & (MIME_MESSAGE | PRE_MIME_CONTENT)) {

    ***************
    *** 1833,1859 ****