Fix madmutt for stupid terms with only 64 colors.

[apps/madmutt.git] / lib-ui / status.c

diff --git a/lib-ui/status.c b/lib-ui/status.c
index 2ca8f9d..a6f0211 100644 (file)
--- a/lib-ui/status.c
+++ b/lib-ui/status.c
@@ -7,9 +7,8 @@
  * please see the file GPL in the top level source directory.
  */
 
-#include <lib-lib/lib-lib.h>
+#include <lib-ui/lib-ui.h>
 
-#include <lib-ui/curses.h>
 #include <lib-ui/menu.h>
 #include <lib-mx/mx.h>
 
@@ -17,8 +16,6 @@
 #include "sort.h"
 #include "buffy.h"
 
-#define SW              (option(OPTMBOXPANE)?SidebarWidth:0)
-
 static char *get_sort_str (char *buf, ssize_t buflen, int method)
 {
   snprintf (buf, buflen, "%s%s%s",
@@ -98,7 +95,7 @@ status_format_str(char *buf, ssize_t buflen, char op, const char *src,
 
   case 'h':
     snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
-    snprintf (buf, buflen, fmt, NONULL (MCore.shorthost));
+    snprintf (buf, buflen, fmt, NONULL (mod_core.shorthost));
     break;
 
   case 'f':
@@ -286,5 +283,5 @@ status_format_str(char *buf, ssize_t buflen, char op, const char *src,
 
 void menu_status_line(char* buf, ssize_t len, MUTTMENU* menu, const char* p)
 {
-    m_strformat(buf, len, COLS - SW, p, status_format_str, menu, 0);
+    m_strformat(buf, len, getmaxx(main_w), p, status_format_str, menu, 0);
 }