Merged revisions 837719 via svnmerge from

svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

........
  r837719 | tilladam | 2008-07-25 16:51:51 +0200 (Fri, 25 Jul 2008) | 4 lines
  
  Make the template parser process teh message before it gets passed to the composer, when creating new mails via DBus, as Kontact does, for example, when hitting the "New Mail" toolbar button. Probably also fixes To and CC header setting, via that interface, etc. Simplify logic a bit as well.
  
  kolab/issue2921
........

svn path=/trunk/KDE/kdepim/; revision=837883

kmkernel.cpp

@@ -612,7 +612,6 @@ QDBusObjectPath KMKernel::newMessage( const QString &to,
                                       const QString &_attachURL)
 {
   KUrl attachURL( _attachURL );
-  KMail::Composer *win = 0;
   KMMessage *msg = new KMMessage;
   KMFolder *folder = 0;
   uint id = 0;
@@ -621,12 +620,8 @@ QDBusObjectPath KMKernel::newMessage( const QString &to,
     //create message with required folder identity
     folder = currentFolder();
     id = folder ? folder->identity() : 0;
-    msg->initHeader( id );
-    win = makeComposer( msg, id );
-  } else {
-    msg->initHeader();
-    win = makeComposer( msg );
   }
+  msg->initHeader( id );
   msg->setCharset( "utf-8" );
   //set basic headers
   if ( !to.isEmpty() ) {
@@ -643,6 +638,7 @@ QDBusObjectPath KMKernel::newMessage( const QString &to,
                          QString(), false, false, false );
   parser.process( NULL, folder );
 
+  KMail::Composer *win = makeComposer( msg, id );
 
   //Add the attachment if we have one
   if ( !attachURL.isEmpty() && attachURL.isValid() ) {