X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=bee469022b6b61cd3e37f9d4ab4f1f7851c3139a;hp=db84a3243fc871cae3605b2fd209568603042a02;hb=0cdfadc00f3db981c5fccbd654c4a19becf42ef7;hpb=0f44dc85fc1280372ffab911d701e703d803fb4b

diff --git a/postpone.c b/postpone.c
index db84a32..bee4690 100644
--- a/postpone.c
+++ b/postpone.c
@@ -16,18 +16,19 @@
 #include "mutt_menu.h"
 #include "rfc1524.h"
 #include "mime.h"
-#include "mailbox.h"
 #include "mapping.h"
 #include "sort.h"
-#ifdef USE_IMAP
 #include "mx.h"
+#ifdef USE_IMAP
 #include "imap.h"
+#include "imap/mx_imap.h"
 #endif
 #include "mutt_crypt.h"
 
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"
+#include "lib/debug.h"
 
 #include <ctype.h>
 #include <unistd.h>
@@ -76,22 +77,17 @@ int mutt_num_postponed (int force)
 
 #ifdef USE_IMAP
   /* LastModify is useless for IMAP */
-  if (mx_is_imap (Postponed)) {
+  if (imap_is_magic (Postponed, NULL) == M_IMAP) {
     if (force) {
       short newpc;
 
       newpc = imap_mailbox_check (Postponed, 0);
       if (newpc >= 0) {
         PostCount = newpc;
-        dprint (2,
-                (debugfile,
-                 "mutt_num_postponed: %d postponed IMAP messages found.\n",
-                 PostCount));
+        debug_print (2, ("%d postponed IMAP messages found.\n", PostCount));
       }
       else
-        dprint (2,
-                (debugfile,
-                 "mutt_num_postponed: using old IMAP postponed count.\n"));
+        debug_print (2, ("using old IMAP postponed count.\n"));
     }
     return PostCount;
   }