[Dnsmail-cvs] dnsmail/DnsMail DnsMail.cs,1.17,1.18

[Ethem E. <et...@us...>]

Update of /cvsroot/dnsmail/dnsmail/DnsMail
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv7301/dnsmail/DnsMail

Modified Files:
	DnsMail.cs 
Log Message:
Some cleanup.

Index: DnsMail.cs
===================================================================
RCS file: /cvsroot/dnsmail/dnsmail/DnsMail/DnsMail.cs,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** DnsMail.cs	15 Aug 2006 13:07:00 -0000	1.17
--- DnsMail.cs	24 Aug 2006 09:01:09 -0000	1.18
***************
*** 334,340 ****
  			{
  				initialize();
- 				bool ignore;
  				int rcptcount = addrecipients();
! 				senddata(((Recipient)mi.Recipients[0]).ToString(), true, rcptcount, out ignore);
  			}
  			finally
--- 334,339 ----
  			{
  				initialize();
  				int rcptcount = addrecipients();
! 				senddata(((Recipient)mi.Recipients[0]).ToString(), true, rcptcount);
  			}
  			finally
***************
*** 368,372 ****
  		{
  			string originalSubject = mi.Subject;
! 			bool readycontrol = false, senddatax = false, sendersent = true;
  			foreach (Recipient rec in mi.Recipients)
  			{
--- 367,371 ----
  		{
  			string originalSubject = mi.Subject;
! 			bool readycontrol = false, sendersent = true;
  			foreach (Recipient rec in mi.Recipients)
  			{
***************
*** 413,418 ****
  					mi.Subject = (ir.Subject == null) ? originalSubject : ir.Subject;
  
! 					senddata(rec.ToString(), false, 1, out senddatax);
! 					if (senddatax)
  						sendersent = false;
  
--- 412,416 ----
  					mi.Subject = (ir.Subject == null) ? originalSubject : ir.Subject;
  
! 					if (senddata(rec.ToString(), false, 1))
  						sendersent = false;
  
***************
*** 560,569 ****
  		}
  
! 		private void senddata(string __to, bool forcedclose, int rcptcount, out bool datasentx)
  		{
- 			datasentx = false;
  			mi.sent = false;
  			if (!mi.SendMail)
! 				return; //noerr
  
  			try
--- 558,566 ----
  		}
  
! 		private bool senddata(string __to, bool forcedclose, int rcptcount)
  		{
  			mi.sent = false;
  			if (!mi.SendMail)
! 				return false; //don't send data
  
  			try
***************
*** 595,599 ****
  					throw new MailServerException(m_Client.LastResponse);
  
- 				datasentx = true;
  				mi.sent = true;
  				datasent = true;
--- 592,595 ----
***************
*** 601,604 ****
--- 597,602 ----
  				if (forcedclose)
  					OnSent(EventArgs.Empty);
+ 
+ 				return true;
  			}
  			catch (Exception exc)