ChangeLog: Updated ChangeLog

MailMessage.cs:
MailMessageWrapper.cs:
SmtpClient.cs: Fields property of MailMessage from .Net 1.1 was not
        handled completely.

svn path=/branches/mono-1-0/mcs/; revision=33033

diff --git a/mcs/class/System.Web/System.Web.Mail/ChangeLog b/mcs/class/System.Web/System.Web.Mail/ChangeLog
index 4ac2bcc035e2242cf28fcd7a4c3fd1d47b21170b..ff65aaa23c4d3a9bc34e7cd6f23497cba837c481 100644 (file)
--- a/mcs/class/System.Web/System.Web.Mail/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Mail/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-30 Sanjay Gupta <gsanjay@novell.com>
+
+       * MailMessage.cs:
+       * MailMessageWrapper.cs:
+       * SmtpClient.cs: Fields property of MailMessage from .Net 1.1 was not
+       handled completely.
+       
 2004-08-10 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * SmtpClient.cs: multipart mails default body format is now the same as

diff --git a/mcs/class/System.Web/System.Web.Mail/MailMessage.cs b/mcs/class/System.Web/System.Web.Mail/MailMessage.cs
index 6531a6d61566095eeab0cecb9eda0935e4a34c4f..fea1d167846b9e6e6e9dcb41539d0240d22826be 100644 (file)
--- a/mcs/class/System.Web/System.Web.Mail/MailMessage.cs
+++ b/mcs/class/System.Web/System.Web.Mail/MailMessage.cs
@@ -51,7 +51,6 @@ namespace System.Web.Mail
                private string to;\r
                private string urlContentBase;\r
                private string urlContentLocation;
-               private Hashtable fields;\r
                \r
                // Constructor          \r
                public MailMessage ()\r
@@ -59,7 +58,9 @@ namespace System.Web.Mail
                        attachments = new ArrayList (8);\r
                        headers = new ListDictionary ();\r
                        bodyEncoding = Encoding.Default;
+#if NET_1_1
                        fields = new Hashtable ();\r
+#endif
                }               \r
        \r
                // Properties\r
@@ -127,6 +128,8 @@ namespace System.Web.Mail
                }\r
 \r
 #if NET_1_1\r
+               private Hashtable fields;\r
+               
                public IDictionary Fields {\r
                        get {
                                return (IDictionary) fields;

diff --git a/mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs b/mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs
index 17bd581675bf29d21b1e127679d475ed8def654e..270892aab93cd3c67399b18a83b241210fdf2ea5 100644 (file)
--- a/mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs
+++ b/mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs
@@ -227,6 +227,19 @@ namespace System.Web.Mail {
        public string UrlContentLocation {
            get { return message.UrlContentLocation; } 
        }
+
+#if NET_1_1
+       public MailHeader Fields {
+               get {
+                       MailHeader bodyHeaders = new MailHeader();
+                       // Add Fields to MailHeader Object
+                       foreach( string key in message.Fields.Keys )
+                               bodyHeaders.Data[ key ] = (string)this.message.Fields[ key ];
+                       return bodyHeaders;
+               }
+       }
+#endif
+
     }
 
 }

diff --git a/mcs/class/System.Web/System.Web.Mail/SmtpClient.cs b/mcs/class/System.Web/System.Web.Mail/SmtpClient.cs
index 109f1cf60a8dbb12905e3f6198be46891244c3db..d77652c13844e186aaf6c58129341852517df7d7 100644 (file)
--- a/mcs/class/System.Web/System.Web.Mail/SmtpClient.cs
+++ b/mcs/class/System.Web/System.Web.Mail/SmtpClient.cs
@@ -153,6 +153,12 @@ namespace System.Web.Mail {
                
            MailHeader partHeader = new MailHeader();
            partHeader.ContentType = bodyContentType;
+
+#if NET_1_1
+               // Add all the custom headers to body part as specified in 
+               //Fields property of MailMessageWrapper
+               partHeader.Data.Add(msg.Fields.Data);
+#endif
                
            smtp.WriteHeader( partHeader );