Rocco Rutte:

[apps/madmutt.git] / pager.c

diff --git a/pager.c b/pager.c
index 78fe31d..2c831cc 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -25,6 +25,7 @@
 #include "attach.h"
 #include "mbyte.h"
 #include "sidebar.h"
+#include "buffy.h"
 
 #include "mx.h"
 
@@ -38,6 +39,7 @@
 #include "lib/intl.h"
 #include "lib/str.h"
 #include "lib/rx.h"
+#include "lib/debug.h"
 
 #include <sys/stat.h>
 #include <ctype.h>
@@ -81,17 +83,6 @@ N_("Function not permitted in attach-message mode.");
                        break; \
                     }
 
-#ifdef USE_IMAP
-/* the error message returned here could be better. */
-#define CHECK_IMAP_ACL(aclbit) if (Context->magic == M_IMAP) \
-               if (mutt_bit_isset (((IMAP_DATA *)Context->data)->capabilities, ACL) \
-               && !mutt_bit_isset(((IMAP_DATA *)Context->data)->rights,aclbit)){ \
-                       mutt_flushinp(); \
-                       mutt_error ("Operation not permitted by the IMAP ACL for this mailbox"); \
-                       break; \
-               }
-#endif
-
 struct q_class_t {
   int length;
   int index;
@@ -690,8 +681,8 @@ resolve_types (char *buf, char *raw, struct line_t *lineInfo, int n, int last,
   else if (check_attachment_marker ((char *) raw) == 0)
     lineInfo[n].type = MT_COLOR_ATTACHMENT;
 #endif
-  else if (safe_strcmp ("-- \n", buf) == 0
-           || safe_strcmp ("-- \r\n", buf) == 0) {
+  else if (mutt_strcmp ("-- \n", buf) == 0
+           || mutt_strcmp ("-- \r\n", buf) == 0) {
     i = n + 1;
 
     lineInfo[n].type = MT_COLOR_SIGNATURE;
@@ -925,7 +916,7 @@ fill_buffer (FILE * f, long *last_pos, long offset, unsigned char *buf,
       }
       else if (*p == '\033' && *(p + 1) == ']'
                && check_attachment_marker ((char *) p) == 0) {
-        dprint (2, (debugfile, "fill_buffer: Seen attachment marker.\n"));
+        debug_print (2, ("seen attachment marker.\n"));
         while (*p++ != '\a')    /* skip pseudo-ANSI sequence */
           ;
       }
@@ -984,8 +975,7 @@ static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
 
     k = mbrtowc (&wc, (char *) buf + ch, cnt - ch, &mbstate);
     if (k == -2 || k == -1) {
-      dprint (1, (debugfile, "%s:%d: mbrtowc returned %d; errno = %d.\n",
-                  __FILE__, __LINE__, k, errno));
+      debug_print (1, ("mbrtowc returned %d; errno = %d.\n", k, errno));
       if (col + 4 > wrap_cols)
         break;
       col += 4;
@@ -2100,9 +2090,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
       CHECK_MODE (IsHeader (extra));
       CHECK_READONLY;
 
-#ifdef USE_IMAP
-      CHECK_IMAP_ACL (IMAP_ACL_DELETE);
-#endif
+      CHECK_MX_ACL (Context, ACL_DELETE, _("Deletion"));
 
       mutt_set_flag (Context, extra->hdr, M_DELETE, 1);
       mutt_set_flag (Context, extra->hdr, M_PURGED,
@@ -2121,9 +2109,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
       CHECK_MODE (IsHeader (extra));
       CHECK_READONLY;
 
-#ifdef USE_IMAP
-      CHECK_IMAP_ACL (IMAP_ACL_DELETE);
-#endif
+      CHECK_MX_ACL (Context, ACL_DELETE, _("Deletion"));
 
       r = mutt_thread_set_flag (extra->hdr, M_DELETE, 1,
                                 ch == OP_DELETE_THREAD ? 0 : 1);
@@ -2235,27 +2221,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
       CHECK_MODE (IsHeader (extra));
       CHECK_READONLY;
 
-#ifdef USE_POP
-      if (Context->magic == M_POP) {
-        mutt_flushinp ();
-        mutt_error _("Can't change 'important' flag on POP server.");
-
-        break;
-      }
-#endif
-
-#ifdef USE_IMAP
-      CHECK_IMAP_ACL (IMAP_ACL_WRITE);
-#endif
-
-#ifdef USE_NNTP
-      if (Context->magic == M_NNTP) {
-        mutt_flushinp ();
-        mutt_error _("Can't change 'important' flag on NNTP server.");
-
-        break;
-      }
-#endif
+      CHECK_MX_ACL (Context, ACL_WRITE, _("Flagging"));
 
       mutt_set_flag (Context, extra->hdr, M_FLAG, !extra->hdr->flagged);
       redraw = REDRAW_STATUS | REDRAW_INDEX;
@@ -2472,9 +2438,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
       CHECK_MODE (IsHeader (extra));
       CHECK_READONLY;
 
-#ifdef USE_IMAP
-      CHECK_IMAP_ACL (IMAP_ACL_SEEN);
-#endif
+      CHECK_MX_ACL (Context, ACL_SEEN, _("Toggling"));
 
       if (extra->hdr->read || extra->hdr->old)
         mutt_set_flag (Context, extra->hdr, M_NEW, 1);
@@ -2493,9 +2457,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
       CHECK_MODE (IsHeader (extra));
       CHECK_READONLY;
 
-#ifdef USE_IMAP
-      CHECK_IMAP_ACL (IMAP_ACL_DELETE);
-#endif
+      CHECK_MX_ACL (Context, ACL_DELETE, _("Undeletion"));
 
       mutt_set_flag (Context, extra->hdr, M_DELETE, 0);
       mutt_set_flag (Context, extra->hdr, M_PURGED, 0);
@@ -2511,9 +2473,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
       CHECK_MODE (IsHeader (extra));
       CHECK_READONLY;
 
-#ifdef USE_IMAP
-      CHECK_IMAP_ACL (IMAP_ACL_DELETE);
-#endif
+      CHECK_MX_ACL (Context, ACL_DELETE, _("Undeletion"));
 
       r = mutt_thread_set_flag (extra->hdr, M_DELETE, 0,
                                 ch == OP_UNDELETE_THREAD ? 0 : 1)
@@ -2539,7 +2499,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
       break;
 
     case OP_BUFFY_LIST:
-      mutt_buffy_list ();
+      buffy_list ();
       redraw |= REDRAW_SIDEBAR;
       break;