#endif
#include "mutt.h"
+#include "mx.h"
#include "mutt_curses.h"
#include "mutt_menu.h"
#include "buffy.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_get_magic (folder->ff->desc) == M_IMAP) {
+ 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);
NNTP_DATA *data;
NNTP_SERVER *news = CurrentNewsSrv;
-/* mutt_buffy_check (0); */
+/* buffy_check (0); */
init_state (state, menu);
for (tmp = news->list; tmp; tmp = tmp->next) {
return (-1);
}
- mutt_buffy_check (0);
+ buffy_check (0);
if ((dp = opendir (d)) == NULL) {
mutt_perror (d);
NNTP_DATA *data;
NNTP_SERVER *news = CurrentNewsSrv;
-/* mutt_buffy_check (0); */
+/* buffy_check (0); */
init_state (state, menu);
for (tmp = news->list; tmp; tmp = tmp->next) {
if (!Incoming)
return (-1);
- mutt_buffy_check (0);
+ buffy_check (0);
init_state (state, menu);
for (i = 0; i < Incoming->length; i++) {
tmp = (BUFFY*) Incoming->data[i];
+ tmp->magic = mx_get_magic (tmp->path);
#ifdef USE_IMAP
- if (mx_get_magic (tmp->path) == M_IMAP) {
+ if (tmp->magic == M_IMAP) {
add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
continue;
}
#endif
#ifdef USE_POP
- if (mx_get_magic (tmp->path) == M_POP) {
+ if (tmp->magic == M_POP) {
add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
continue;
}
#endif
#ifdef USE_NNTP
- if (mx_get_magic (tmp->path) == M_NNTP) {
+ if (tmp->magic == M_NNTP) {
add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
continue;
}
else
#endif
if (buffy)
- snprintf (title, titlelen, _("Mailboxes [%d]"), mutt_buffy_check (0));
+ snprintf (title, titlelen, _("Mailboxes [%d]"), buffy_check (0));
else {
strfcpy (path, LastDir, sizeof (path));
mutt_pretty_mailbox (path);
if (*f) {
mutt_expand_path (f, flen);
#ifdef USE_IMAP
- if (mx_get_magic (f) == M_IMAP) {
+ 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_get_magic (LastDir) == M_IMAP) {
+ 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_get_magic (buf) == M_IMAP) {
+ 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_get_magic (LastDir) == M_IMAP) {
+ else if (imap_is_magic (LastDir, NULL) == M_IMAP) {
init_state (&state, NULL);
state.imap_browse = 1;
imap_browse (LastDir, &state);
break;
case OP_BUFFY_LIST:
- mutt_buffy_list ();
+ buffy_list ();
break;
case OP_BROWSER_NEW_FILE: