Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
PIM Data Exporter
Commits
61c531f3
Commit
61c531f3
authored
May 28, 2020
by
Laurent Montel
Browse files
Sort list for test
parent
eebf077d
Pipeline
#21539
passed with stage
in 7 minutes
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
core/autotests/mail/data/import/identities/references/identities/emailidentities
View file @
61c531f3
...
...
@@ -24,8 +24,6 @@ Pgp Auto Encrypt=false
Pgp Auto Sign=false
Preferred Crypto Message Format=openpgp/mime
Reply-To Address=foo@kde.org
SMIME Encryption Key=E225DBF44009243D1F177F552D5397C
SMIME Signing Key=9243D1F177F552D5397C
Signature Enabled=true
Signature Type=inline
Templates=3735
...
...
@@ -49,13 +47,9 @@ Image Location=
Inline Signature=OpenGL Experts\n
Inlined Html=false
Name=Bla Bli
Organization=kde
PGP Encryption Key=CDF87D8A5BAA692D34B30D1065D31
PGP Signing Key=F87D8A5BAA692D34B30D1065D31
Pgp Auto Encrypt=false
Pgp Auto Sign=false
Preferred Crypto Message Format=s/mime
Reply-To Address=foo@kde.org
SMIME Encryption Key=E225DBF44009243D1F177F552D5397C
SMIME Signing Key=9243D1F177F552D5397C
Signature Enabled=true
...
...
core/mail/importmailjobinterface.cpp
View file @
61c531f3
...
...
@@ -866,8 +866,9 @@ void ImportMailJobInterface::restoreIdentity()
KConfigGroup
general
=
identityConfig
->
group
(
QStringLiteral
(
"General"
));
const
int
defaultIdentity
=
general
.
readEntry
(
QStringLiteral
(
"Default Identity"
),
-
1
);
const
QStringList
identityList
=
identityConfig
->
groupList
().
filter
(
QRegularExpression
(
QStringLiteral
(
"Identity #
\\
d+"
)));
for
(
const
QString
&
identityStr
:
identityList
)
{
QStringList
identityList
=
identityConfig
->
groupList
().
filter
(
QRegularExpression
(
QStringLiteral
(
"Identity #
\\
d+"
)));
std
::
sort
(
identityList
.
begin
(),
identityList
.
end
());
for
(
const
QString
&
identityStr
:
qAsConst
(
identityList
))
{
KConfigGroup
group
=
identityConfig
->
group
(
identityStr
);
int
oldUid
=
-
1
;
const
QString
uidStr
(
QStringLiteral
(
"uoid"
));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment