Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26704/src/gui
Modified Files:
wxComposeView.cpp
Log Message:
data of not text/image type is inserted with disposition attachment, not inline, by
default now; in particular this means that quote822 template macro inserts the
original text as attachment now, as desired
Index: wxComposeView.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxComposeView.cpp,v
retrieving revision 1.370
retrieving revision 1.371
diff -b -u -2 -r1.370 -r1.371
--- wxComposeView.cpp 13 Aug 2004 22:19:37 -0000 1.370
+++ wxComposeView.cpp 8 Sep 2004 21:59:26 -0000 1.371
@@ -869,5 +869,6 @@
}
- SetDisposition(_T("INLINE"));
+ if ( m_Disposition.empty() )
+ SetDisposition(_T("ATTACHMENT"));
}
@@ -3555,4 +3556,6 @@
EditorContentPart *mc = new EditorContentPart();
+ if ( MimeType(mt).ShouldShowInline() )
+ mc->SetDisposition(_T("INLINE"));
mc->SetData(data, length, name, filename);
@@ -3596,7 +3599,5 @@
// by default propose to send the images and text parts inline but all the
// rest as attachment
- const MimeType::Primary primaryType = MimeType(strMimeType).GetPrimary();
- props.disposition = primaryType == MimeType::TEXT ||
- primaryType == MimeType::IMAGE
+ props.disposition = MimeType(strMimeType).ShouldShowInline()
? AttachmentProperties::Disposition_Inline
: AttachmentProperties::Disposition_Attachment;
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
