X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Frfc3676.c;h=bc47b8500b9740afa2be7c04b1bdc95df3755661;hp=0ca9ff74ce114a7c7a22617d30e304354e8f6392;hb=6d838d9aef36d95fa439b3f7cc06d4e81c8581bd;hpb=558b0bd9de90a9dc28f409d8f46679bf48c72ded

diff --git a/lib-mime/rfc3676.c b/lib-mime/rfc3676.c
index 0ca9ff7..bc47b85 100644
--- a/lib-mime/rfc3676.c
+++ b/lib-mime/rfc3676.c
@@ -13,7 +13,7 @@
 
 #include <utime.h>
 
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
 
 #include "state.h"
 #include "rfc3676.h"
@@ -42,15 +42,12 @@ static void print_flowed_line (char *line, STATE * s, int ql) {
       width = MaxLineLength;
   }
   else {
-    if (option (OPTMBOXPANE))
-      width = COLS - SidebarWidth - WrapMargin - ql - 1;
-    else
-      width = COLS - WrapMargin - ql - 1;
+    width = getmaxx(main_w) - WrapMargin - ql - 1;
 
     if (!(s->flags & M_REPLYING) && option (OPTSTUFFQUOTED))
       --width;
     if (width < 0)
-      width = COLS;
+      width = getmaxx(main_w);
   }
 
   if (m_strlen(line) == 0) {
@@ -199,7 +196,7 @@ int rfc3676_handler (BODY * a, STATE * s) {
 
   }
   p_delete(&curline);
-  return (0);
+  return 0;
 }
 
 /* sets mtime of 'to' to mtime of 'from' */
@@ -225,7 +222,7 @@ void rfc3676_space_stuff (HEADER* hdr) {
   if ((in = safe_fopen (hdr->content->filename, "r")) == NULL)
     return;
 
-  out = m_tempfile(tmpf, sizeof(tmpf), NONULL(MCore.tmpdir), NULL);
+  out = m_tempfile(tmpf, sizeof(tmpf), NONULL(mod_core.tmpdir), NULL);
   if (!out) {
     m_fclose(&in);
     return;