X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=buffy.c;fp=buffy.c;h=105e809ae0777c148783af7fc55b6e9c484db3c5;hp=f2d488724540951e0e2640707b23190d7212adae;hb=b8c71f93b0296f815a6538182343ba67e88c0012;hpb=0ac011f8eb41bab7808881ebf9802b4eb252fe3b;ds=sidebyside

diff --git a/buffy.c b/buffy.c
index f2d4887..105e809 100644
--- a/buffy.c
+++ b/buffy.c
@@ -18,6 +18,8 @@
 #include <lib-lib/buffer.h>
 #include <lib-lib/macros.h>
 
+#include <imap/imap.h>
+
 #include "mutt.h"
 #include "buffy.h"
 #include "mx.h"
@@ -26,11 +28,6 @@
 
 #include "mutt_curses.h"
 
-#ifdef USE_IMAP
-#include "imap.h"
-#endif
-
-
 #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 */
 
-#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 */
 
@@ -275,34 +270,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;
 
@@ -460,7 +447,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 +464,6 @@ int buffy_check (int force)
           /* keep current stats if !force and !$imap_mail_check reached */
           BuffyCount++;
         break;
-#endif
 
       }
     }