X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/14c29200cb58d3c4a0830265f2433849781858d0..84b9ea1689a8189d41ea4a821a1fd6cc446b9332:/status.c

diff --git a/status.c b/status.c
index 09f76db..1bb9a5a 100644
--- 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)