X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=browser.c;h=49c6fab1197aa486c58c52a43db7e6082907581c;hp=f509f0292b01b01ee2c3aa90286e4a01f1d0992e;hb=c86620f29c5e043a27ec3490d83af462e55c0143;hpb=0f44dc85fc1280372ffab911d701e703d803fb4b

diff --git a/browser.c b/browser.c
index f509f02..49c6fab 100644
--- a/browser.c
+++ b/browser.c
@@ -17,7 +17,6 @@
 #include "buffy.h"
 #include "mapping.h"
 #include "sort.h"
-#include "mailbox.h"
 #include "browser.h"
 #ifdef USE_IMAP
 #include "imap.h"
@@ -271,7 +270,7 @@ static const char *folder_format_str (char *dest, size_t destlen, char op,
 
   case 'N':
 #ifdef USE_IMAP
-    if (mx_is_imap (folder->ff->desc)) {
+    if (mx_get_magic (folder->ff->desc) == M_IMAP) {
       if (!optional) {
         snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
         snprintf (dest, destlen, tmp, folder->ff->new);
@@ -596,19 +595,19 @@ static int examine_mailboxes (MUTTMENU * menu, struct browser_state *state)
     for (i = 0; i < Incoming->length; i++) {
       tmp = (BUFFY*) Incoming->data[i];
 #ifdef USE_IMAP
-      if (mx_is_imap (tmp->path)) {
+      if (mx_get_magic (tmp->path) == M_IMAP) {
         add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
         continue;
       }
 #endif
 #ifdef USE_POP
-      if (mx_is_pop (tmp->path)) {
+      if (mx_get_magic (tmp->path) == M_POP) {
         add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
         continue;
       }
 #endif
 #ifdef USE_NNTP
-      if (mx_is_nntp (tmp->path)) {
+      if (mx_get_magic (tmp->path) == M_NNTP) {
         add_folder (menu, state, tmp->path, NULL, NULL, tmp->new);
         continue;
       }
@@ -765,7 +764,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
   if (*f) {
     mutt_expand_path (f, flen);
 #ifdef USE_IMAP
-    if (mx_is_imap (f)) {
+    if (mx_get_magic (f) == M_IMAP) {
       init_state (&state, NULL);
       state.imap_browse = 1;
       imap_browse (f, &state);
@@ -810,7 +809,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
       strfcpy (LastDir, NONULL (Maildir), sizeof (LastDir));
 
 #ifdef USE_IMAP
-    if (!buffy && mx_is_imap (LastDir)) {
+    if (!buffy && mx_get_magic (LastDir) == M_IMAP) {
       init_state (&state, NULL);
       state.imap_browse = 1;
       imap_browse (LastDir, &state);
@@ -1134,7 +1133,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
         buffy = 0;
         mutt_expand_path (buf, sizeof (buf));
 #ifdef USE_IMAP
-        if (mx_is_imap (buf)) {
+        if (mx_get_magic (buf) == M_IMAP) {
           strfcpy (LastDir, buf, sizeof (LastDir));
           destroy_state (&state);
           init_state (&state, NULL);
@@ -1291,7 +1290,7 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files,
           goto bail;
       }
 #ifdef USE_IMAP
-      else if (mx_is_imap (LastDir)) {
+      else if (mx_get_magic (LastDir) == M_IMAP) {
         init_state (&state, NULL);
         state.imap_browse = 1;
         imap_browse (LastDir, &state);