Move the rest of mutt "things" into a window as well.

[apps/madmutt.git] / recvattach.c

diff --git a/recvattach.c b/recvattach.c
index ba30804..91d6434 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -25,8 +25,6 @@
 #include "attach.h"
 #include "copy.h"
 
-#define SW    (option(OPTMBOXPANE)?SidebarWidth:0)
-
 void mutt_update_tree (ATTACHPTR ** idx, short idxlen)
 {
   char buf[STRING];
@@ -306,7 +304,7 @@ mutt_attach_fmt(char *dest, ssize_t destlen, char op, const char *src,
 
 static void attach_entry(char *b, ssize_t blen, MUTTMENU * menu, int num)
 {
-    m_strformat(b, blen, COLS - SW, AttachFormat, mutt_attach_fmt,
+    m_strformat(b, blen, getmaxx(main_w), AttachFormat, mutt_attach_fmt,
                 ((ATTACHPTR **) menu->data)[num], 0);
 }
 
@@ -486,7 +484,7 @@ mutt_query_pipe_attachment(char *command, FILE * fp, BODY * body, int afilter)
              _("WARNING!  You are about to overwrite %s, continue?"),
              body->filename);
     if (mutt_yesorno (warning, M_NO) != M_YES) {
-      CLEARLINE (LINES - 1);
+      CLEARLINE(main_w, LINES - 1);
       return;
     }
     tempfd = m_tempfd(tfile, sizeof(tfile), NONULL(mod_core.tmpdir), NULL);