Rocco Rutte:

- revert USE_SOCKET wrapping in imap/ for mutt_progress_bar() as of r495

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@501 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/VERSION.svn b/VERSION.svn
index 1b79f38..c15fb72 100644 (file)
--- a/VERSION.svn
+++ b/VERSION.svn
@@ -1 +1 @@
-500
+501

diff --git a/imap/imap.c b/imap/imap.c
index 4f0395f..cc9f60c 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -211,10 +211,8 @@ int imap_read_literal (FILE * fp, IMAP_DATA * idata, long bytes, progress_t* bar
       r = 0;
 #endif
     fputc (c, fp);
       r = 0;
 #endif
     fputc (c, fp);

-#ifdef USE_SOCKET

     if (bar && pos % 1024)
       mutt_progress_bar (bar, pos);
     if (bar && pos % 1024)
       mutt_progress_bar (bar, pos);

-#endif

 #ifdef DEBUG
     if (DebugLevel >= IMAP_LOG_LTRL)
       fputc (c, DebugFile);
 #ifdef DEBUG
     if (DebugLevel >= IMAP_LOG_LTRL)
       fputc (c, DebugFile);

diff --git a/imap/message.c b/imap/message.c
index 949ca2c..58fe61f 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...");
           }
           bar.size = bytes;
           bar.msg = _("Fetching message...");

-#ifdef USE_SOCKET

           mutt_progress_bar (&bar, 0);
           mutt_progress_bar (&bar, 0);

-#endif

           if (imap_read_literal (msg->fp, idata, bytes, &bar) < 0)
             goto bail;
           /* pick up trailing line */
           if (imap_read_literal (msg->fp, idata, bytes, &bar) < 0)
             goto bail;
           /* pick up trailing line */


@@ -529,9 +527,7 @@ int imap_append_message (CONTEXT * ctx, MESSAGE * msg)
 
   bar.msg = _("Uploading message...");
   bar.size = len;
 
   bar.msg = _("Uploading message...");
   bar.size = len;

-#ifdef USE_SOCKET

   mutt_progress_bar (&bar, 0);
   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,
 
   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);
     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);

     }
   }
 
     }
   }