Rocco Rutte:

[apps/madmutt.git] / alias.c

diff --git a/alias.c b/alias.c
index e664784..f092a8c 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -1,19 +1,10 @@
 /*
 /*

+ * Copyright notice from original mutt:

  * Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>
  * Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.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.

  */
 
 #if HAVE_CONFIG_H
  */
 
 #if HAVE_CONFIG_H


@@ -21,10 +12,14 @@
 #endif
 
 #include "mutt.h"
 #endif
 
 #include "mutt.h"

-#include "mutt_regex.h"

 #include "mutt_curses.h"
 #include "mutt_idna.h"
 
 #include "mutt_curses.h"
 #include "mutt_idna.h"
 

+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+#include "lib/rx.h"
+

 #include <string.h>
 #include <ctype.h>
 
 #include <string.h>
 #include <ctype.h>
 


@@ -532,11 +527,11 @@ int mutt_addr_is_user (ADDRESS * addr)
     return 1;
   }
 
     return 1;
   }
 

-  if (mutt_match_rx_list (addr->mailbox, Alternates)) {
+  if (rx_list_match (Alternates, addr->mailbox)) {

     dprint (5,
             (debugfile, "mail_addr_is_user: yes, %s matched by alternates.\n",
              addr->mailbox));
     dprint (5,
             (debugfile, "mail_addr_is_user: yes, %s matched by alternates.\n",
              addr->mailbox));

-    if (mutt_match_rx_list (addr->mailbox, UnAlternates))
+    if (rx_list_match (UnAlternates, addr->mailbox))

       dprint (5,
               (debugfile,
                "mail_addr_is_user: but, %s matched by unalternates.\n",
       dprint (5,
               (debugfile,
                "mail_addr_is_user: but, %s matched by unalternates.\n",