Commit 59159c6f authored by David Faure's avatar David Faure

Revert unwanted changes in previous commit

parent 0b1caefa
......@@ -400,7 +400,6 @@ void AgentBasePrivate::init()
mSettings->setValue(QStringLiteral("Agent/Name"), mName);
}
}
Q_ASSERT(mName != QLatin1String("IMAP E-Mail Server"));
connect(mChangeRecorder, &Monitor::itemAdded,
this, &AgentBasePrivate::itemAdded);
......@@ -1237,7 +1236,6 @@ QString AgentBase::identifier() const
void AgentBase::setAgentName(const QString &name)
{
Q_D(AgentBase);
Q_ASSERT(name != QLatin1String("IMAP E-Mail Server"));
if (name == d->mName) {
return;
}
......@@ -1263,10 +1261,8 @@ QString AgentBase::agentName() const
{
Q_D(const AgentBase);
if (d->mName.isEmpty()) {
Q_ASSERT(d->mId != QLatin1String("IMAP E-Mail Server"));
return d->mId;
} else {
Q_ASSERT(d->mName != QLatin1String("IMAP E-Mail Server"));
return d->mName;
}
}
......
......@@ -220,7 +220,7 @@ void ItemRetrievalManager::processRequest()
void ItemRetrievalManager::retrievalJobFinished(ItemRetrievalRequest *request, const QString &errorMsg)
{
qDebug() << "ItemRetrievalJob finished for request" << request << ", error:" << errorMsg;
qCDebug(AKONADISERVER_LOG) << "ItemRetrievalJob finished for request" << request << ", error:" << errorMsg;
mLock->lockForWrite();
request->errorMsg = errorMsg;
request->processed = true;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment