* 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>
#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",
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':
break;
case 'v':
- m_strcpy(buf, buflen, mutt_make_version());
+ m_strcpy(buf, buflen, madmutt_version);
break;
case 'V':
case 0:
*buf = 0;
- return (src);
+ return src;
default:
*buf = 0;
if (flags & M_FORMAT_OPTIONAL)
menu_status_line(buf, buflen, menu, optional ? ifstr : elstr);
- return (src);
+ return 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);
}