* IMAP FETCH FLAGS ... removed extra trailing space after last flag

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 13d0a4d62955019181bdf757043eb6da0fb7d2e3..e41eafbffd98ca93d4df9ad60d779b7138bb9d33 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 611.2  2003/11/08 06:29:47  ajc
+ * IMAP FETCH FLAGS ... removed extra trailing space after last flag
+
  Revision 611.1  2003/11/06 04:25:30  ajc
  * For certain IMAP outputs (such as BODYSTRUCTURE), buffer all output until
    we've got the whole thing, then spew it all at once to avoid lots of
@@ -5062,4 +5065,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/imap_fetch.c b/citadel/imap_fetch.c
index d3254473e71a134cf95693e59a7a265f75a86e45..b23768b869d3bcbcefb036031b94a8c74ce69cfc 100644 (file)
--- a/citadel/imap_fetch.c
+++ b/citadel/imap_fetch.c
@@ -70,9 +70,18 @@ void imap_fetch_uid(int seq) {
 }
 
 void imap_fetch_flags(int seq) {
+       int num_flags_printed = 0;
        cprintf("FLAGS (");
-       if (IMAP->flags[seq] & IMAP_DELETED) cprintf("\\Deleted ");
-       if (IMAP->flags[seq] & IMAP_SEEN) cprintf("\\Seen ");
+       if (IMAP->flags[seq] & IMAP_DELETED) {
+               if (num_flags_printed > 0) cprintf(" ");
+               cprintf("\\Deleted");
+               ++num_flags_printed;
+       }
+       if (IMAP->flags[seq] & IMAP_SEEN) {
+               if (num_flags_printed > 0) cprintf(" ");
+               cprintf("\\Seen");
+               ++num_flags_printed;
+       }
        cprintf(")");
 }