X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=query.c;h=5c5d0a3a40d4a34a9cec9d7dd768ce30e8d78580;hp=9390bcf05b994793b94752c06d4ce3c26e30ab25;hb=1bf2541321cf348b02dbe15c5cabb167264a560d;hpb=0f44dc85fc1280372ffab911d701e703d803fb4b

diff --git a/query.c b/query.c
index 9390bcf..5c5d0a3 100644
--- a/query.c
+++ b/query.c
@@ -20,6 +20,7 @@
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"
+#include "lib/debug.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -85,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)
@@ -128,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);
   }
@@ -155,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;