[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim/KDE/4.10] importwizard/thunderbird: Fix import fcc/tmp folder
From:       Montel Laurent <montel () kde ! org>
Date:       2012-12-31 15:04:23
Message-ID: 20121231150423.E96E2A6091 () git ! kde ! org
[Download RAW message or body]

Git commit 2fb9b993648f1f025577a897a9592d5b78a88366 by Montel Laurent.
Committed on 31/12/2012 at 16:04.
Pushed by mlaurent into branch 'KDE/4.10'.

Fix import fcc/tmp folder

M  +5    -8    importwizard/thunderbird/thunderbirdsettings.cpp

http://commits.kde.org/kdepim/2fb9b993648f1f025577a897a9592d5b78a88366

diff --git a/importwizard/thunderbird/thunderbirdsettings.cpp \
b/importwizard/thunderbird/thunderbirdsettings.cpp index e1eb832..83f0172 100644
--- a/importwizard/thunderbird/thunderbirdsettings.cpp
+++ b/importwizard/thunderbird/thunderbirdsettings.cpp
@@ -576,21 +576,18 @@ void ThunderbirdSettings::readIdentity( const QString& account \
)  }
 
   //fcc_reply_follows_parent not implemented in kmail
-  if ( mHashConfig.contains( identity + QLatin1String( ".fcc_folder_picker_mode" ) ) \
) +  //fcc_folder_picker_mode is just a flag for thunderbird. Not necessary during \
import. +  //if ( mHashConfig.contains( identity + QLatin1String( \
".fcc_folder_picker_mode" ) ) )  {
-    const int useSpecificFccFolder = mHashConfig.value(  identity + QLatin1String( \
                ".fcc_folder_picker_mode" ) ).toInt();
-    if ( useSpecificFccFolder == 1 )
-    {
+    if (mHashConfig.contains( identity + QLatin1String( ".fcc_folder" ) )) {
       const QString fccFolder = convertThunderbirdPath( mHashConfig.value( identity \
+ QLatin1String( ".fcc_folder" ) ).toString() );  newIdentity->setFcc( fccFolder );
     }
   }
 
-  if ( mHashConfig.contains( identity + QLatin1String( ".tmpl_folder_picker_mode" ) \
) ) +  //if ( mHashConfig.contains( identity + QLatin1String( \
".tmpl_folder_picker_mode" ) ) )  {
-    const int useSpecificTemplateFolder = mHashConfig.value(  identity + \
                QLatin1String( ".tmpl_folder_picker_mode" ) ).toInt();
-    if ( useSpecificTemplateFolder == 1 )
-    {
+    if (mHashConfig.contains( identity + QLatin1String( ".stationery_folder" ) )) {
       const QString templateFolder = convertThunderbirdPath( mHashConfig.value( \
identity + QLatin1String( ".stationery_folder" ) ).toString() );  \
newIdentity->setTemplates( templateFolder );  }


[prev in list] [next in list] [prev in thread] [next in thread]