From kde-commits  Thu Jan 12 19:30:45 2006
From: Edwin Schepers <yez () home ! nl>
Date: Thu, 12 Jan 2006 19:30:45 +0000
To: kde-commits
Subject: branches/KDE/3.5/kdepim/kmail
Message-Id: <1137094245.472674.25864.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=113709856604799

SVN commit 497436 by eschepers:

The QTimer initializes spelling after the html message is displayed. This way, all formatting is undone. Spelling is already initiated in the constructor of KMComposeWin, so no harm is done deleting the QTimer.

BUG:106968


 M  +3 -2      kmcomposewin.cpp  
 M  +0 -2      kmedit.cpp  
 M  +1 -1      partNode.cpp  


--- branches/KDE/3.5/kdepim/kmail/kmcomposewin.cpp #497435:497436
@@ -1814,9 +1814,10 @@
     if ( partNode * p = n->parentNode() )
       if ( p->hasType( DwMime::kTypeMultipart ) &&
            p->hasSubType( DwMime::kSubtypeAlternative ) )
-        if ( mMsg->headerField( "X-KMail-Markup" ) == "true" )
+        if ( mMsg->headerField( "X-KMail-Markup" ) == "true" ) {
           toggleMarkup( true );
-
+          mEditor->setText(n->encodedBody() );
+        }
   /* Handle the special case of non-mime mails */
   if ( mMsg->numBodyParts() == 0 && otp.textualContent().isEmpty() ) {
     mCharset=mMsg->charset();
--- branches/KDE/3.5/kdepim/kmail/kmedit.cpp #497435:497436
@@ -218,8 +218,6 @@
   installEventFilter(this);
   KCursor::setAutoHideCursor( this, true, true );
   setOverwriteEnabled( true );
-
-  QTimer::singleShot( 0, this, SLOT( initializeAutoSpellChecking() ) );
 }
 
 
--- branches/KDE/3.5/kdepim/kmail/partNode.cpp #497435:497436
@@ -179,7 +179,7 @@
     return mEncodedBody;
 
   if ( mDwPart )
-    mEncodedBody = mDwPart->AsString().c_str();
+    mEncodedBody = mDwPart->Body().AsString().c_str();
   else
     mEncodedBody = 0;
   mEncodedOk = true;