X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=status.c;h=18c96846b95cc3ad59842f67a2f996dff1551aaf;hp=f8ffd92fa3d164008851d81d070c00bf9c9d3357;hb=dbb9a1e16d03a2d4664d6dc6a30c721b889d4982;hpb=91d0c04349c9345f0ee29a61cc18dfc144b60edc

diff --git a/status.c b/status.c
index f8ffd92..18c9684 100644
--- a/status.c
+++ b/status.c
@@ -16,9 +16,10 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/mapping.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
 #include "mutt_menu.h"
-#include "mutt_curses.h"
 #include "sort.h"
 #include "mx.h"
 #include "buffy.h"
@@ -55,7 +56,7 @@ static char *get_sort_str (char *buf, size_t buflen, int method)
  * %s = current sorting method ($sort)
  * %S = current aux sorting method ($sort_aux)
  * %t = # of tagged messages [option]
- * %v = Mutt-ng version 
+ * %v = Madmutt version 
  * %V = currently active limit pattern [option] */
 static const char *status_format_str (char *buf, size_t buflen, char op,
                                       const char *src, const char *prefix,
@@ -81,7 +82,6 @@ static const char *status_format_str (char *buf, size_t buflen, char op,
 
   case 'B':
     snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
-#ifdef USE_COMPRESSED
     if (Context && Context->compressinfo && Context->realpath) {
       if ((p = strrchr (Context->realpath, '/')))
         m_strcpy(tmp, sizeof(tmp), p + 1);
@@ -89,7 +89,6 @@ static const char *status_format_str (char *buf, size_t buflen, char op,
         m_strcpy(tmp, sizeof(tmp), Context->realpath);
     }
     else
-#endif
     if (Context && Context->path) {
       if ((p = strrchr (Context->path, '/')))
         m_strcpy(tmp, sizeof(tmp), p + 1);
@@ -117,13 +116,11 @@ static const char *status_format_str (char *buf, size_t buflen, char op,
 
   case 'f':
     snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
-#ifdef USE_COMPRESSED
     if (Context && Context->compressinfo && Context->realpath) {
       m_strcpy(tmp, sizeof(tmp), Context->realpath);
       mutt_pretty_mailbox (tmp);
     }
     else
-#endif
     if (Context && Context->path) {
       m_strcpy(tmp, sizeof(tmp), Context->path);
       mutt_pretty_mailbox (tmp);
@@ -226,21 +223,11 @@ static const char *status_format_str (char *buf, size_t buflen, char op,
       int i = 0;
 
       if (Context) {
-        i = option (OPTATTACHMSG) ? 3 : ((Context->readonly ||
-                                          Context->dontwrite) ? 2 : (Context->
-                                                                     changed
-                                                                     || (
-#ifdef USE_IMAP
-                                                                             /* deleted doesn't necessarily mean changed in IMAP */
-                                                                             Context->
-                                                                             magic
-                                                                             !=
-                                                                             M_IMAP
-                                                                             &&
-#endif
-                                                                             Context->
-                                                                             deleted))
-                                         ? 1 : 0);
+        /* XXX: deleted doesn't necessarily mean changed in IMAP */
+        i = option (OPTATTACHMSG) ? 3
+            : ((Context->readonly || Context->dontwrite) ? 2
+               : (Context->changed || (Context-> magic != M_IMAP && Context->
+                                        deleted)) ? 1 : 0);
       }
 
       if (!StChars)