X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fimap.c;h=83bb6da48070788ffae24b7bdd1af54332e986d6;hp=15f02f249f65d5a65497c41da9b4e6fb785ffc49;hb=98f62b5fcbd680fd5214ee85e1635b84322cbdd1;hpb=2e0d58d93811d43a16f078562cbfa1526c96a371;ds=sidebyside

diff --git a/imap/imap.c b/imap/imap.c
index 15f02f2..83bb6da 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -18,7 +18,6 @@
 #include "globals.h"
 #include "pattern.h"
 #include "sort.h"
-#include "browser.h"
 #include "message.h"
 #include "imap_private.h"
 #include "buffy.h"
@@ -384,17 +383,15 @@ int imap_open_connection (IMAP_DATA * idata)
 
       if (mod_ssl.force_tls)
         rc = M_YES;
-      else if (mod_ssl.starttls) {
+      else {
         if ((rc = imap_exec (idata, "STARTTLS", IMAP_CMD_FAIL_OK)) == -1)
           goto bail;
         if (rc != -2) {
-          if (mutt_ssl_starttls (idata->conn))
-          {
+          if (mutt_ssl_starttls (idata->conn)) {
             mutt_error (_("Could not negotiate TLS connection"));
             mutt_sleep (1);
             goto err_close_conn;
-          }
-          else {
+          } else {
             /* RFC 2595 demands we recheck CAPABILITY after TLS completes. */
             if (imap_exec (idata, "CAPABILITY", 0))
               goto bail;
@@ -650,7 +647,7 @@ int imap_open_mailbox_append (CONTEXT * ctx)
 
   if (!(idata = imap_conn_find (&(mx.account), 0))) {
     p_delete(&mx.mbox);
-    return (-1);
+    return -1;
   }
   conn = idata->conn;
 
@@ -672,7 +669,7 @@ int imap_open_mailbox_append (CONTEXT * ctx)
   if (imap_create_mailbox (idata, mailbox) < 0)
     return -1;
 
-  return (0);
+  return 0;
 }
 
 /* imap_logout: Gracefully log out of server. */
@@ -1336,7 +1333,6 @@ int imap_subscribe (char *path, int subscribe)
   IMAP_DATA *idata;
   char buf[LONG_STRING];
   char mbox[LONG_STRING];
-  char errstr[STRING];
   IMAP_MBOX mx;
 
   if (mx_get_magic (path) != M_IMAP || imap_parse_path (path, &mx) < 0) {
@@ -1398,7 +1394,7 @@ static int imap_complete_hosts (char *dest, ssize_t len) {
 
   matchlen = m_strlen(dest);
   if (!Incoming.len)
-    return (-1);
+    return -1;
   for (i = 0; i < Incoming.len; i++) {
     mailbox = Incoming.arr[i];
     if (!m_strncmp(dest, mailbox->path, matchlen)) {
@@ -1526,7 +1522,7 @@ int imap_reconnect (CONTEXT * ctx)
   IMAP_DATA *imap_data;
 
   if (!ctx)
-    return (-1);
+    return -1;
 
   imap_data = (IMAP_DATA *) ctx->data;
 
@@ -1544,12 +1540,12 @@ int imap_reconnect (CONTEXT * ctx)
   return 0;
 }
 
-int imap_is_magic (const char* path, struct stat* st __attribute__ ((unused))) {
+static int imap_is_magic (const char* path, struct stat* st __attribute__ ((unused))) {
   url_scheme_t s;
   if (!path || !*path)
-    return (-1);
+    return -1;
   s = url_check_scheme (NONULL (path));
-  return ((s == U_IMAP || s == U_IMAPS) ? M_IMAP : -1);
+  return (s == U_IMAP || s == U_IMAPS) ? M_IMAP : -1;
 }
 
 static int acl_check_imap (CONTEXT* ctx, int bit) {
@@ -1578,7 +1574,7 @@ static int imap_open_new_message (MESSAGE * msg,
 static int _imap_check_mailbox (CONTEXT* ctx,
                                 int* index_hint,
                                 int lock __attribute__ ((unused))) {
-  return (imap_check_mailbox (ctx, index_hint, 0));
+  return imap_check_mailbox (ctx, index_hint, 0);
 }
 
 static int imap_commit_message (MESSAGE* msg, CONTEXT* ctx) {
@@ -1586,7 +1582,7 @@ static int imap_commit_message (MESSAGE* msg, CONTEXT* ctx) {
 
   if ((r = m_fclose(&msg->fp)) == 0)
     r = imap_append_message (ctx, msg);
-  return (r);
+  return r;
 }
 
 mx_t const imap_mx = {
@@ -1597,6 +1593,7 @@ mx_t const imap_mx = {
     imap_access,
     imap_open_mailbox,
     imap_open_new_message,
+    imap_fetch_message,
     acl_check_imap,
     _imap_check_mailbox,
     imap_close_mailbox,