X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_idna.h;h=b047e4b5a10116696d02c52444b4cdc37fb4131f;hp=180b5b4c8e36551b0a7b65755c28b407213b3f08;hb=ebc89176d4b5d2b1363114bd716c7f7fcb2464aa;hpb=ef7b80006ebb47372d69c64e8b2b2f0764333d55;ds=sidebyside

diff --git a/mutt_idna.h b/mutt_idna.h
index 180b5b4..b047e4b 100644
--- a/mutt_idna.h
+++ b/mutt_idna.h
@@ -10,38 +10,24 @@
 #ifndef _MUTT_IDNA_H
 # define _MUTT_IDNA_H
 
-#include "rfc822.h"
-#include "charset.h"
-
-#ifdef HAVE_LIBIDN
-#include <idna.h>
+#if HAVE_CONFIG_H
+# include "config.h"
 #endif
 
+#include <lib-mime/mime.h>
+#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 *, const 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