Skip to content
GitLab
Menu
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
624b2850
Commit
624b2850
authored
Nov 08, 2021
by
Laurent Montel
😁
Browse files
Fix autotest
parent
60338686
Pipeline
#95356
canceled with stage
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
core/autotests/mail/data/import/identitiesandconfigandmailtransportandresources/references/config/akonadi_archivemail_agentrc
View file @
624b2850
...
...
@@ -6,7 +6,7 @@ enabled=true
maximumArchiveCount=0
saveCollectionId=4048
saveSubCollection=true
storePath=/home/laurent
/a
storePath=
file://
/home/laurent
[ArchiveMailDialog]
Size=500,300
...
...
core/autotests/notes/importnotesjobinterfacetest.cpp
View file @
624b2850
...
...
@@ -33,8 +33,8 @@ void ImportNotesJobInterfaceTest::importNote()
QFETCH
(
QString
,
zipFilePath
);
QFETCH
(
QString
,
testPath
);
QFETCH
(
Utils
::
StoredTypes
,
options
);
TestImportFile
*
file
=
new
TestImportFile
(
zipFilePath
+
testPath
,
this
);
const
QString
fullTestPath
=
zipFilePath
+
testPath
;
TestImportFile
*
file
=
new
TestImportFile
(
fullTestPath
,
this
);
file
->
setPathConfig
(
fullTestPath
);
file
->
setExtractPath
(
QDir
::
tempPath
()
+
testPath
);
file
->
setExcludePath
(
Utils
::
notePath
());
...
...
core/mail/importmailjobinterface.cpp
View file @
624b2850
...
...
@@ -620,7 +620,7 @@ void ImportMailJobInterface::restoreConfig()
const
KArchiveEntry
*
kabldapentry
=
mArchiveDirectory
->
entry
(
Utils
::
configsPath
()
+
labldaprcStr
);
if
(
kabldapentry
&&
kabldapentry
->
isFile
())
{
const
auto
kabldap
=
static_cast
<
const
KArchiveFile
*>
(
kabldapentry
);
const
QString
kabldaprc
=
configLocation
(
)
+
labldaprcStr
;
const
QString
kabldaprc
=
QStandardPaths
::
writableLocation
(
QStandardPaths
::
ConfigLocation
)
+
QLatin1Char
(
'/'
)
+
labldaprcStr
;
if
(
QFileInfo
::
exists
(
kabldaprc
))
{
const
int
result
=
mergeConfigMessageBox
(
labldaprcStr
);
if
(
result
==
KMessageBox
::
Yes
)
{
...
...
@@ -636,7 +636,7 @@ void ImportMailJobInterface::restoreConfig()
const
KArchiveEntry
*
archiveconfigurationentry
=
mArchiveDirectory
->
entry
(
Utils
::
configsPath
()
+
archiveconfigurationrcStr
);
if
(
archiveconfigurationentry
&&
archiveconfigurationentry
->
isFile
())
{
const
auto
archiveconfiguration
=
static_cast
<
const
KArchiveFile
*>
(
archiveconfigurationentry
);
const
QString
archiveconfigurationrc
=
configLocation
(
)
+
archiveconfigurationrcStr
;
const
QString
archiveconfigurationrc
=
QStandardPaths
::
writableLocation
(
QStandardPaths
::
ConfigLocation
)
+
QLatin1Char
(
'/'
)
+
archiveconfigurationrcStr
;
if
(
QFileInfo
::
exists
(
archiveconfigurationrc
))
{
const
int
result
=
mergeConfigMessageBox
(
archiveconfigurationrcStr
);
if
(
result
==
KMessageBox
::
Yes
)
{
...
...
@@ -653,7 +653,7 @@ void ImportMailJobInterface::restoreConfig()
const
KArchiveEntry
*
archivemailentry
=
mArchiveDirectory
->
entry
(
Utils
::
configsPath
()
+
folderMailArchiveStr
);
if
(
archivemailentry
&&
archivemailentry
->
isFile
())
{
const
auto
archiveconfiguration
=
static_cast
<
const
KArchiveFile
*>
(
archivemailentry
);
const
QString
archiveconfigurationrc
=
configLocation
(
)
+
folderMailArchiveStr
;
const
QString
archiveconfigurationrc
=
QStandardPaths
::
writableLocation
(
QStandardPaths
::
ConfigLocation
)
+
QLatin1Char
(
'/'
)
+
folderMailArchiveStr
;
if
(
QFileInfo
::
exists
(
archiveconfigurationrc
))
{
const
int
result
=
mergeConfigMessageBox
(
folderMailArchiveStr
);
if
(
result
==
KMessageBox
::
Yes
)
{
...
...
@@ -670,7 +670,8 @@ void ImportMailJobInterface::restoreConfig()
const
KArchiveEntry
*
templatesconfigurationentry
=
mArchiveDirectory
->
entry
(
Utils
::
configsPath
()
+
templatesconfigurationrcStr
);
if
(
templatesconfigurationentry
&&
templatesconfigurationentry
->
isFile
())
{
const
auto
templatesconfiguration
=
static_cast
<
const
KArchiveFile
*>
(
templatesconfigurationentry
);
const
QString
templatesconfigurationrc
=
configLocation
()
+
templatesconfigurationrcStr
;
const
QString
templatesconfigurationrc
=
QStandardPaths
::
writableLocation
(
QStandardPaths
::
ConfigLocation
)
+
QLatin1Char
(
'/'
)
+
templatesconfigurationrcStr
;
if
(
QFileInfo
::
exists
(
templatesconfigurationrc
))
{
// TODO 4.13 allow to merge config.
if
(
overwriteConfigMessageBox
(
templatesconfigurationrcStr
))
{
...
...
@@ -685,7 +686,7 @@ void ImportMailJobInterface::restoreConfig()
const
KArchiveEntry
*
kmail2rcentry
=
mArchiveDirectory
->
entry
(
Utils
::
configsPath
()
+
kmailStr
);
if
(
kmail2rcentry
&&
kmail2rcentry
->
isFile
())
{
const
auto
kmailrc
=
static_cast
<
const
KArchiveFile
*>
(
kmail2rcentry
);
const
QString
kmail2rc
=
configLocation
(
)
+
kmailStr
;
const
QString
kmail2rc
=
QStandardPaths
::
writableLocation
(
QStandardPaths
::
ConfigLocation
)
+
QLatin1Char
(
'/'
)
+
kmailStr
;
if
(
QFileInfo
::
exists
(
kmail2rc
))
{
if
(
overwriteConfigMessageBox
(
kmailStr
))
{
importKmailConfig
(
kmailrc
,
kmail2rc
,
kmailStr
,
Utils
::
configsPath
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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