many simplifications, copyright statements.

[apps/madmutt.git] / buffy.c

diff --git a/buffy.c b/buffy.c
index f2d4887..4a30783 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -18,18 +18,16 @@
 #include <lib-lib/buffer.h>
 #include <lib-lib/macros.h>
 
+#include <lib-ui/curses.h>
+
+#include <imap/imap.h>
+
 #include "mutt.h"
 #include "buffy.h"
 #include "mx.h"
 #include "mh.h"
 #include "sidebar.h"
 
-#include "mutt_curses.h"
-
-#ifdef USE_IMAP
-#include "imap.h"
-#endif
-
 
 #include <string.h>
 #include <sys/stat.h>
@@ -42,9 +40,7 @@
 
 static time_t BuffyTime = 0;    /* last time we started checking for mail */
 
-#ifdef USE_IMAP
 static time_t ImapBuffyTime = 0;        /* last time we started checking for mail */
-#endif
 static short BuffyCount = 0;    /* how many boxes with new mail */
 static short BuffyNotify = 0;   /* # of unnotified new boxes */
 
@@ -105,13 +101,13 @@ static int test_last_status_new (FILE * f)
   if (fseeko_last_message (f) == -1)
     return (0);
 
-  hdr = mutt_new_header ();
+  hdr = header_new();
   tmp_envelope = mutt_read_rfc822_header (f, hdr, 0, 0);
   if (!(hdr->read || hdr->old))
     result = 1;
 
-  mutt_free_envelope (&tmp_envelope);
-  mutt_free_header (&hdr);
+  envelope_delete(&tmp_envelope);
+  header_delete(&hdr);
 
   return result;
 }
@@ -275,34 +271,26 @@ int buffy_check (int force)
   CONTEXT *ctx;
   unsigned int i = 0;
   int local = 0, count = 0;
-#ifdef USE_IMAP
   time_t last2;
 
   /* update postponed count as well, on force */
   if (force == 1)
     mutt_update_num_postponed ();
-#endif
 
   /* fastest return if there are no mailboxes */
   if (list_empty(Incoming))
     return 0;
   now = time (NULL);
   if (force == 0 && (now - BuffyTime < BuffyTimeout)
-#ifdef USE_IMAP
       && (now - ImapBuffyTime < ImapBuffyTimeout))
-#else
-    )
-#endif
     return BuffyCount;
 
   last1 = BuffyTime;
   if (force == 1 || now - BuffyTime >= BuffyTimeout)
     BuffyTime = now;
-#ifdef USE_IMAP
   last2 = ImapBuffyTime;
   if (force == 1 || now - ImapBuffyTime >= ImapBuffyTimeout)
     ImapBuffyTime = now;
-#endif
   BuffyCount = 0;
   BuffyNotify = 0;
 
@@ -334,7 +322,7 @@ int buffy_check (int force)
      * before polling */
     if (!Context || !Context->path || (local ? (sb.st_dev != contex_sb.st_dev ||
                                                 sb.st_ino != contex_sb.st_ino) : 
-                                       !m_strcmp(tmp->path, Context->path))) {
+                                       m_strcmp(tmp->path, Context->path))) {
       switch (tmp->magic) {
       case M_MBOX:
       case M_MMDF:
@@ -460,7 +448,6 @@ int buffy_check (int force)
           BuffyCount++;
         break;
 
-#ifdef USE_IMAP
       case M_IMAP:
         /* only check on force or $imap_mail_check reached */
         if (force == 1 || (now - last2 >= ImapBuffyTimeout)) {
@@ -478,7 +465,6 @@ int buffy_check (int force)
           /* keep current stats if !force and !$imap_mail_check reached */
           BuffyCount++;
         break;
-#endif
 
       }
     }