#include "buffy.h"
#include "mapping.h"
#include "sort.h"
-#include "mailbox.h"
#include "browser.h"
#ifdef USE_IMAP
#include "imap.h"
+#include "imap/mx_imap.h"
#endif
#ifdef USE_NNTP
#include "nntp.h"
case 'N':
#ifdef USE_IMAP
- if (mx_is_imap (folder->ff->desc)) {
+ if (imap_is_magic (folder->ff->desc, NULL) == M_IMAP) {
if (!optional) {
snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
snprintf (dest, destlen, tmp, folder->ff->new);
for (i = 0; i < Incoming->length; i++) {
tmp = (BUFFY*) Incoming->data[i];
+ tmp->magic = mx_get_magic (tmp->path);
#ifdef USE_IMAP
- if (mx_is_imap (tmp->path)) {
+ if (tmp->magic == M_IMAP) {
add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
continue;
}
#endif
#ifdef USE_POP
- if (mx_is_pop (tmp->path)) {
+ if (tmp->magic == M_POP) {
add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
continue;
}
#endif
#ifdef USE_NNTP
- if (mx_is_nntp (tmp->path)) {
+ if (tmp->magic == M_NNTP) {
add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
continue;
}
if (*f) {
mutt_expand_path (f, flen);
#ifdef USE_IMAP
- if (mx_is_imap (f)) {
+ if (imap_is_magic (f, NULL) == M_IMAP) {
init_state (&state, NULL);
state.imap_browse = 1;
imap_browse (f, &state);
strfcpy (LastDir, NONULL (Maildir), sizeof (LastDir));
#ifdef USE_IMAP
- if (!buffy && mx_is_imap (LastDir)) {
+ if (!buffy && imap_is_magic (LastDir, NULL) == M_IMAP) {
init_state (&state, NULL);
state.imap_browse = 1;
imap_browse (LastDir, &state);
buffy = 0;
mutt_expand_path (buf, sizeof (buf));
#ifdef USE_IMAP
- if (mx_is_imap (buf)) {
+ if (imap_is_magic (buf, NULL) == M_IMAP) {
strfcpy (LastDir, buf, sizeof (LastDir));
destroy_state (&state);
init_state (&state, NULL);
goto bail;
}
#ifdef USE_IMAP
- else if (mx_is_imap (LastDir)) {
+ else if (imap_is_magic (LastDir, NULL) == M_IMAP) {
init_state (&state, NULL);
state.imap_browse = 1;
imap_browse (LastDir, &state);