X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_idna.h;h=8742bc7f73a564b09de7eb0534f01a7f909d6dc6;hp=0e2534a8f9d4feaf73a455ec7c99f725870ad258;hb=fd25c07c1e9e19606b1b6d5533df1f6239455036;hpb=6833ce8bdca2d64e14485118f2a4417b7e1cb1b1

diff --git a/mutt_idna.h b/mutt_idna.h
index 0e2534a..8742bc7 100644
--- a/mutt_idna.h
+++ b/mutt_idna.h
@@ -1,26 +1,20 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 2003 Thomas Roessler <roessler@does-not-exist.org>
- * 
- *     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 "config.h"
-#include "rfc822.h"
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <lib-mime/mime.h>
 #include "charset.h"
 
 #ifdef HAVE_LIBIDN
@@ -32,13 +26,13 @@
 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 **);
+int mutt_env_to_idna (ENVELOPE *, const char **, const char **);
 
-const char *mutt_addr_for_display (ADDRESS *a);
+const char *mutt_addr_for_display (address_t * a);
 
 /* Work around incompatibilities in the libidn API */