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

List:       kde-commits
Subject:    [kdepim] importwizard: Improve load imap settings from sylpheed
From:       Montel Laurent <montel () kde ! org>
Date:       2012-03-30 7:43:35
Message-ID: 20120330074335.2C615A60A9 () git ! kde ! org
[Download RAW message or body]

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

Improve load imap settings from sylpheed

M  +13   -6    importwizard/abstractsettings.cpp
M  +2    -0    importwizard/abstractsettings.h
M  +20   -1    importwizard/sylpheed/sylpheedsettings.cpp

http://commits.kde.org/kdepim/08f4c9dcca9548200692528856c00ec8f9ee638a

diff --git a/importwizard/abstractsettings.cpp b/importwizard/abstractsettings.cpp
index 9e5c45a..7ea9a7d 100644
--- a/importwizard/abstractsettings.cpp
+++ b/importwizard/abstractsettings.cpp
@@ -170,22 +170,29 @@ void AbstractSettings::addFilterImportError( const QString& log \
)  mImportWizard->importSettingPage()->addFilterImportError( log );
 }
 
-
-QString AbstractSettings::adaptFolder( const QString& folder)
+Akonadi::Collection::Id AbstractSettings::adaptFolderId( const QString& folder)
 {
-  QString newFolder;
+  Akonadi::Collection::Id newFolderId=-1;
   bool exactPath = false;
   Akonadi::Collection::List lst = \
FilterActionMissingCollectionDialog::potentialCorrectFolders( folder, exactPath );  \
                if ( lst.count() == 1 && exactPath )
-    newFolder = QString::number(lst.at( 0 ).id());
+    newFolderId = lst.at( 0 ).id();
   else {
     FilterActionMissingCollectionDialog *dlg = new \
FilterActionMissingCollectionDialog( lst, QString(), folder );  if ( dlg->exec() ) {
-      newFolder = QString::number(dlg->selectedCollection().id());
+      newFolderId = dlg->selectedCollection().id();
     }
     delete dlg;
   }
-  return newFolder;
+  return newFolderId;
+}
+
+QString AbstractSettings::adaptFolder( const QString& folder)
+{
+  Akonadi::Collection::Id newFolderId= adaptFolderId(folder);
+  if(newFolderId == -1 )
+    return QString();
+  return QString::number(newFolderId);
 }
 
 #include "abstractsettings.moc"
diff --git a/importwizard/abstractsettings.h b/importwizard/abstractsettings.h
index f1c7c9c..0bae94c 100644
--- a/importwizard/abstractsettings.h
+++ b/importwizard/abstractsettings.h
@@ -20,6 +20,7 @@
 
 #include <QObject>
 #include <QMap>
+#include <Akonadi/Collection>
 class ImportWizard;
 class KJob;
 
@@ -48,6 +49,7 @@ protected:
   MailTransport::Transport *createTransport();
   void storeIdentity(KPIMIdentities::Identity* identity);
   QString adaptFolder( const QString& folder);
+  Akonadi::Collection::Id adaptFolderId( const QString& folder);
 
   ImportWizard *mImportWizard;
   KPIMIdentities::IdentityManager *mManager;
diff --git a/importwizard/sylpheed/sylpheedsettings.cpp \
b/importwizard/sylpheed/sylpheedsettings.cpp index b50e793..07725fc 100644
--- a/importwizard/sylpheed/sylpheedsettings.cpp
+++ b/importwizard/sylpheed/sylpheedsettings.cpp
@@ -125,10 +125,29 @@ void SylpheedSettings::readPop3Account( const KConfigGroup& \
accountConfig )  
 void SylpheedSettings::readImapAccount( const KConfigGroup& accountConfig )
 {
-  //TODO
   QMap<QString, QVariant> settings;
   const QString name = accountConfig.readEntry( QLatin1String( "name" ) );
 
+  if ( accountConfig.hasKey( QLatin1String( "ssl_imap" ) ) && \
accountConfig.readEntry( QLatin1String( "ssl_imap" ), false ) ) { +    //TODO
+  }
+  int port = 0;
+  if ( readConfig( QLatin1String( "imap_port" ), accountConfig, port, true ) )
+    settings.insert( QLatin1String( "ImapPort" ), port );
+
+  QString trashFolder;
+  if ( readConfig( QLatin1String( "trash_folder" ), accountConfig, trashFolder, \
false ) ) +    settings.insert( QLatin1String( "TrashCollection" ), adaptFolderId( \
trashFolder ) ); +
+  const int auth = accountConfig.readEntry(QLatin1String("imap_auth_method"),0);
+  switch(auth) {
+    case 0:
+      break;
+    default:
+      qDebug()<<" imap auth unknown "<<auth;
+      break;
+  }
+
   createResource( "akonadi_imap_resource", name,settings );
 }
 


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