X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvcmd.c;h=d3059fffaf6b9d9a3e563b2553e788dae290c0d8;hp=28cfc165288bf7695659af8191f7475c3f3d3628;hb=0adb0e69973572d243ddbc54efece754aa6729c9;hpb=9946738a6a1c27a5602a14d1afe2eea2389732b2

diff --git a/recvcmd.c b/recvcmd.c
index 28cfc16..d3059ff 100644
--- a/recvcmd.c
+++ b/recvcmd.c
@@ -11,7 +11,7 @@
 
 #include <lib-mime/mime.h>
 
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
 #include <lib-ui/enter.h>
 #include <lib-ui/menu.h>
 #include <lib-mx/mx.h>
@@ -163,9 +163,9 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
             buf);
 
 #define extra_space (15+7+2)
-  if (m_strwidth(prompt) > COLS - extra_space) {
-    mutt_format_string (prompt, sizeof (prompt) - 4,
-                        0, COLS - extra_space, 0, 0,
+  if (m_strwidth(prompt) > getmaxx(main_w) - extra_space) {
+    mutt_format_string (prompt, sizeof (prompt) - 4, 0,
+                        getmaxx(main_w) - extra_space, 0, 0,
                         prompt, sizeof (prompt), 0);
     m_strcat(prompt, sizeof(prompt), "...?");
   } else {
@@ -175,12 +175,12 @@ void mutt_attach_bounce (FILE * fp, HEADER * hdr __attribute__ ((unused)),
 
   if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) {
     address_list_wipe(&adr);
-    CLEARLINE (LINES - 1);
+    CLEARLINE(main_w, LINES - 1);
     mutt_message (p ? _("Message not bounced.") : _("Messages not bounced."));
     return;
   }
 
-  CLEARLINE (LINES - 1);
+  CLEARLINE(main_w, LINES - 1);
 
   if (cur)
     ret = mutt_bounce_message (fp, cur->hdr, adr);