#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)
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;
case 'B':
snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
- if (Context && Context->compressinfo && Context->realpath) {
+ if (Context && Context->cinfo && Context->realpath) {
if ((p = strrchr (Context->realpath, '/')))
m_strcpy(tmp, sizeof(tmp), p + 1);
else
case 'f':
snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
- if (Context && Context->compressinfo && Context->realpath) {
+ if (Context && Context->cinfo && Context->realpath) {
m_strcpy(tmp, sizeof(tmp), Context->realpath);
mutt_pretty_mailbox (tmp);
- }
- else
+ } else
if (Context && Context->path) {
m_strcpy(tmp, sizeof(tmp), Context->path);
mutt_pretty_mailbox (tmp);
- }
- else
+ } else {
m_strcpy(tmp, sizeof(tmp), _("(no mailbox)"));
+ }
snprintf (buf, buflen, fmt, tmp);
break;
* 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);
}