X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fstatus.c;h=b94f551872c4d788aa172ad4adb5adc93ccdc8cc;hp=9c4bdf9f882c382b142242f2ecfbe99bdeb2d5fe;hb=819c071fa7efc8dffb4dd92f36f0111227ff692f;hpb=b23d5033080fe9f9fba038e3cf1e3ec2b0a0d33d

diff --git a/lib-ui/status.c b/lib-ui/status.c
index 9c4bdf9..b94f551 100644
--- 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 (Hostname));
+    snprintf (buf, buflen, fmt, NONULL (mod_core.shorthost));
     break;
 
   case 'f':
@@ -256,7 +253,7 @@ status_format_str(char *buf, ssize_t buflen, char op, const char *src,
     break;
 
   case 'v':
-    m_strcpy(buf, buflen, mutt_make_version(0));
+    m_strcpy(buf, buflen, madmutt_version);
     break;
 
   case 'V':
@@ -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);
 }