always build imap as well.

[apps/madmutt.git] / buffy.c

diff --git a/buffy.c b/buffy.c
index f2d4887..105e809 100644 (file)
--- a/buffy.c
+++ b/buffy.c
@@ -18,6 +18,8 @@
 #include <lib-lib/buffer.h>
 #include <lib-lib/macros.h>
 
 #include <lib-lib/buffer.h>
 #include <lib-lib/macros.h>
 

+#include <imap/imap.h>
+

 #include "mutt.h"
 #include "buffy.h"
 #include "mx.h"
 #include "mutt.h"
 #include "buffy.h"
 #include "mx.h"


@@ -26,11 +28,6 @@
 
 #include "mutt_curses.h"
 
 
 #include "mutt_curses.h"
 

-#ifdef USE_IMAP
-#include "imap.h"
-#endif
-
-

 #include <string.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <dirent.h>


@@ -42,9 +39,7 @@
 
 static time_t BuffyTime = 0;    /* last time we started checking for mail */
 
 
 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 */
 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 */
 
 static short BuffyCount = 0;    /* how many boxes with new mail */
 static short BuffyNotify = 0;   /* # of unnotified new boxes */
 


@@ -275,34 +270,26 @@ int buffy_check (int force)
   CONTEXT *ctx;
   unsigned int i = 0;
   int local = 0, count = 0;
   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 ();
   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)
 
   /* 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))
       && (now - ImapBuffyTime < ImapBuffyTimeout))

-#else
-    )
-#endif

     return BuffyCount;
 
   last1 = BuffyTime;
   if (force == 1 || now - BuffyTime >= BuffyTimeout)
     BuffyTime = now;
     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;
   last2 = ImapBuffyTime;
   if (force == 1 || now - ImapBuffyTime >= ImapBuffyTimeout)
     ImapBuffyTime = now;

-#endif

   BuffyCount = 0;
   BuffyNotify = 0;
 
   BuffyCount = 0;
   BuffyNotify = 0;
 


@@ -460,7 +447,6 @@ int buffy_check (int force)
           BuffyCount++;
         break;
 
           BuffyCount++;
         break;
 

-#ifdef USE_IMAP

       case M_IMAP:
         /* only check on force or $imap_mail_check reached */
         if (force == 1 || (now - last2 >= ImapBuffyTimeout)) {
       case M_IMAP:
         /* only check on force or $imap_mail_check reached */
         if (force == 1 || (now - last2 >= ImapBuffyTimeout)) {


@@ -478,7 +464,6 @@ int buffy_check (int force)
           /* keep current stats if !force and !$imap_mail_check reached */
           BuffyCount++;
         break;
           /* keep current stats if !force and !$imap_mail_check reached */
           BuffyCount++;
         break;

-#endif

 
       }
     }
 
       }
     }