X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=blobdiff_plain;f=src%2FTortoiseProc%2FSVNProgressDlg.cpp;h=9e5948e23c97f065928590f5c69737526646014b;hp=e8916698351e1b44bf39b3c95efb301b2c507771;hb=3dbeda807bd0fbee33b77bd778251bb06876c8f1;hpb=31ed1f0afc6df6ebb94e6b51b7c28e3453cb95e0

diff --git a/src/TortoiseProc/SVNProgressDlg.cpp b/src/TortoiseProc/SVNProgressDlg.cpp
index e891669..9e5948e 100644
--- a/src/TortoiseProc/SVNProgressDlg.cpp
+++ b/src/TortoiseProc/SVNProgressDlg.cpp
@@ -2709,21 +2709,38 @@ bool CGitProgressDlg::CmdSendMail(CString& sWindowTitle, bool& /*localoperation*
 	//SetBackgroundImage(IDI_ADD_BKG);
 	ReportCmd(CString(MAKEINTRESOURCE(IDS_PROGRS_CMD_SENDMAIL)));
 	bool ret=true;
-
-	for(int i=0;i<m_targetPathList.GetCount();i++)
+	if(this->m_SendMailFlags&SENDMAIL_COMBINED)
 	{
-		CPatch patch;
-		Notify(m_targetPathList[i],git_wc_notify_sendmail_start);
-		int ret=patch.Send((CString&)m_targetPathList[i].GetWinPathString(),this->m_SendMailTO,
-			         this->m_SendMailCC,this->m_SendMailFlags&SENDMAIL_ATTACHMENT);
-		if(ret)
+		CString error;
+		CTGitPath path;
+		Notify(path,git_wc_notify_sendmail_start);
+		CString err;
+		if(CPatch::Send(m_targetPathList,m_SendMailTO,m_SendMailCC,m_SendMailSubject,this->m_SendMailFlags&SENDMAIL_COMBINED,&err))
 		{
-			Notify(m_targetPathList[i],git_wc_notify_sendmail_error,ret,&patch.m_LastError);
+			Notify(path,git_wc_notify_sendmail_error,ret,&err);
 			ret = false;
+		}else
+		{
+			Notify(path,git_wc_notify_sendmail_done,ret);
+		}
+
+	}else
+	{
+		for(int i=0;i<m_targetPathList.GetCount();i++)
+		{
+			CPatch patch;
+			Notify(m_targetPathList[i],git_wc_notify_sendmail_start);
+			int ret=patch.Send((CString&)m_targetPathList[i].GetWinPathString(),this->m_SendMailTO,
+				         this->m_SendMailCC,this->m_SendMailFlags&SENDMAIL_ATTACHMENT);
+			if(ret)
+			{
+				Notify(m_targetPathList[i],git_wc_notify_sendmail_error,ret,&patch.m_LastError);
+				ret = false;
+			}
+			Notify(m_targetPathList[i],git_wc_notify_sendmail_done,ret);
+			if(m_bCancelled)
+				return false;
 		}
-		Notify(m_targetPathList[i],git_wc_notify_sendmail_done,ret);
-		if(m_bCancelled)
-			return false;
 	}
 	return ret;
 }
\ No newline at end of file