X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fbrowse.c;fp=imap%2Fbrowse.c;h=7cff939e595a40e8af730764574d890bc2e8cb41;hp=2cc16f8fa926f1bd5ca58068efa8d64d1e405480;hb=23e6291cb5d5b4cd2008403d8b628007fd75ff23;hpb=56025510c87ad388a257fcbd8b369b0edcf97c34

diff --git a/imap/browse.c b/imap/browse.c
index 2cc16f8..7cff939 100644
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -21,7 +21,6 @@
 #include <lib-lib/str.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
-#include <lib-lib/debug.h>
 
 #include <lib-ui/enter.h>
 
@@ -105,8 +104,6 @@ int imap_browse (char *path, struct browser_state *state)
     m_strcpy(mbox, sizeof(mbox), buf);
     n = m_strlen(mbox);
 
-    debug_print (3, ("mbox: %s\n", mbox));
-
     /* if our target exists and has inferiors, enter it if we
      * aren't already going to */
     if (mbox[n - 1] != idata->delim) {
@@ -154,7 +151,6 @@ int imap_browse (char *path, struct browser_state *state)
       mbox[n] = '\0';
 
       if (showparents) {
-        debug_print (3, ("adding parent %s\n", mbox));
         imap_add_folder (idata->delim, mbox, 1, 0, state, 1);
       }
 
@@ -194,17 +190,14 @@ int imap_browse (char *path, struct browser_state *state)
     /* Listing the home namespace, so INBOX should be included. Home 
      * namespace is not "", so we have to list it explicitly. We ask the 
      * server to see if it has descendants. */
-    debug_print (3, ("adding INBOX\n"));
     if (browse_add_list_result (idata, "string_list_t \"\" \"INBOX\"", state, 0))
       goto fail;
   }
 
   nsup = state->entrylen;
 
-  debug_print (3, ("Quoting mailbox scan: %s:\n", mbox));
   snprintf (buf, sizeof (buf), "%s%%", mbox);
   imap_quote_string (buf2, sizeof (buf2), buf);
-  debug_print (3, ("%s\n", buf2));
   snprintf (buf, sizeof (buf), "%s \"\" %s", list_cmd, buf2);
   if (browse_add_list_result (idata, buf, state, 0))
     goto fail;
@@ -225,7 +218,6 @@ int imap_browse (char *path, struct browser_state *state)
       if (nsi[i].listable && !nsi[i].home_namespace) {
         imap_add_folder (nsi[i].delim, nsi[i].prefix, nsi[i].noselect,
                          nsi[i].noinferiors, state, 0);
-        debug_print (3, ("adding namespace: %s\n", nsi[i].prefix));
       }
   }
 
@@ -251,12 +243,10 @@ int imap_mailbox_create (const char *folder)
   short n;
 
   if (imap_parse_path (folder, &mx) < 0) {
-    debug_print (1, ("Bad starting path %s\n", folder));
     return -1;
   }
 
   if (!(idata = imap_conn_find (&mx.account, M_IMAP_CONN_NONEW))) {
-    debug_print (1, ("Couldn't find open connection to %s\n", mx.account.host));
     goto fail;
   }
 
@@ -301,12 +291,10 @@ int imap_mailbox_rename (const char *mailbox)
   char newname[SHORT_STRING];
 
   if (imap_parse_path (mailbox, &mx) < 0) {
-    debug_print (1, ("Bad source mailbox %s\n", mailbox));
     return -1;
   }
 
   if (!(idata = imap_conn_find (&mx.account, M_IMAP_CONN_NONEW))) {
-    debug_print (1, ("Couldn't find open connection to %s\n", mx.account.host));
     goto fail;
   }
 
@@ -348,7 +336,6 @@ static int browse_add_list_result (IMAP_DATA * idata, const char *cmd,
   IMAP_MBOX mx;
 
   if (imap_parse_path (state->folder, &mx)) {
-    debug_print (2, ("current folder %s makes no sense\n", state->folder));
     return -1;
   }
 
@@ -507,7 +494,6 @@ static int browse_get_namespace (IMAP_DATA * idata, char *nsbuf, int nsblen,
             }
             /* skip "" namespaces, they are already listed at the root */
             if ((ns[0] != '\0') && (nsbused < nsblen) && (*nns < nsilen)) {
-              debug_print (3, ("adding %s\n", ns));
               nsi->type = type;
               /* Cyrus doesn't append the delimiter to the namespace,
                * but UW-IMAP does. We'll strip it here and add it back