X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=query.c;h=35dbf2b2755ed32d81a4e982e18ca998f4db57b7;hp=77bd99a2ee6e00da371f72836a0443156f581999;hb=afa60149c4d2bb71c8195091d3658b3bdc12d59d;hpb=c3e57678c8be193fc137854020f3a90887be97c9

diff --git a/query.c b/query.c
index 77bd99a..35dbf2b 100644
--- a/query.c
+++ b/query.c
@@ -17,6 +17,11 @@
 #include "mapping.h"
 #include "sort.h"
 
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+#include "lib/debug.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -81,7 +86,7 @@ static QUERY *run_query (char *s, int quiet)
   mutt_expand_file_fmt (cmd, sizeof (cmd), QueryCmd, s);
 
   if ((thepid = mutt_create_filter (cmd, NULL, &fp, NULL)) < 0) {
-    dprint (1, (debugfile, "unable to fork command: %s", cmd));
+    debug_print (1, ("unable to fork command: %s\n", cmd));
     return 0;
   }
   if (!quiet)
@@ -124,7 +129,7 @@ static QUERY *run_query (char *s, int quiet)
   FREE (&buf);
   fclose (fp);
   if (mutt_wait_filter (thepid)) {
-    dprint (1, (debugfile, "Error: %s\n", msg));
+    debug_print (1, ("Error: %s\n", msg));
     if (!quiet)
       mutt_error ("%s", msg);
   }
@@ -151,11 +156,6 @@ static int query_search (MUTTMENU * m, regex_t * re, int n)
     if (table[n].data->addr->mailbox &&
         !regexec (re, table[n].data->addr->mailbox, 0, NULL, 0))
       return 0;
-#ifdef EXACT_ADDRESS
-    if (table[n].data->addr->val &&
-        !regexec (re, table[n].data->addr->val, 0, NULL, 0))
-      return 0;
-#endif
   }
 
   return REG_NOMATCH;