X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=buffy.c;h=9f8b9f6eeb9cc25739ae21fe38123f340f509b77;hp=ff316cc25037d1486ab3bae64b5be3a51129f98b;hb=096b7d36c872305692c0916be4d39699265959ee;hpb=cac1491258e026b8c8459b2ad408a6bf2e8a03bc

diff --git a/buffy.c b/buffy.c
index ff316cc..9f8b9f6 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 */
 
@@ -105,13 +100,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;
 }
@@ -180,7 +175,7 @@ int buffy_lookup (const char* path) {
   if (list_empty(Incoming) || !path || !*path)
     return (-1);
   for (i = 0; i < Incoming->length; i++) {
-    if (str_eq (((BUFFY*) Incoming->data[i])->path, path) )
+    if (!m_strcmp(((BUFFY*)Incoming->data[i])->path, path) )
       return (i);
   }
   return (-1);
@@ -200,7 +195,7 @@ int buffy_parse_mailboxes (BUFFER * path, BUFFER * s, unsigned long data,
     mutt_extract_token (path, s, 0);
     m_strcpy(buf, sizeof(buf), path->data);
 
-    if (data == M_UNMAILBOXES && str_eq (buf, "*")) {
+    if (data == M_UNMAILBOXES && !strcmp(buf, "*")) {
       list_del (&Incoming, (list_del_t*) buffy_free);
       return 0;
     }
@@ -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;
 
@@ -334,7 +321,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) : 
-                                       !str_eq (tmp->path, Context->path))) {
+                                       m_strcmp(tmp->path, Context->path))) {
       switch (tmp->magic) {
       case M_MBOX:
       case M_MMDF:
@@ -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
 
       }
     }
@@ -591,7 +576,7 @@ void buffy_next (char *s, size_t slen)
   i = 1 + buffy_lookup (s);
   for (l=0; l < Incoming->length; l++) {
     c = (l+i) % Incoming->length;
-    if ((!Context || !Context->path || !str_eq (((BUFFY*) Incoming->data[c])->path, Context->path)) &&
+    if ((!Context || !Context->path || m_strcmp(((BUFFY*) Incoming->data[c])->path, Context->path)) &&
         ((BUFFY*) Incoming->data[c])->new > 0)
       break;
   }