X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=alias.h;h=1819da77138798439b69fd04aae1c76e0fbcb3f9;hp=88fb81ddb3d6139caeb66dc2c5ba8a6070fadef1;hb=024fe257a96f97619e236bbdafe57b63101eb17f;hpb=d4321859bb9ce5b43fbd8303394cf98ae7720a38

diff --git a/alias.h b/alias.h
index 88fb81d..1819da7 100644
--- a/alias.h
+++ b/alias.h
@@ -1,3 +1,21 @@
+/*
+ *  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., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA 02110-1301, USA.
+ *
+ *  Copyright © 2006 Pierre Habouzit
+ */
 /*
  * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
@@ -9,29 +27,33 @@
 #ifndef _MUTT_ALIAS_H
 #define _MUTT_ALIAS_H
 
-#include <lib-lib/list.h>
+#include <lib-lib/lib-lib.h>
 #include <lib-mime/mime.h>
 
 typedef struct alias_t {
-  struct alias_t *next;
-  char *name;
-  address_t *addr;
-  short tagged;
-  short del;
-  short num;
+    struct alias_t *next;
+    char *name;
+    address_t *addr;
+    short tagged;
+    short del;
+    short num;
 } alias_t;
 
+extern char    *AliasFmt;
+extern char    *AliasFile;
+extern alias_t *Aliases;
+extern rx_t     GecosMask;
+
 DO_INIT(alias_t, alias);
 static inline void alias_wipe(alias_t *a) {
     address_list_wipe(&a->addr);
 }
-
 DO_NEW(alias_t, alias);
 DO_DELETE(alias_t, alias);
 DO_SLIST(alias_t, alias, alias_delete);
 
-const address_t *alias_lookup(const alias_t *list, const char *s);
-const address_t *alias_reverse_lookup(const alias_t *list, const address_t *);
+const address_t *alias_lookup(const char *s);
+const address_t *alias_reverse_lookup(const address_t *);
 
 int mutt_addr_is_user(address_t *);
 address_t *mutt_get_address(ENVELOPE *, const char **);
@@ -40,6 +62,5 @@ void mutt_create_alias(ENVELOPE *, address_t *);
 address_t *mutt_expand_aliases(address_t *);
 void mutt_expand_aliases_env(ENVELOPE *);
 int mutt_alias_complete(char *, size_t);
-void mutt_alias_menu(char *, size_t, alias_t *);
 
 #endif /* !_MUTT_ALIAS_H */