[SCM] GNU Mailutils branch, master, updated. release-2.2-424-g397d794

[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=397d7942197ebc79d3bcb1dd92ab197e3f6aaf2d

The branch, master has been updated
       via  397d7942197ebc79d3bcb1dd92ab197e3f6aaf2d (commit)
      from  e1233d5516f48cd7d786a69d4eebd40e73d95d45 (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 397d7942197ebc79d3bcb1dd92ab197e3f6aaf2d
Author: Sergey Poznyakoff <address@hidden>
Date:   Fri Nov 4 22:22:44 2011 +0200

    Fix MU_EVT_MESSAGE_ADD in pop://
    
    * libproto/pop/mbox.c (pop_scan): Make sure MU_EVT_MESSAGE_ADD is delivered
    when it is already possible to retrieve the message.
    * mail/mail.c (default_setup) <headline>: Use %L instead of %l.
    
    * mu/logger.c (logger_options)<priority>: Minor fix.

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

Summary of changes:
 libproto/pop/mbox.c |   19 ++++++++++++++++---
 mail/mail.c         |    2 +-
 mu/logger.c         |    2 +-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/libproto/pop/mbox.c b/libproto/pop/mbox.c
index 9ce6603..ba03ef2 100644
--- a/libproto/pop/mbox.c
+++ b/libproto/pop/mbox.c
@@ -356,9 +356,6 @@ pop_scan (mu_mailbox_t mbox, size_t msgno, size_t *pcount)
 
          if (mbox->observable)
            {
-             if (mu_observable_notify (mbox->observable, MU_EVT_MESSAGE_ADD,
-                                       &num) != 0)
-               break;
              if (((i + 1) % 10) == 0)
                mu_observable_notify (mbox->observable,
                                      MU_EVT_MAILBOX_PROGRESS,
@@ -366,7 +363,23 @@ pop_scan (mu_mailbox_t mbox, size_t msgno, size_t *pcount)
            }
        }
     }
+  
   mu_iterator_destroy (&itr);
+
+  if (mbox->observable)
+    {
+      /* MU_EVT_MESSAGE_ADD must be delivered only when it is already possible
+         to retrieve the message in question.  It could not be done in the
+         main loop because no other pop3d function can be called while LIST
+         is being handled.  Hence the extra loop. */
+      for (i = 0; i <= count; i++)
+       {
+         if (mu_observable_notify (mbox->observable, MU_EVT_MESSAGE_ADD,
+                                   &i) != 0)
+           break;
+       }
+    }
+  
   return status;
 }
 
diff --git a/mail/mail.c b/mail/mail.c
index 33fac2c..d0643f9 100644
--- a/mail/mail.c
+++ b/mail/mail.c
@@ -289,7 +289,7 @@ static char *default_setup[] = {
   "set recursivealiases",
   "set noinplacealiases",
   "set fromfield",
-  "set headline=\"%>%a%4m %18f %16d %3l/%-5o %s\"",
+  "set headline=\"%>%a%4m %18f %16d %3L/%-5o %s\"",
   
   /* Start in mail reading mode */
   "setq mode=read",
diff --git a/mu/logger.c b/mu/logger.c
index f3bb738..e38616f 100644
--- a/mu/logger.c
+++ b/mu/logger.c
@@ -30,7 +30,7 @@ static char logger_args_doc[] = N_("[TEXT]");
 
 static struct argp_option logger_options[] = {
   { "file", 'f', N_("FILE"), 0, N_("read message from FILE") },
-  { "priority", 'p', N_("[FACILITY.LEVEL]"), 0,
+  { "priority", 'p', N_("FACILITY[.LEVEL]"), 0,
     N_("log at the specified syslog priority (implies --syslog)") },
   { "syslog", OPT_SYSLOG, NULL, 0, N_("log via syslog") },
   { "stderr", OPT_STDERR, NULL, 0, N_("log to the standard error") },


hooks/post-receive
-- 
GNU Mailutils