fixes in the sidebar format, was completely braindead.

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

diff --git a/lib-ui/status.c b/lib-ui/status.c
index 28b1329..3da31d9 100644 (file)
--- a/lib-ui/status.c
+++ b/lib-ui/status.c
@@ -11,10 +11,10 @@
 
 #include <lib-ui/curses.h>
 #include <lib-ui/menu.h>
+#include <lib-mx/mx.h>
 
 #include "mutt.h"
 #include "sort.h"
-#include "mx.h"
 #include "buffy.h"
 
 #define SW              (option(OPTMBOXPANE)?SidebarWidth:0)
@@ -52,7 +52,7 @@ static const char *status_format_str (char *buf, ssize_t buflen, char op,
                                       const char *elsestring,
                                       unsigned long data, format_flag flags)
 {
-  char fmt[SHORT_STRING], tmp[SHORT_STRING];
+  char fmt[STRING], tmp[STRING];
   const char *cp, *p;
   int count, optional = (flags & M_FORMAT_OPTIONAL);
   MUTTMENU *menu = (MUTTMENU *) data;
@@ -293,7 +293,7 @@ void menu_status_line (char* buf, ssize_t len, MUTTMENU* menu, const char* p) {
    * only to not wrap past end of screen
    */
   int width = COLS - SW;
-  mutt_FormatString (buf, (width >= len ? len : (width + 1)),
+  m_strformat (buf, (width >= len ? len : (width + 1)),
                      p, status_format_str,
                      (unsigned long) menu, 0);
 }