[SCM] GNU Mailutils branch, master, updated. release-2.2-356-g0ac52e0

[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=0ac52e06cb1cb91602ee4dc4de32f66423e96b32

The branch, master has been updated
       via  0ac52e06cb1cb91602ee4dc4de32f66423e96b32 (commit)
      from  ac1262fb8a5d845c9e16a9679239142d0bf00522 (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 0ac52e06cb1cb91602ee4dc4de32f66423e96b32
Author: Sergey Poznyakoff <address@hidden>
Date:   Thu Mar 10 09:58:45 2011 +0200

    message_stream: deduce default envelope address from the current user email
    
    * libmailutils/stream/message_stream.c: Unless specified otherwise,
    set envelope address based on the current user email.
    * mh/tests/burst.at: Remove all X-Envelope headers before comparison.

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

Summary of changes:
 libmailutils/stream/message_stream.c |   14 ++++++++------
 mh/tests/burst.at                    |   18 ++++++------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/libmailutils/stream/message_stream.c 
b/libmailutils/stream/message_stream.c
index ecef8bf..03e0260 100644
--- a/libmailutils/stream/message_stream.c
+++ b/libmailutils/stream/message_stream.c
@@ -236,13 +236,15 @@ _message_open (mu_stream_t stream)
          mu_address_t addr;
          
          mu_address_create (&addr, from);
-         if (!addr
-             || mu_address_aget_email (addr, 1, &env_from))
-           env_from = mu_strdup ("GNU-Mailutils");
-         mu_address_destroy (&addr);
+         if (addr)
+           {
+             mu_address_aget_email (addr, 1, &env_from);
+             mu_address_destroy (&addr);
+           }
        }
-      else
-       env_from = mu_strdup ("GNU-MH");
+
+      if (!env_from)
+       env_from = mu_get_user_email (NULL);
     }
   free (from);
   
diff --git a/mh/tests/burst.at b/mh/tests/burst.at
index 6e6a4f9..2e383a2 100644
--- a/mh/tests/burst.at
+++ b/mh/tests/burst.at
@@ -40,16 +40,15 @@ Sergey
 ])
 
 burst +inbox 1 || exit $?
-grep -v ^X-Envelope-Date Mail/inbox/2
-grep -v ^X-Envelope-Date Mail/inbox/3
-grep -v ^X-Envelope-Date Mail/inbox/4
+grep -v ^X-Envelope- Mail/inbox/2
+grep -v ^X-Envelope- Mail/inbox/3
+grep -v ^X-Envelope- Mail/inbox/4
 ],
 [0],
 [X-Burst-Part: 1 1 01
 From: Sergey Poznyakoff <address@hidden>
 To: address@hidden
 Subject: digest
-X-Envelope-Sender: address@hidden
 
 Initial text.
 
@@ -57,13 +56,11 @@ X-Burst-Part: 1 2 02
 From: Puszcza hackers
 To: Sergey Poznyakoff <address@hidden>
 Subject: Hello
-X-Envelope-Sender: GNU-Mailutils
 
 Greetings
 ---------
 How are you?
 X-Burst-Part: 1 3 00
-X-Envelope-Sender: GNU-MH
 
 Regards,
 Sergey
@@ -93,16 +90,15 @@ Sergey
 ])
 
 burst +inbox --length=7 1 || exit $?
-grep -v ^X-Envelope-Date Mail/inbox/2
-grep -v ^X-Envelope-Date Mail/inbox/3
-grep -v ^X-Envelope-Date Mail/inbox/4
+grep -v ^X-Envelope- Mail/inbox/2
+grep -v ^X-Envelope- Mail/inbox/3
+grep -v ^X-Envelope- Mail/inbox/4
 ],
 [0],
 [X-Burst-Part: 1 1 01
 From: Sergey Poznyakoff <address@hidden>
 To: address@hidden
 Subject: digest
-X-Envelope-Sender: address@hidden
 
 Initial text.
 
@@ -110,13 +106,11 @@ X-Burst-Part: 1 2 02
 From: Puszcza hackers
 To: Sergey Poznyakoff <address@hidden>
 Subject: Hello
-X-Envelope-Sender: GNU-Mailutils
 
 Greetings
 -----
 How are you?
 X-Burst-Part: 1 3 00
-X-Envelope-Sender: GNU-MH
 
 Regards,
 Sergey


hooks/post-receive
-- 
GNU Mailutils