X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pager.c;h=19a8c70ab7f38f770b8fc6f6d431fc8029e78e0a;hp=eee9b8393290123f17fe8aa42e11db5e0471a45b;hb=690944eebbe058753a56dd10a455943507dc44e7;hpb=7dcd7ee09b8760133ac8ec00562e4d60b2f0aebd

diff --git a/pager.c b/pager.c
index eee9b83..19a8c70 100644
--- a/pager.c
+++ b/pager.c
@@ -817,10 +817,6 @@ fill_buffer (FILE * f, off_t *last_pos, off_t offset, unsigned char *buf,
     return b_read;
 }
 
-#ifdef USE_NNTP
-#include "nntp.h"
-#endif
-
 static int format_line (struct line_t **lineInfo, int n, unsigned char *buf,
                         int flags, ansi_attr * pa, int cnt,
                         int *pspace, int *pvch, int *pcol, int *pspecial)
@@ -1238,16 +1234,11 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
   int bodylen = LINES - 2 - bodyoffset; /* length of displayable area */
 
   MUTTMENU *pager_index = NULL;       /* the Pager Index (PI) */
-  int indexoffset = 0;          /* offset for the PI */
-  int indexlen = PagerIndexLines;       /* indexlen not always == PIL */
+  int indexlen = PagerIndexLines;     /* indexlen not always == PIL */
   int indicator = indexlen / 3; /* the indicator line of the PI */
   int old_PagerIndexLines;      /* some people want to resize it
                                  * while inside the pager... */
 
-#ifdef USE_NNTP
-  char *followup_to;
-#endif
-
   if (!(flags & M_SHOWCOLOR))
     flags |= M_SHOWFLAT;
 
@@ -1296,11 +1287,10 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
 
       indicator = indexlen / 3;
 
-      indexoffset = 0;
       statusoffset = IsHeader (extra) ? indexlen : 0;
-      bodyoffset = statusoffset + 1;
-      helpoffset = LINES - 2;
-      bodylen = helpoffset - bodyoffset;
+      bodyoffset   = statusoffset + 1;
+      helpoffset   = LINES - 2;
+      bodylen      = helpoffset - bodyoffset;
 
       SETCOLOR(main_w, MT_COLOR_STATUS);
       wmove(main_w, helpoffset, 0);
@@ -1333,8 +1323,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
         }
 
         SETCOLOR(main_w, MT_COLOR_NORMAL);
-        pager_index->offset = indexoffset + 1;
-
+        pager_index->offset  = 1;
         pager_index->pagelen = indexlen - 1;
 
         /* some fudge to work out where abouts the indicator should go */
@@ -1447,17 +1436,15 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
       sidebar_draw ();
       /* print out the pager_index status bar */
       menu_status_line (buffer, sizeof (buffer), pager_index, NONULL (Status));
-      wmove(main_w, indexoffset + 0, 0);
+      wmove(main_w, 0, 0);
       SETCOLOR(main_w, MT_COLOR_STATUS);
       BKGDSET(main_w, MT_COLOR_STATUS);
       mutt_paddstr(main_w, getmaxx(main_w), buffer);
       SETCOLOR(main_w, MT_COLOR_NORMAL);
       BKGDSET(main_w, MT_COLOR_NORMAL);
     }
-    /* if we're not using the index, update every time */
-    if (index == 0)
-      sidebar_draw ();
 
+    sidebar_draw ();
     redraw = 0;
     mutt_refresh();
 
@@ -2055,70 +2042,6 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t * extra)
       redraw = REDRAW_FULL;
       break;
 
-#ifdef USE_NNTP
-    case OP_POST:
-      CHECK_MODE (IsHeader (extra) && !IsAttach (extra));
-      CHECK_ATTACH;
-      if (extra->ctx && extra->ctx->magic == M_NNTP &&
-          !((nntp_data_t *) extra->ctx->data)->allowed &&
-          query_quadoption (OPT_TOMODERATED,
-                            _
-                            ("Posting to this group not allowed, may be moderated. Continue?"))
-          != M_YES)
-        break;
-      ci_send_message (SENDNEWS, NULL, NULL, extra->ctx, NULL);
-      redraw = REDRAW_FULL;
-      break;
-
-    case OP_FORWARD_TO_GROUP:
-      CHECK_MODE (IsHeader (extra) || IsMsgAttach (extra));
-      CHECK_ATTACH;
-      if (extra->ctx && extra->ctx->magic == M_NNTP &&
-          !((nntp_data_t *) extra->ctx->data)->allowed &&
-          query_quadoption (OPT_TOMODERATED,
-                            _
-                            ("Posting to this group not allowed, may be moderated. Continue?"))
-          != M_YES)
-        break;
-      if (IsMsgAttach (extra))
-        mutt_attach_forward (extra->fp, extra->hdr, extra->idx,
-                             extra->idxlen, extra->bdy, SENDNEWS);
-      else
-        ci_send_message (SENDNEWS | SENDFORWARD, NULL, NULL, extra->ctx,
-                         extra->hdr);
-      redraw = REDRAW_FULL;
-      break;
-
-    case OP_FOLLOWUP:
-      CHECK_MODE (IsHeader (extra) || IsMsgAttach (extra));
-      CHECK_ATTACH;
-
-      if (IsMsgAttach (extra))
-        followup_to = extra->bdy->hdr->env->followup_to;
-      else
-        followup_to = extra->hdr->env->followup_to;
-
-      if (!followup_to || m_strcasecmp(followup_to, "poster") ||
-          query_quadoption (OPT_FOLLOWUPTOPOSTER,
-                            _("Reply by mail as poster prefers?")) != M_YES) {
-        if (extra->ctx && extra->ctx->magic == M_NNTP
-            && !((nntp_data_t *) extra->ctx->data)->allowed
-            && query_quadoption (OPT_TOMODERATED,
-                                 _
-                                 ("Posting to this group not allowed, may be moderated. Continue?"))
-            != M_YES)
-          break;
-        if (IsMsgAttach (extra))
-          mutt_attach_reply (extra->fp, extra->hdr, extra->idx,
-                             extra->idxlen, extra->bdy, SENDNEWS | SENDREPLY);
-        else
-          ci_send_message (SENDNEWS | SENDREPLY, NULL, NULL,
-                           extra->ctx, extra->hdr);
-        redraw = REDRAW_FULL;
-        break;
-      }
-#endif
-
     case OP_REPLY:
       CHECK_MODE (IsHeader (extra) || IsMsgAttach (extra));
       CHECK_ATTACH;