[Nmh-commits] nmh ./ChangeLog uip/sendsbr.c

[David Levine]

CVSROOT:        /sources/nmh
Module name:    nmh
Branch:         
Changes by:     David Levine <address@hidden>   06/03/30 22:20:19

Modified files:
        .              : ChangeLog 
        uip            : sendsbr.c 

Log message:
        * uip/sendsbr.c: with attachformat values of 1 or 2, only
        generate Content-Disposition headers for MIME attachments, not
        for the message contents themselves.  Microsoft Outlook Build
        10.0.6626, at least, doesn't show the message contents if they
        have Content-Disposition.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/ChangeLog.diff?tr1=1.243&tr2=1.244&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/sendsbr.c.diff?tr1=1.12&tr2=1.13&r1=text&r2=text

Patches:
Index: nmh/ChangeLog
diff -u nmh/ChangeLog:1.243 nmh/ChangeLog:1.244
--- nmh/ChangeLog:1.243 Thu Mar  9 19:51:13 2006
+++ nmh/ChangeLog       Thu Mar 30 22:19:50 2006
@@ -1,3 +1,11 @@
+2006-03-30  David Levine <address@hidden>
+
+       * uip/sendsbr.c: with attachformat values of 1 or 2, only
+       generate Content-Disposition headers for MIME attachments, not
+       for the message contents themselves.  Microsoft Outlook Build
+       10.0.6626, at least, doesn't show the message contents if they
+       have Content-Disposition.
+
 2006-03-09  Josh Bressers <address@hidden>
 
        * sbr/fmt_rfc2047.c (decode_rfc2047): Don't close the iconv descriptor
Index: nmh/uip/sendsbr.c
diff -u nmh/uip/sendsbr.c:1.12 nmh/uip/sendsbr.c:1.13
--- nmh/uip/sendsbr.c:1.12      Wed Mar  8 12:14:16 2006
+++ nmh/uip/sendsbr.c   Thu Mar 30 22:20:02 2006
@@ -2,7 +2,7 @@
 /*
  * sendsbr.c -- routines to help WhatNow/Send along
  *
- * $Id: sendsbr.c,v 1.12 2006/03/08 12:14:16 bress Exp $
+ * $Id: sendsbr.c,v 1.13 2006/03/30 22:20:02 levine Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -489,17 +489,35 @@
 
         break;
     case 1:
-        /* Suppress Content-Id, insert simple Content-Disposition. */
-        (void) fprintf (composition_file, "#%s <>{attachment}", content_type);
+        if (stringdex (m_maildir(invo_name), file_name) == 0) {
+            /* Content had been placed by send into a temp file.
+               Don't generate Content-Disposition header, because
+               it confuses Microsoft Outlook, Build 10.0.6626, at
+               least. */
+            (void) fprintf (composition_file, "#%s <>", content_type);
+        } else {
+            /* Suppress Content-Id, insert simple Content-Disposition. */
+            (void) fprintf (composition_file,
+                            "#%s <>{attachment}",
+                            content_type);
+        }
 
         break;
     case 2:
-        /* Suppress Content-Id, insert Content-Disposition with
-           modification date. */
-        (void) fprintf (composition_file,
-                        "#%s <>{attachment; modification-date=\"%s\"}",
-                        content_type,
-                        dtime (&st.st_mtime, 0));
+        if (stringdex (m_maildir(invo_name), file_name) == 0) {
+            /* Content had been placed by send into a temp file.
+               Don't generate Content-Disposition header, because
+               it confuses Microsoft Outlook, Build 10.0.6626, at
+               least. */
+            (void) fprintf (composition_file, "#%s <>", content_type);
+        } else {
+            /* Suppress Content-Id, insert Content-Disposition with
+               modification date. */
+            (void) fprintf (composition_file,
+                            "#%s <>{attachment; modification-date=\"%s\"}",
+                            content_type,
+                            dtime (&st.st_mtime, 0));
+        }
 
         break;
     default: