[SCM] GNU Mailutils branch, master, updated. rel-2_1-1-g3f69e16

[Sergey Poznyakoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=3f69e162d9849ef1783a662011bf25ca71a1d7a5

The branch, master has been updated
       via  3f69e162d9849ef1783a662011bf25ca71a1d7a5 (commit)
      from  1c1539fff7f954dc8f3f1183e66e7bc2baf85210 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3f69e162d9849ef1783a662011bf25ca71a1d7a5
Author: Sergey Poznyakoff <address@hidden>
Date:   Thu Sep 24 16:55:22 2009 +0300

    Bugfix
    
    * libproto/mbox/mboxscan.c (mbox_scan_internal): Fix
    body size calculation: -1 was returned for empty body.
    Bug reported by Con Tassios <address@hidden>.
    * po/POTFILES.in: Add mail/mailvar.c

-----------------------------------------------------------------------

Summary of changes:
 libproto/mbox/mboxscan.c |    6 +++---
 po/POTFILES.in           |    1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libproto/mbox/mboxscan.c b/libproto/mbox/mboxscan.c
index 1ec1e94..3a81af6 100644
--- a/libproto/mbox/mboxscan.c
+++ b/libproto/mbox/mboxscan.c
@@ -385,15 +385,15 @@ mbox_scan_internal (mu_mailbox_t mailbox, mbox_message_t 
mum,
            }
        }
 
-      newline = nl;
-
+      newline = (inbody && lines) ? nl : 0;
+      
       /* Every 100 mesgs update the lock, it should be every minute.  */
       if ((mud->messages_count % 100) == 0)
        mu_locker_touchlock (mailbox->locker);
 
       /* Ping them every 1000 lines. Should be tunable.  */
       if (flags & MBOX_SCAN_NOTIFY)
-       if (((lines +1) % 1000) == 0)
+       if (((lines + 1) % 1000) == 0)
          DISPATCH_PROGRESS (mailbox, mud);
 
     } /* while */
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 40f4149..bc19f93 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -112,6 +112,7 @@ mail/if.c
 mail/inc.c
 mail/mail.c
 mail/mailline.c
+mail/mailvar.c
 mail/msgset.y
 mail/next.c
 mail/previous.c


hooks/post-receive
-- 
GNU Mailutils