X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=bee469022b6b61cd3e37f9d4ab4f1f7851c3139a;hp=30fb2cf7c8d3f8dde1464734533c69babc7decb9;hb=03ecb7c70bd09a8302212ed3e7f94f9a7b14d099;hpb=74a2265af51ce89bca845adc1d68f273c9933c13

diff --git a/postpone.c b/postpone.c
index 30fb2cf..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;
   }
@@ -332,10 +328,10 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
       tmp = next;
     }
     else if ((WithCrypto & APPLICATION_PGP)
-             && (mutt_strncmp ("Pgp:", tmp->data, 4) == 0       /* this is generated
+             && (safe_strncmp ("Pgp:", tmp->data, 4) == 0       /* this is generated
                                                                  * by old mutt versions
                                                                  */
-                 || mutt_strncmp ("X-Mutt-PGP:", tmp->data, 11) == 0)) {
+                 || safe_strncmp ("X-Mutt-PGP:", tmp->data, 11) == 0)) {
       hdr->security = mutt_parse_crypt_hdr (strchr (tmp->data, ':') + 1, 1);
       hdr->security |= APPLICATION_PGP;
 
@@ -350,7 +346,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
       tmp = next;
     }
     else if ((WithCrypto & APPLICATION_SMIME)
-             && mutt_strncmp ("X-Mutt-SMIME:", tmp->data, 13) == 0) {
+             && safe_strncmp ("X-Mutt-SMIME:", tmp->data, 13) == 0) {
       hdr->security = mutt_parse_crypt_hdr (strchr (tmp->data, ':') + 1, 1);
       hdr->security |= APPLICATION_SMIME;
 
@@ -366,7 +362,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
     }
 
 #ifdef MIXMASTER
-    else if (mutt_strncmp ("X-Mutt-Mix:", tmp->data, 11) == 0) {
+    else if (safe_strncmp ("X-Mutt-Mix:", tmp->data, 11) == 0) {
       char *t;
 
       mutt_free_list (&hdr->chain);
@@ -489,10 +485,10 @@ int mutt_parse_crypt_hdr (char *p, int set_signas)
 
   /* the cryptalg field must not be empty */
   if ((WithCrypto & APPLICATION_SMIME) && *smime_cryptalg)
-    mutt_str_replace (&SmimeCryptAlg, smime_cryptalg);
+    str_replace (&SmimeCryptAlg, smime_cryptalg);
 
   if ((WithCrypto & APPLICATION_PGP) && (set_signas || *pgp_sign_as))
-    mutt_str_replace (&PgpSignAs, pgp_sign_as);
+    str_replace (&PgpSignAs, pgp_sign_as);
 
   return pgp;
 }
@@ -646,7 +642,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
       newhdr->security |= mutt_is_application_pgp (newhdr->content);
 
       b->type = TYPETEXT;
-      mutt_str_replace (&b->subtype, "plain");
+      str_replace (&b->subtype, "plain");
       mutt_delete_parameter ("x-action", &b->parameter);
     }
     else
@@ -655,7 +651,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
     if (safe_fclose (&s.fpout) != 0)
       goto bail;
 
-    mutt_str_replace (&b->filename, file);
+    str_replace (&b->filename, file);
     b->unlink = 1;
 
     mutt_stamp_attachment (b);