#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_curses.h"
-#ifdef USE_IMAP
-#include "imap.h"
-#endif
-
-
#include <string.h>
#include <sys/stat.h>
#include <dirent.h>
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 */
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;
}
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);
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;
}
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;
* 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:
BuffyCount++;
break;
-#ifdef USE_IMAP
case M_IMAP:
/* only check on force or $imap_mail_check reached */
if (force == 1 || (now - last2 >= ImapBuffyTimeout)) {
/* keep current stats if !force and !$imap_mail_check reached */
BuffyCount++;
break;
-#endif
}
}
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;
}