--Boundary-00=_ogI1FQLBx3Ei2xw Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline On Thursday, February 15, 2007 03:06:37 PM Jan-Pascal van Best wrote: > Hi Thorsten, > > Thanks for making the patch. Maybe you could add the one-liner in > kmkernel.cpp for sending invitations to the patch, and then we could > check whether invitation sending, accepting, refusing, and changing is > compatible with all 'supported' environments for which we can find > someone to test. Hi Jan-Pascal, I attach the new complete patch. You can apply the patch with cat exchange-compat.patch | patch -p1 in a kdepim source folder and the recompile kmail. For the checks: Yes, there is something like native kolab as kolab handles the freebusy lists of its users. I have also disabled /kolab/var/kolab/php/kolabfilter/olhacks.php as for me it rewrite mail from OL-Exchange users in a wrong way. I will ask a friend of mine who uses OL without exchange for a test. Bye Thorsten --Boundary-00=_ogI1FQLBx3Ei2xw Content-Type: text/x-diff; charset="iso-8859-1"; name="exchange-compat.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="exchange-compat.patch" --- kdepim-3.5.5+.vanilla/kmail/callback.cpp 2007-02-15 16:27:47.000000000 +0100 +++ kdepim-3.5.5+/kmail/callback.cpp 2007-02-15 17:03:11.000000000 +0100 @@ -33,6 +33,7 @@ #include "callback.h" #include "kmkernel.h" #include "kmmessage.h" +#include "kmmsgpart.h" #include #include #include @@ -62,12 +63,11 @@ KMMessage *msg = new KMMessage; msg->initHeader(); - msg->setHeaderField( "Content-Type", - "text/calendar; method=reply; charset=\"utf-8\"" ); - msg->setSubject( subject ); - msg->setTo( to ); - msg->setBody( iCal.utf8() ); - msg->setFrom( receiver() ); + msg->setCharset( "utf-8" ); + + if ( !subject.isEmpty() ) msg->setSubject( subject ); + if ( !to.isEmpty() ) msg->setTo( to ); + if ( !subject.isEmpty() ) msg->setFrom( receiver() ); /* We want the triggering mail to be moved to the trash once this one * has been sent successfully. Set a link header which accomplishes that. */ msg->link( mMsg, KMMsgStatusDeleted ); @@ -87,11 +87,20 @@ msg->setBcc( "" ); } + KMMessagePart *msgPart = new KMMessagePart; + msgPart->setName( "cal.ics" ); + // msgPart->setCteStr( attachCte ); // "base64" ? + msgPart->setBodyEncoded( iCal.utf8() ); + msgPart->setTypeStr( "text" ); + msgPart->setSubtypeStr( "calendar" ); + msgPart->setParameter( "method", "reply" ); + KMail::Composer * cWin = KMail::makeComposer(); cWin->setMsg( msg, false /* mayAutoSign */ ); // cWin->setCharset( "", true ); cWin->slotWordWrapToggled( false ); cWin->setSigningAndEncryptionDisabled( true ); + cWin->addAttach(msgPart); if ( options.readBoolEntry( "AutomaticSending", true ) ) { cWin->setAutoDeleteWindow( true ); --- kdepim-3.5.5+.vanilla/kmail/kmkernel.cpp 2007-02-15 16:27:47.000000000 +0100 +++ kdepim-3.5.5+/kmail/kmkernel.cpp 2007-02-15 17:00:41.000000000 +0100 @@ -524,7 +524,7 @@ msgPart->setTypeStr( attachType ); msgPart->setSubtypeStr( attachSubType ); msgPart->setParameter( attachParamAttr, attachParamValue ); - msgPart->setContentDisposition( attachContDisp ); +// msgPart->setContentDisposition( attachContDisp ); if( !attachCharset.isEmpty() ) { // kdDebug(5006) << "KMKernel::openComposer set attachCharset to " // << attachCharset << endl; --Boundary-00=_ogI1FQLBx3Ei2xw Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ kde-pim mailing list kde-pim@kde.org https://mail.kde.org/mailman/listinfo/kde-pim kde-pim home page at http://pim.kde.org/ --Boundary-00=_ogI1FQLBx3Ei2xw--