X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-ui%2Fstatus.c;h=b2b3835f65135dce2643dbd29cb29f7e0ac826dc;hb=e518a71f587454ec71cbdd6b37246f77235d4143;hp=2dbf7e7c850f9ae6debefca74f84b6f1b04ddb6e;hpb=1ee89902de184a640c171ae3285bff6882a791bd;p=apps%2Fmadmutt.git

diff --git a/lib-ui/status.c b/lib-ui/status.c
index 2dbf7e7..b2b3835 100644
--- 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;
@@ -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;