drop mod_ssl.starttls setting.

[apps/madmutt.git] / postpone.c

diff --git a/postpone.c b/postpone.c
index 4cabf1d..023b32f 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -12,9 +12,8 @@
 
 #include <lib-mime/mime.h>
 
-#include <lib-ui/enter.h>
+#include <lib-ui/lib-ui.h>
 #include <lib-ui/menu.h>
-#include <lib-ui/curses.h>
 #include <lib-mx/mx.h>
 
 #include <lib-sys/unix.h>
@@ -58,7 +57,7 @@ int mutt_num_postponed (int force)
     return 0;
 
   /* LastModify is useless for IMAP */
-  if (imap_is_magic (Postponed, NULL) == M_IMAP) {
+  if (imap_mx.mx_is_magic (Postponed, NULL) == M_IMAP) {
     if (force) {
       short newpc;
 
@@ -73,7 +72,7 @@ int mutt_num_postponed (int force)
   if (stat (Postponed, &st) == -1) {
     PostCount = 0;
     LastModify = 0;
-    return (0);
+    return 0;
   }
 
   if (S_ISDIR (st.st_mode)) {
@@ -90,29 +89,18 @@ int mutt_num_postponed (int force)
   }
 
   if (LastModify < st.st_mtime) {
-#ifdef USE_NNTP
-    int optnews = option (OPTNEWS);
-#endif
     LastModify = st.st_mtime;
 
     if (access (Postponed, R_OK | F_OK) != 0)
-      return (PostCount = 0);
-#ifdef USE_NNTP
-    if (optnews)
-      unset_option (OPTNEWS);
-#endif
+      return PostCount = 0;
     if (mx_open_mailbox (Postponed, M_NOSORT | M_QUIET, &ctx) == NULL)
       PostCount = 0;
     else
       PostCount = ctx.msgcount;
     mx_fastclose_mailbox (&ctx);
-#ifdef USE_NNTP
-    if (optnews)
-      set_option (OPTNEWS);
-#endif
   }
 
-  return (PostCount);
+  return PostCount;
 }
 
 void mutt_update_num_postponed (void)
@@ -179,7 +167,7 @@ static HEADER *select_msg (void)
 
   Sort = orig_sort;
   mutt_menuDestroy (&menu);
-  return (r > -1 ? PostContext->hdrs[r] : NULL);
+  return r > -1 ? PostContext->hdrs[r] : NULL;
 }
 
 /* args:
@@ -208,13 +196,13 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
   int opt_delete;
 
   if (!Postponed)
-    return (-1);
+    return -1;
 
   if ((PostContext = mx_open_mailbox (Postponed, M_NOSORT, NULL)) == NULL) {
     PostCount = 0;
     mutt_error _("No postponed messages.");
 
-    return (-1);
+    return -1;
   }
 
   if (!PostContext->msgcount) {
@@ -223,7 +211,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
     p_delete(&PostContext);
     mutt_error _("No postponed messages.");
 
-    return (-1);
+    return -1;
   }
 
   if (PostContext->msgcount == 1) {
@@ -233,13 +221,13 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
   else if ((h = select_msg ()) == NULL) {
     mx_close_mailbox (PostContext, NULL);
     p_delete(&PostContext);
-    return (-1);
+    return -1;
   }
 
   if (mutt_prepare_template (NULL, PostContext, hdr, h, 0) < 0) {
     mx_fastclose_mailbox (PostContext);
     p_delete(&PostContext);
-    return (-1);
+    return -1;
   }
 
   /* finished with this message, so delete it. */
@@ -330,7 +318,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
       tmp = tmp->next;
     }
   }
-  return (code);
+  return code;
 }
 
 int mutt_parse_crypt_hdr (char *p, int set_signas)
@@ -443,7 +431,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
   p_clear(&s, 1);
 
   if (!fp && (msg = mx_open_message (ctx, hdr->msgno)) == NULL)
-    return (-1);
+    return -1;
 
   if (!fp)
     fp = msg->fp;