* Allow INBOX to have subfolders. There's no longer any reason not to.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 1032ca2c3d079497a2c934e1af6c7a07e8563837..d9124b135d589d755b544e3943acb0b4c0c6eb23 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 591.5  2002/04/09 14:26:43  ajc
+ * Allow INBOX to have subfolders.  There's no longer any reason not to.
+
  Revision 591.4  2002/04/05 22:31:59  error
  * Send time-of-day with pages sent via IMAP
 
@@ -3585,4 +3588,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/serv_imap.c b/citadel/serv_imap.c
index 1dae24ffa9fb8b0dac5bfb73290964e0257fcde4..dffdb5a5caa06f495da9fe3370e202ed82323373 100644 (file)
--- a/citadel/serv_imap.c
+++ b/citadel/serv_imap.c
@@ -527,11 +527,7 @@ void imap_lsub_listroom(struct quickroom *qrbuf, void *data) {
        if (ra & UA_KNOWN) {
                imap_mailboxname(buf, sizeof buf, qrbuf);
                if (imap_mailbox_matches_pattern(pattern, buf)) {
-                       cprintf("* LSUB (");
-                       if (!strcasecmp(buf, "INBOX")) {
-                               cprintf("\\NoInferiors");
-                       }
-                       cprintf(") \"|\" ");
+                       cprintf("* LSUB () \"|\" ");
                        imap_strout(buf);
                        cprintf("\r\n");
                }
@@ -580,11 +576,7 @@ void imap_list_listroom(struct quickroom *qrbuf, void *data) {
          || ((ra & UA_GOTOALLOWED) && (ra & UA_ZAPPED))) {
                imap_mailboxname(buf, sizeof buf, qrbuf);
                if (imap_mailbox_matches_pattern(pattern, buf)) {
-                       cprintf("* LIST (");
-                       if (!strcasecmp(buf, "INBOX")) {
-                               cprintf("\\NoInferiors");
-                       }
-                       cprintf(") \"|\" ");
+                       cprintf("* LIST () \"|\" ");
                        imap_strout(buf);
                        cprintf("\r\n");
                }