begin to work on alias.[hc]

[apps/madmutt.git] / muttlib.c

diff --git a/muttlib.c b/muttlib.c
index 1c54b13..27cbdbd 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -31,6 +31,7 @@
 #include <lib-lib/buffer.h>
 #include <lib-lib/file.h>
 #include <lib-lib/debug.h>
+#include <lib-lib/url.h>
 
 #include <lib-mime/mime.h>
 
@@ -39,7 +40,6 @@
 
 #include "mutt.h"
 #include "mx.h"
-#include "url.h"
 #include "attach.h"
 
 #include "version.h"
@@ -322,7 +322,7 @@ char *_mutt_expand_path (char *s, size_t slen, int rx)
         HEADER *h;
         address_t *alias;
 
-        if ((alias = mutt_lookup_alias (s + 1))) {
+        if ((alias = alias_lookup(Aliases, s + 1))) {
           h = header_new();
           h->env = envelope_new();
           h->env->from = h->env->to = alias;
@@ -552,19 +552,6 @@ void _mutt_mktemp (char *s, const char *src, int line)
   unlink (s);
 }
 
-void mutt_free_alias (ALIAS ** p)
-{
-  ALIAS *t;
-
-  while (*p) {
-    t = *p;
-    *p = (*p)->next;
-    p_delete(&t->name);
-    address_delete (&t->addr);
-    p_delete(&t);
-  }
-}
-
 /* collapse the pathname using ~ or = when possible */
 void mutt_pretty_mailbox (char *s)
 {