Make mutt-nntp depend on mutt >= 1.5.21-5

[software/mutt-debian.git] / status.c

diff --git a/status.c b/status.c
index 09f76db3953b1ed837ba3b91a943efeb58d4a74e..1bb9a5a45b6713b4f1aa372f4093e45e98ed1950 100644 (file)
--- a/status.c
+++ b/status.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
+ * Copyright (C) 1996-2000,2007 Michael R. Elkins <me@mutt.org>
  * 
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -99,7 +99,7 @@ status_format_str (char *buf, size_t buflen, size_t col, char op, const char *sr
       if (Context && Context->path)
       {
        strfcpy (tmp, Context->path, sizeof (tmp));
-       mutt_pretty_mailbox (tmp);
+       mutt_pretty_mailbox (tmp, sizeof (tmp));
       }
       else
        strfcpy (tmp, _("(no mailbox)"), sizeof (tmp));
@@ -209,17 +209,15 @@ status_format_str (char *buf, size_t buflen, size_t col, char op, const char *sr
 
     case 'r':
     {
-      int i = 0;
+      size_t 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);
+          Context->dontwrite) ? 2 : (Context->changed ||
+          /* deleted doesn't necessarily mean changed in IMAP */
+          (Context->magic != M_IMAP &&
+           Context->deleted)) ? 1 : 0);
       }
       
       if (!StChars)