Import cmaked

[apps/madmutt.git] / pattern.c

diff --git a/pattern.c b/pattern.c
index 9839aa7..7744e95 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -11,7 +11,7 @@
 
 #include <lib-mime/mime.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>
 
@@ -141,7 +141,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 +384,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 +602,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);