Commit df3179e2 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Merge remote-tracking branch 'origin/release/20.04'

parents 2879081f ead08a1e
Pipeline #21389 passed with stage
in 6 minutes and 35 seconds
...@@ -909,7 +909,6 @@ void ImportMailJobInterface::restoreIdentity() ...@@ -909,7 +909,6 @@ void ImportMailJobInterface::restoreIdentity()
} }
} }
const QString name = group.readEntry(QStringLiteral("Name")); const QString name = group.readEntry(QStringLiteral("Name"));
addNewIdentity(name, group, defaultIdentity, oldUid); addNewIdentity(name, group, defaultIdentity, oldUid);
} }
Q_EMIT info(i18n("Identities restored.")); Q_EMIT info(i18n("Identities restored."));
......
...@@ -87,8 +87,9 @@ QString ImportMailJobInterfaceImpl::adaptNewResourceUrl(bool overwriteResources, ...@@ -87,8 +87,9 @@ QString ImportMailJobInterfaceImpl::adaptNewResourceUrl(bool overwriteResources,
void ImportMailJobInterfaceImpl::addNewIdentity(const QString &name, KConfigGroup &group, int defaultIdentity, int oldUid) void ImportMailJobInterfaceImpl::addNewIdentity(const QString &name, KConfigGroup &group, int defaultIdentity, int oldUid)
{ {
KIdentityManagement::Identity *identity = &mIdentityManager->newFromScratch(uniqueIdentityName(name)); const QString uniqueName = uniqueIdentityName(name);
group.writeEntry(QStringLiteral("Name"), name); KIdentityManagement::Identity *identity = &mIdentityManager->newFromScratch(uniqueName);
group.writeEntry(QStringLiteral("Name"), uniqueName);
group.sync(); group.sync();
identity->readConfig(group); identity->readConfig(group);
......
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