Message info
 
To:kde-commits@kde.org From:Montel Laurent Subject:[kdepim] importwizard/thunderbird: import++ Date:Thu, 29 Mar 2012 09:31:04 +0200 (CEST)
 

Git commit cefae9ee2ba596d71b26520379fad4d9d6b432e4 by Montel Laurent.
Committed on 29/03/2012 at 09:30.
Pushed by mlaurent into branch 'master'.

import++

M +11 -2 importwizard/thunderbird/thunderbirdsettings.cpp

http://commits.kde.org/kdepim/cefae9ee2ba596d71b26520379fad4d9d6b432e4

diff --git a/importwizard/thunderbird/thunderbirdsettings.cpp b/importwizard/thunderbird/thunderbirdsettings.cpp
index efa8778..9673a4d 100644
--- a/importwizard/thunderbird/thunderbirdsettings.cpp
+++ b/importwizard/thunderbird/thunderbirdsettings.cpp
@@ -177,16 +177,25 @@ void ThunderbirdSettings::readIdentity( const QString& account )

bool doBcc = mHashConfig.value(identity + QLatin1String(".doBcc")).toBool();
if(doBcc) {
- //TODO
+ const QString bcc = mHashConfig.value(identity + QLatin1String(".doBccList")).toString();
}
+
+ bool doCc = mHashConfig.value(identity + QLatin1String(".doCc")).toBool();
+ if(doCc) {
+ const QString cc = mHashConfig.value(identity + QLatin1String(".doCcList")).toString();
+ }
+
const QString draft = adaptFolder(mHashConfig.value(identity + QLatin1String(".draft_folder")).toString());
newIdentity->setDrafts(draft);

const QString replyTo = mHashConfig.value(identity + QLatin1String( ".reply_to")).toString();
+ newIdentity->setReplyToAddr( replyTo );

KPIMIdentities::Signature signature;
- //TODO
const bool signatureHtml = mHashConfig.value(identity + QLatin1String( ".htmlSigFormat" )).toBool();
+ if(signatureHtml) {
+ signature.setInlinedHtml( true );
+ }
const QString textSignature = mHashConfig.value(identity + QLatin1String( ".htmlSigText" ) ).toString();
const QString fileSignature = mHashConfig.value(identity + QLatin1String( ".sig_file")).toString();
newIdentity->setSignature( signature );