X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_idna.h;h=b047e4b5a10116696d02c52444b4cdc37fb4131f;hp=4b4851629eeb695812e8672512bf2c1512630672;hb=ebc89176d4b5d2b1363114bd716c7f7fcb2464aa;hpb=f404a0ca916be07049af51a3022baaaaab94def6 diff --git a/mutt_idna.h b/mutt_idna.h index 4b48516..b047e4b 100644 --- a/mutt_idna.h +++ b/mutt_idna.h @@ -1,56 +1,33 @@ /* + * Copyright notice from original mutt: * Copyright (C) 2003 Thomas Roessler - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. - */ + * + * This file is part of mutt-ng, see http://www.muttng.org/. + * It's licensed under the GNU General Public License, + * please see the file GPL in the top level source directory. + */ #ifndef _MUTT_IDNA_H # define _MUTT_IDNA_H -#include "rfc822.h" -#include "charset.h" - -#ifdef HAVE_LIBIDN -#include +#if HAVE_CONFIG_H +# include "config.h" #endif +#include +#include "charset.h" + #define MI_MAY_BE_IRREVERSIBLE (1 << 0) int mutt_idna_to_local (const char *, char **, int); int mutt_local_to_idna (const char *, char **); -int mutt_addrlist_to_idna (ADDRESS *, char **); -int mutt_addrlist_to_local (ADDRESS *); +int mutt_addrlist_to_idna (address_t *, const char **); +int mutt_addrlist_to_local (address_t *); void mutt_env_to_local (ENVELOPE *); -int mutt_env_to_idna (ENVELOPE *, char **, char **); - -const char *mutt_addr_for_display (ADDRESS *a); - -/* Work around incompatibilities in the libidn API */ - -#ifdef HAVE_LIBIDN -# if (!defined(HAVE_IDNA_TO_ASCII_8Z) && defined(HAVE_IDNA_TO_ASCII_FROM_UTF8)) -# define idna_to_ascii_8z(a,b,c) idna_to_ascii_from_utf8(a,b,(c)&1,((c)&2)?1:0) -# endif -# if (!defined(HAVE_IDNA_TO_ASCII_LZ) && defined(HAVE_IDNA_TO_ASCII_FROM_LOCALE)) -# define idna_to_ascii_lz(a,b,c) idna_to_ascii_from_locale(a,b,(c)&1,((c)&2)?1:0) -# endif -# if (!defined(HAVE_IDNA_TO_UNICODE_8Z8Z) && defined(HAVE_IDNA_TO_UNICODE_UTF8_FROM_UTF8)) -# define idna_to_unicode_8z8z(a,b,c) idna_to_unicode_utf8_from_utf8(a,b,(c)&1,((c)&2)?1:0) -# endif -#endif +int mutt_env_to_idna (ENVELOPE *, const char **, const char **); + +const char *mutt_addr_for_display (address_t * a); #endif