Commit 91834595 authored by Laurent Montel's avatar Laurent Montel 😁

Start to save current spell checker. So when we reedit we can use same spell checker

which can be different from spell checker defined in identity
parent 699f3814
......@@ -1719,7 +1719,14 @@ void KMComposeWin::setMessage( const KMime::Message::Ptr &newMsg, bool lastSignS
const bool stickyDictionary = mBtnDictionary->isChecked() && !mIgnoreStickyFields;
if ( !stickyDictionary ) {
mDictionaryCombo->setCurrentByDictionaryName( ident.dictionary() );
QString dictionary;
if ( mMsg->headerByType( "X-KMail-Dictionary" ) ) {
dictionary = mMsg->headerByType( "X-KMail-Dictionary" )->asUnicodeString();
} else {
dictionary = ident.dictionary();
}
mDictionaryCombo->setCurrentByDictionaryName( dictionary );
}
mEdtReplyTo->setText( mMsg->replyTo()->asUnicodeString() );
......
......@@ -769,6 +769,8 @@ void MessageComposer::ComposerViewBase::fillInfoPart ( MessageComposer::InfoPart
extras << m_msg->headerByType( "X-Face" );
if( m_msg->headerByType( "X-KMail-FccDisabled") )
extras << m_msg->headerByType( "X-KMail-FccDisabled");
if( m_msg->headerByType( "X-KMail-Dictionary") )
extras << m_msg->headerByType( "X-KMail-Dictionary");
infoPart->setExtraHeaders( extras );
}
......
......@@ -696,6 +696,7 @@ void removePrivateHeaderFields( const KMime::Message::Ptr &message, bool removeI
message->removeHeader( "X-KMail-UnExpanded-CC" );
message->removeHeader( "X-KMail-UnExpanded-BCC" );
message->removeHeader( "X-KMail-FccDisabled" );
message->removeHeader( "X-KMail-Dictionary" );
if(removeIdentityTag)
message->removeHeader( "X-KMail-Identity" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment