summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--migrationutility/googlesourceserver.cpp7
-rw-r--r--migrationutility/main.cpp3
2 files changed, 6 insertions, 4 deletions
diff --git a/migrationutility/googlesourceserver.cpp b/migrationutility/googlesourceserver.cpp
index c286b26..ec6b056 100644
--- a/migrationutility/googlesourceserver.cpp
+++ b/migrationutility/googlesourceserver.cpp
@@ -27,8 +27,9 @@
GoogleSourceServer::GoogleSourceServer(QObject* parent)
: SourceServer(parent),
- mEncryptionMode(KIMAP::LoginJob::TlsV1),
- mAuthenticationMode(KIMAP::LoginJob::Plain)
+ mEncryptionMode(KIMAP::LoginJob::AnySslVersion),
+ mAuthenticationMode(KIMAP::LoginJob::ClearText),
+ mPort(993)
{
}
@@ -72,7 +73,7 @@ QList<SourceAccount*> GoogleSourceServer::getSourceAccountsImpl(const QString& u
IMAPSourceAccount *imapAccount = new IMAPSourceAccount(this);
imapAccount->prepareConnection(mHost, mPort, user, user, mPw, mEncryptionMode, mAuthenticationMode);
- imapAccount->setIgnoredFolders(QStringList() << QLatin1String("[Gmail]")); //ignore the virtual folders
+ imapAccount->setIgnoredFolders(ignoredFolders());
sourceAccounts << imapAccount;
return sourceAccounts;
diff --git a/migrationutility/main.cpp b/migrationutility/main.cpp
index 8913295..9caf780 100644
--- a/migrationutility/main.cpp
+++ b/migrationutility/main.cpp
@@ -155,8 +155,9 @@ int main(int argc, char *argv[])
GoogleSourceServer *source = new GoogleSourceServer(&app);
source->setHost("imap.googlemail.com", 993);
source->setAdminCredentials(args->getOption("from-proxyauth"), args->getOption("from-password"));
- source->setEncryption(KIMAP::LoginJob::TlsV1);
+ source->setEncryption(KIMAP::LoginJob::AnySslVersion);
source->setAuthentication(KIMAP::LoginJob::ClearText);
+ source->setIgnoredFolders(QStringList() << QLatin1String("[Gmail]")); //ignore the virtual folders
if (args->isSet("from-user")) {
source->setSingleUser(args->getOption("from-user"));
}