Rocco Rutte:

[apps/madmutt.git] / imap / message.c

diff --git a/imap/message.c b/imap/message.c
index 949ca2c..64bf434 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -398,9 +398,7 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
           }
           bar.size = bytes;
           bar.msg = _("Fetching message...");
-#ifdef USE_SOCKET
           mutt_progress_bar (&bar, 0);
-#endif
           if (imap_read_literal (msg->fp, idata, bytes, &bar) < 0)
             goto bail;
           /* pick up trailing line */
@@ -465,7 +463,7 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
     fgets (buf, sizeof (buf), msg->fp);
   }
 
-  h->content->length = ftell (msg->fp) - h->content->offset;
+  h->content->length = ftello (msg->fp) - h->content->offset;
 
   /* This needs to be done in case this is a multipart message */
 #if defined(HAVE_PGP) || defined(HAVE_SMIME)
@@ -529,9 +527,7 @@ int imap_append_message (CONTEXT * ctx, MESSAGE * msg)
 
   bar.msg = _("Uploading message...");
   bar.size = len;
-#ifdef USE_SOCKET
   mutt_progress_bar (&bar, 0);
-#endif
 
   imap_munge_mbox_name (mbox, sizeof (mbox), mailbox);
   snprintf (buf, sizeof (buf), "APPEND %s (%s%s%s%s%s) {%lu}", mbox,
@@ -571,9 +567,7 @@ int imap_append_message (CONTEXT * ctx, MESSAGE * msg)
     if (len > sizeof (buf) - 3) {
       sent += len;
       flush_buffer (buf, &len, idata->conn);
-#ifdef USE_SOCKET
-    mutt_progress_bar (&bar, sent);
-#endif
+      mutt_progress_bar (&bar, sent);
     }
   }