diff options
author | Kevin McCarthy <kevin@8t8.us> | 2015-11-24 15:49:26 -0800 |
---|---|---|
committer | Kevin McCarthy <kevin@8t8.us> | 2015-11-24 15:49:26 -0800 |
commit | 0e0520faf7a96e2cc0efa49eced65adb4e5acfe6 (patch) | |
tree | e0ffd51e41bfef7c2023e83fcf3de9eed54145ec /edit.c | |
parent | 0864167e8a6ba598cf919fb26c242997518f7386 (diff) |
Rename idna functions and bits for smtputf8 changes.
This is patch 1 of 4 implementing support for SMTPUTF8 (RFC 6531).
Change mutt_idna.c to be always compiled. Remove the stub functions in
mutt_idna.h. Instead, put #ifdefs around the idna function calls. The
conversion functions will be fixed up in the next patch.
Rename the conversion functions to mutt_addrlist_to_intl() and
mutt_env_to_intl(). Rename the ADDRESS idna status bits to "intl"
status bits.
Diffstat (limited to 'edit.c')
-rw-r--r-- | edit.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -247,7 +247,7 @@ static void be_edit_header (ENVELOPE *e, int force) rfc822_free_address (&e->to); e->to = mutt_parse_adrlist (e->to, tmp); e->to = mutt_expand_aliases (e->to); - mutt_addrlist_to_idna (e->to, NULL); /* XXX - IDNA error reporting? */ + mutt_addrlist_to_intl (e->to, NULL); /* XXX - IDNA error reporting? */ tmp[0] = 0; rfc822_write_address (tmp, sizeof (tmp), e->to, 1); mvaddstr (LINES - 1, 4, tmp); @@ -255,7 +255,7 @@ static void be_edit_header (ENVELOPE *e, int force) } else { - mutt_addrlist_to_idna (e->to, NULL); /* XXX - IDNA error reporting? */ + mutt_addrlist_to_intl (e->to, NULL); /* XXX - IDNA error reporting? */ addstr (tmp); } addch ('\n'); @@ -281,12 +281,12 @@ static void be_edit_header (ENVELOPE *e, int force) e->cc = mutt_parse_adrlist (e->cc, tmp); e->cc = mutt_expand_aliases (e->cc); tmp[0] = 0; - mutt_addrlist_to_idna (e->cc, NULL); + mutt_addrlist_to_intl (e->cc, NULL); rfc822_write_address (tmp, sizeof (tmp), e->cc, 1); mvaddstr (LINES - 1, 4, tmp); } else - mutt_addrlist_to_idna (e->cc, NULL); + mutt_addrlist_to_intl (e->cc, NULL); addch ('\n'); } @@ -301,13 +301,13 @@ static void be_edit_header (ENVELOPE *e, int force) rfc822_free_address (&e->bcc); e->bcc = mutt_parse_adrlist (e->bcc, tmp); e->bcc = mutt_expand_aliases (e->bcc); - mutt_addrlist_to_idna (e->bcc, NULL); + mutt_addrlist_to_intl (e->bcc, NULL); tmp[0] = 0; rfc822_write_address (tmp, sizeof (tmp), e->bcc, 1); mvaddstr (LINES - 1, 5, tmp); } else - mutt_addrlist_to_idna (e->bcc, NULL); + mutt_addrlist_to_intl (e->bcc, NULL); addch ('\n'); } } @@ -447,7 +447,7 @@ int mutt_builtin_editor (const char *path, HEADER *msg, HEADER *cur) { mutt_env_to_local (msg->env); mutt_edit_headers (NONULL(Visual), path, msg, NULL, 0); - if (mutt_env_to_idna (msg->env, &tag, &err)) + if (mutt_env_to_intl (msg->env, &tag, &err)) printw (_("Bad IDN in %s: '%s'\n"), tag, err); } else |