Patch: Elm ME+ 2.5 PLalpha62 -> Elm ME+ 2.5 PLalpha63 [4/7] (2/7)
From
Kari Hurtta@21:1/5 to
All on Wed Jan 3 13:52:11 2024
[continued from previous message]
! MIME_name ? MIME_name : "<no MIME name>"));
flags = 0;
goto done_charset;
}
--- 2663,2676 ----
if ((r=mime_get_charset(&buf1,p->TYPE_opts,disp_vector,NULL)) > 0) {
const char * MIME_name UNUSED_VAROK = get_charset_MIME_name(buf1);
!
DPRINT(Debug,11,(&Debug,
! "text_charset_selector(%p) -- type: %p=%s/%s; charset=%s\n",
! p,
! p->TYPE,
! get_major_type_name(p->TYPE),
! get_subtype_name(p->TYPE),
! MIME_name ? MIME_name : "<no MIME name>"));
flags = 0;
goto done_charset;
}
***************
*** 2582,2605 ****
if (r < 0 && buf1 == system_charset) {
const char * MIME_name UNUSED_VAROK =
get_charset_MIME_name(buf1);
!
DPRINT(Debug,11,(&Debug,
! "text_selector(%p) -- type: %p=%s/%s; charset=%s -- is system charset ...\n",
! p,
! p->TYPE,
! get_major_type_name(p->TYPE),
! get_subtype_name(p->TYPE),
! MIME_name ? MIME_name : "<no MIME name>"));
flags = 0;
goto done_charset;
}
!
if (r == -3 && charset_convert_ok) {
const char * MIME_name UNUSED_VAROK =