IMAP cosmetics from Brendan Cully.

5 files changed, 21 insertions, 37 deletions

diff --git a/imap/BUGS b/imap/BUGS
index 04d2e1a0..7574ca67 100644
--- a/imap/BUGS
+++ b/imap/BUGS
@@ -38,9 +38,7 @@ In no particular order:
       imap_sync_mailbox, otherwise shouldn't be too bad. Not currently a
       major priority, though - noone's gotten bit by this.
 
-* Have a hard time when the home namespace isn't default "".
-
 * The mutt_pretty routines don't work well when the delimiter isn't '/'.
 
 Brendan Cully <brendan@kublai.com>
-Updated 20000304
+Updated 20000704
diff --git a/imap/TODO b/imap/TODO
index 328cd0b0..c27817bd 100644
--- a/imap/TODO
+++ b/imap/TODO
@@ -1,6 +1,7 @@
 IMAP enhancements, by priority:
 
 [ -- socket -- ]
+
 * Smarter connection code. Mutt should handle dropped connections/routing
   problems gracefully. It should be able to transparently reconnect. This
   is facilitated by the next item.
@@ -14,26 +15,15 @@ IMAP enhancements, by priority:
   PRIORITY: [***]
 
 [ -- browsing -- ]
-* Investigate a new way of displaying folders with subfolders and messages.
-  Possibly we could use a tree-view in the browser, w/ expand, collapse.
-  For low-bandwidth lines we could defer getting subfolder lists until the
-  folder is expanded.
-  Current thought is that <ENTER> will select a mailbox if it doesn't have
-  subfolders or enter the folder if it does. If it has messages and subfolders,
-  we'll use a new key to select it as a mailbox.
-  We should maybe add a new imap_format string for IMAP browsing, without all
+
+* We should maybe add a new imap_format string for IMAP browsing, without all
   the stat variables but with tags like how many messages are in the folders,
   how many subfolders, that weird \Marked tag, etc.
  
   PRIORITY: [** ]
 
-* See if we can't add more info to the IMAP browser than just name (without
-  incurring too much overhead). eg which folders contain new mail, size,
-  number of messages.
-
-  PRIORITY: [** ]
-
 [ -- speed -- ]
+
 * Persistent caching of data. I think the nicest way to do this is to store
   local copies like IMAP does, with an invisible control message at the top,
   and extra invisible headers in the message (for UID/dirty bits). This does
@@ -57,9 +47,6 @@ IMAP enhancements, by priority:
   PRIORITY: [*  ]
 
 [ -- new features -- ]
-* Implement the received folder on IMAP, now that COPY is done
-
-  PRIORITY: [** ]
 
 * Commands for creating/deleting folders on the server, since users may not
   otherwise be able to do this on IMAP servers.
@@ -67,17 +54,9 @@ IMAP enhancements, by priority:
 
   PRIORITY: [** ]
 
-* Implement READ-ONLY support, and the x (quit without saving changes)
-  command.
+* Implement the x (quit without saving changes) command.
 
   PRIORITY: [** ]
 
-* Create a logout command, so users can reconnect with different account
-  information without quitting mutt. Note: Tommi Komulainen's
-  multiple-account code makes this unnecessary - just use an account of
-  the form {username@host}
-
-  PRIORITY: [*  ]
-
 Brendan Cully <brendan@kublai.com>
-Updated: 19991227
+Updated: 20000704
diff --git a/imap/auth.c b/imap/auth.c
index e321585a..c729da5d 100644
--- a/imap/auth.c
+++ b/imap/auth.c
@@ -374,7 +374,7 @@ int imap_authenticate (IMAP_DATA *idata, CONNECTION *conn)
     if (r == -1)
     {
       /* connection or protocol problem */
-      imap_error ("imap_open_connection()", buf);
+      imap_error ("imap_authenticate", buf);
       return (-1);
     }
     else if (r == -2)
diff --git a/imap/imap.c b/imap/imap.c
index a5323538..c796c2d5 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -529,7 +529,7 @@ int imap_open_mailbox (CONTEXT *ctx)
   IMAP_DATA *idata;
   char buf[LONG_STRING];
   char bufout[LONG_STRING];
-  char seq[16];
+  char seq[SEQLEN+1];
   int count = 0;
   int n;
   IMAP_MBOX mx;
@@ -556,7 +556,7 @@ int imap_open_mailbox (CONTEXT *ctx)
       idata->conn = conn;
     }
     if (imap_open_connection (idata, conn))
-      return (-1);
+      return -1;
   }
   ctx->data = (void *) idata;
 
diff --git a/imap/socket.c b/imap/socket.c
index faa6d8e1..2b97bca7 100644
--- a/imap/socket.c
+++ b/imap/socket.c
@@ -99,10 +99,16 @@ int mutt_socket_read_line_d (char *buf, size_t buflen, CONNECTION *conn)
   return r;
 }
 
-static int imap_user_match (const IMAP_MBOX *m1, const IMAP_MBOX *m2)
+/* imap_account_match: compare account info (host/port/user) */
+static int imap_account_match (const IMAP_MBOX *m1, const IMAP_MBOX *m2)
 {
   const char *user = ImapUser ? ImapUser : NONULL (Username);
 
+  if (mutt_strcasecmp (m1->host, m2->host))
+    return 0;
+  if (m1->port != m2->port)
+    return 0;
+  
   if (m1->flags & m2->flags & M_IMAP_USER)
     return (!strcmp (m1->user, m2->user));
   if (m1->flags & M_IMAP_USER)
@@ -121,7 +127,7 @@ CONNECTION *mutt_socket_select_connection (const IMAP_MBOX *mx, int newconn)
     conn = Connections;
     while (conn)
     {
-      if (!mutt_strcasecmp (mx->host, conn->mx.host) && (mx->port == conn->mx.port) && imap_user_match (mx, &conn->mx))
+      if (imap_account_match (mx, &conn->mx))
 	return conn;
       conn = conn->next;
     }
@@ -254,8 +260,9 @@ int raw_socket_open (CONNECTION *conn)
   sin.sin_family = AF_INET;
   if ((he = gethostbyname (conn->mx.host)) == NULL)
   {
-    mutt_perror (conn->mx.host);
-    return (-1);
+    mutt_error (_("Could not find the host \"%s\""), conn->mx.host);
+	
+    return -1;
   }
   memcpy (&sin.sin_addr, he->h_addr_list[0], he->h_length);