X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pattern.c;h=3ba5e62c6988d9d11d0775576603c62ba80cee8b;hp=8d0e4baa0c496698bf06c5d5ddabf761c668477d;hb=7015fc32efef2d1962da1164da148412881d5012;hpb=82589516e2473b5451218d7b00a9dfbc3e18f3ca

diff --git a/pattern.c b/pattern.c
index 8d0e4ba..3ba5e62 100644
--- a/pattern.c
+++ b/pattern.c
@@ -10,14 +10,13 @@
 #include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
-#include <lib-crypt/crypt.h>
-#include <lib-ui/enter.h>
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
 #include <lib-mx/mx.h>
 #include <imap/imap.h>
 
 #include "pattern.h"
 #include "alias.h"
+#include "crypt.h"
 #include "handler.h"
 #include "keymap.h"
 #include "copy.h"
@@ -70,9 +69,6 @@ static struct pattern_flags {
   {'u', M_SUBSCRIBED_LIST, 0, NULL},
   {'v', M_COLLAPSED, 0, NULL},
   {'V', M_CRYPT_VERIFIED, 0, NULL},
-#ifdef USE_NNTP
-  {'w', M_NEWSGROUPS, 0, eat_regexp},
-#endif
   {'x', M_REFERENCE, 0, eat_regexp},
   {'X', M_MIMEATTACH, 0, eat_range},
   {'y', M_XLABEL, 0, eat_regexp},
@@ -141,7 +137,7 @@ msg_search (CONTEXT *ctx, pattern_t* pat, int msgno)
       p_clear(&s, 1);
       s.fpin = msg->fp;
       s.flags = M_CHARCONV;
-      s.fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
+      s.fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL);
       if (!s.fpout) {
         mutt_error(_("Could not create temporary file"));
         return (0);
@@ -384,8 +380,8 @@ static const char *get_offset (struct tm *tm, const char *s, int sign)
   default:
     return s;
   }
-  mutt_normalize_time (tm);
-  return (ps + 1);
+  mktime(tm);
+  return ps + 1;
 }
 
 static void adjust_date_range (struct tm *min, struct tm *max)
@@ -602,8 +598,8 @@ static int eat_date (pattern_t * pat, BUFFER * s, BUFFER * err)
   /* Since we allow two dates to be specified we'll have to adjust that. */
   adjust_date_range (&min, &max);
 
-  pat->min = mutt_mktime (&min, 1);
-  pat->max = mutt_mktime (&max, 1);
+  pat->min = mktime(&min);
+  pat->max = mktime(&max);
 
   p_delete(&buffer.data);
 
@@ -1053,12 +1049,6 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec_flag flags,
                 && valid_realname(h->env-> from->personal)
                 && h->env->from->mailbox)
            )) ^ pat->not;
-#ifdef USE_NNTP
-  case M_NEWSGROUPS:
-    return (pat->
-            not ^ (h->env->newsgroups
-                   && patmatch (pat, h->env->newsgroups) == 0));
-#endif
   }
   mutt_error (_("error: unknown op %d (report this error)."), pat->op);
   return (-1);
@@ -1114,7 +1104,7 @@ void mutt_check_simple (char *s, ssize_t len, const char *simple)
   }
 }
 
-int mutt_pattern_func (int op, char *prompt)
+int mutt_pattern_func (int op, const char *prompt)
 {
   pattern_t *pat;
   char buf[LONG_STRING] = "", *simple, error[STRING];