X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fstatus.c;h=b19bf2435a17a4490552d44f99f6d38df625623e;hp=2dbf7e7c850f9ae6debefca74f84b6f1b04ddb6e;hb=f3cbb9f51357972f6e74244494236a41dc4d84cd;hpb=1ee89902de184a640c171ae3285bff6882a791bd diff --git a/lib-ui/status.c b/lib-ui/status.c index 2dbf7e7..b19bf24 100644 --- a/lib-ui/status.c +++ b/lib-ui/status.c @@ -11,10 +11,10 @@ #include #include +#include #include "mutt.h" #include "sort.h" -#include "mx.h" #include "buffy.h" #define SW (option(OPTMBOXPANE)?SidebarWidth:0) @@ -70,7 +70,7 @@ static const char *status_format_str (char *buf, ssize_t buflen, char op, 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 @@ -104,17 +104,16 @@ static const char *status_format_str (char *buf, ssize_t buflen, char op, 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;