summaryrefslogtreecommitdiff
path: root/migrationutility/kolabserver.cpp
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2012-10-05 12:11:17 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2012-10-05 12:11:17 (GMT)
commita5403604dc9e090a7bd9baf43da9475683354f88 (patch)
treed655660d1a92465d1592263fe6a2782a0476d7db /migrationutility/kolabserver.cpp
parentfbd448e99d4d02a10e17baa36d0030ed877b7580 (diff)
downloadkolab-utils-a5403604dc9e090a7bd9baf43da9475683354f88.tar.gz
Various fixes:
* actually set metadata on folder * don't crash if we can't convert an object * abort migration if we coulnd't connect to the account *
Diffstat (limited to 'migrationutility/kolabserver.cpp')
-rw-r--r--migrationutility/kolabserver.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/migrationutility/kolabserver.cpp b/migrationutility/kolabserver.cpp
index b4197c6..e1cd5a5 100644
--- a/migrationutility/kolabserver.cpp
+++ b/migrationutility/kolabserver.cpp
@@ -51,7 +51,11 @@ KolabAccount* KolabServer::getAccount(const QString& user)
{
KolabAccount *account = new KolabAccount(this);
account->setHost(mHost, mPort);
- account->setCredentials(user, mPw);
+ account->setCredentials(user, mPw, mUsername);
account->setDryRun(mDryRun);
+ if (!account->init()) {
+ account->deleteLater();
+ return 0;
+ }
return account;
}