Andreas Krennmair:

	Merged mutt changes
	Sidebar now honors the imap_home_namespace

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

diff --git a/ChangeLog b/ChangeLog
index 1e1c9f0..171ddce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-21 04:42:34  Alain Bench  <messtic@oreka.com>  (roessler)
+
+       * parse.c, pgp.c, sendlib.c: Bcc should be RFC2047-encoded, too.
+
 2005-02-19 16:00:24  Thomas Roessler  <roessler@does-not-exist.org>  (roessler)
 
        * sendlib.c: Fix Debian 295528.

diff --git a/ChangeLog.mutt-ng b/ChangeLog.mutt-ng
index a94839a..a97e69b 100644 (file)
--- a/ChangeLog.mutt-ng
+++ b/ChangeLog.mutt-ng
@@ -1,11 +1,15 @@
 Changes specific to mutt-ng:
 
-2004-02-21:
+2005-02-22:
+  * Merged mutt changes
+  * Sidebar now honors the imap_home_namespace
+
+2005-02-21:
   * Merged past mutt changes
   * Fixed a bug in mutt_FormatString regarding aligning the rest of a string to the right (%>)
   * Added fix from jschmitt
 
-2004-02-16:
+2005-02-16:
   * fixed segfault in curs_lib.c
   * fixed names
 

diff --git a/parse.c b/parse.c
index eab2f3d..939fc35 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -1451,6 +1451,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE *f, HEADER *hdr, short user_hdrs,
     rfc2047_decode_adrlist (e->from);
     rfc2047_decode_adrlist (e->to);
     rfc2047_decode_adrlist (e->cc);
+    rfc2047_decode_adrlist (e->bcc);
     rfc2047_decode_adrlist (e->reply_to);
     rfc2047_decode_adrlist (e->mail_followup_to);
     rfc2047_decode_adrlist (e->return_path);

diff --git a/pgp.c b/pgp.c
index 46b0866..929f489 100644 (file)
--- a/pgp.c
+++ b/pgp.c
@@ -1490,6 +1490,11 @@ int pgp_send_menu (HEADER *msg, int *redraw)
   
   if (!(WithCrypto & APPLICATION_PGP))
     return msg->security;
+
+  /* If autoinline and no crypto options set, then set inline. */
+  if (option (OPTPGPAUTOINLINE) && 
+      !((msg->security & APPLICATION_PGP) && (msg->security & (SIGN|ENCRYPT))))
+    msg->security |= INLINE;
   
   snprintf (prompt, sizeof (prompt), 
            _("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "),

diff --git a/sendlib.c b/sendlib.c
index c0d204c..281f9e3 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -2356,6 +2356,7 @@ void mutt_prepare_envelope (ENVELOPE *env, int final)
   /* Take care of 8-bit => 7-bit conversion. */
   rfc2047_encode_adrlist (env->to, "To");
   rfc2047_encode_adrlist (env->cc, "Cc");
+  rfc2047_encode_adrlist (env->bcc, "Bcc");
   rfc2047_encode_adrlist (env->from, "From");
   rfc2047_encode_adrlist (env->mail_followup_to, "Mail-Followup-To");
   rfc2047_encode_adrlist (env->reply_to, "Reply-To");
@@ -2382,6 +2383,7 @@ void mutt_unprepare_envelope (ENVELOPE *env)
   /* back conversions */
   rfc2047_decode_adrlist (env->to);
   rfc2047_decode_adrlist (env->cc);
+  rfc2047_decode_adrlist (env->bcc);
   rfc2047_decode_adrlist (env->from);
   rfc2047_decode_adrlist (env->reply_to);
   rfc2047_decode (&env->subject);

diff --git a/sidebar.c b/sidebar.c
index 7f19146..49555d5 100644 (file)
--- a/sidebar.c
+++ b/sidebar.c
@@ -87,6 +87,13 @@ char *make_sidebar_entry(char *box, int size, int new)
        if ( c ) entry = c;
        entry[SidebarWidth] = 0;
        for (; i < SidebarWidth; entry[i++] = ' ' );
+#if USE_IMAP
+       if (ImapHomeNamespace && strlen(ImapHomeNamespace)>0) {
+    if (strncmp(box,ImapHomeNamespace,strlen(ImapHomeNamespace))==0 && strcmp(box,ImapHomeNamespace)!=0) {
+      box+=strlen(ImapHomeNamespace)+1;
+    }
+  }
+#endif
        i = strlen(box);
        strncpy( entry, box, i < SidebarWidth ? i :SidebarWidth );