X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=buffy.c;h=4d79995e87e0bf51ab47efaa06ea510553abbc32;hb=41a708d3e526f10bc3aba7c5eac80aaa0b7b6fcd;hp=9c861b07dee2f4687a59999e2be86493609601a4;hpb=0f44dc85fc1280372ffab911d701e703d803fb4b;p=apps%2Fmadmutt.git

diff --git a/buffy.c b/buffy.c
index 9c861b0..4d79995 100644
--- a/buffy.c
+++ b/buffy.c
@@ -16,8 +16,8 @@
 
 #include "mutt.h"
 #include "buffy.h"
-#include "mailbox.h"
 #include "mx.h"
+#include "mh.h"
 #include "sidebar.h"
 
 #include "mutt_curses.h"
@@ -322,17 +322,17 @@ int mutt_buffy_check (int force)
   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)
       tmp->magic = M_IMAP;
     else
 #endif
 #ifdef USE_POP
-    if (mx_is_pop (tmp->path))
+    if (mx_get_magic (tmp->path) == M_IMAP)
       tmp->magic = M_POP;
     else
 #endif
 #ifdef USE_NNTP
-    if ((tmp->magic == M_NNTP) || mx_is_nntp (tmp->path))
+    if (mx_get_magic (tmp->path) == M_NNTP)
       tmp->magic = M_NNTP;
     else
 #endif