Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Unmaintained
KDE Pim
Commits
e64f99a5
Commit
e64f99a5
authored
May 15, 2016
by
Yuri Chornoivan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix minor typos
parent
b1c7e25c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
kmail/agents/archivemailagent/archivemailmanager.cpp
kmail/agents/archivemailagent/archivemailmanager.cpp
+1
-1
kmail/src/configuredialog/configuresecuritypage.cpp
kmail/src/configuredialog/configuresecuritypage.cpp
+1
-1
pimsettingexporter/core/abstractimportexportjob.cpp
pimsettingexporter/core/abstractimportexportjob.cpp
+2
-2
No files found.
kmail/agents/archivemailagent/archivemailmanager.cpp
View file @
e64f99a5
...
...
@@ -179,7 +179,7 @@ QString ArchiveMailManager::infoToStr(ArchiveMailInfo *info) const
QString
infoStr
=
QLatin1String
(
"collectionId: "
)
+
QString
::
number
(
info
->
saveCollectionId
())
+
QLatin1Char
(
'\n'
);
infoStr
+=
QLatin1String
(
"save sub collection: "
)
+
(
info
->
saveSubCollection
()
?
QStringLiteral
(
"true"
)
:
QStringLiteral
(
"false"
))
+
QLatin1Char
(
'\n'
);
infoStr
+=
QLatin1String
(
"last Date Saved: "
)
+
info
->
lastDateSaved
().
toString
()
+
QLatin1Char
(
'\n'
);
infoStr
+=
QLatin1String
(
"maximum achive number: "
)
+
QString
::
number
(
info
->
maximumArchiveCount
())
+
QLatin1Char
(
'\n'
);
infoStr
+=
QLatin1String
(
"maximum a
r
chive number: "
)
+
QString
::
number
(
info
->
maximumArchiveCount
())
+
QLatin1Char
(
'\n'
);
infoStr
+=
QLatin1String
(
"directory: "
)
+
info
->
url
().
toDisplayString
()
+
QLatin1Char
(
'\n'
);
infoStr
+=
QLatin1String
(
"Enabled: "
)
+
(
info
->
isEnabled
()
?
QStringLiteral
(
"true"
)
:
QStringLiteral
(
"false"
));
return
infoStr
;
...
...
kmail/src/configuredialog/configuresecuritypage.cpp
View file @
e64f99a5
...
...
@@ -120,7 +120,7 @@ void SecurityPage::GeneralTab::save()
{
if
(
MessageViewer
::
MessageViewerSettings
::
self
()
->
htmlMail
()
!=
mSGTab
.
mHtmlMailCheck
->
isChecked
())
{
if
(
KMessageBox
::
warningContinueCancel
(
this
,
i18n
(
"Changing the global "
"HTML setting will overri
v
e all folder specific values."
),
QString
(),
"HTML setting will overri
d
e all folder specific values."
),
QString
(),
KStandardGuiItem
::
cont
(),
KStandardGuiItem
::
cancel
(),
QStringLiteral
(
"htmlMailOverride"
))
==
KMessageBox
::
Continue
)
{
saveCheckBox
(
mSGTab
.
mHtmlMailCheck
,
MessageViewer
::
MessageViewerSettings
::
self
()
->
htmlMailItem
());
if
(
kmkernel
)
{
...
...
pimsettingexporter/core/abstractimportexportjob.cpp
View file @
e64f99a5
...
...
@@ -470,8 +470,8 @@ void AbstractImportExportJob::extractZipFile(const KArchiveFile *file, const QSt
Q_EMIT
error
(
errorMsg
);
}
}
else
{
QFile
achiveFile
(
source
+
QLatin1Char
(
'/'
)
+
file
->
name
());
if
(
!
achiveFile
.
copy
(
destination
+
QLatin1Char
(
'/'
)
+
file
->
name
()))
{
QFile
a
r
chiveFile
(
source
+
QLatin1Char
(
'/'
)
+
file
->
name
());
if
(
!
a
r
chiveFile
.
copy
(
destination
+
QLatin1Char
(
'/'
)
+
file
->
name
()))
{
Q_EMIT
error
(
i18n
(
"Unable to copy file"
,
file
->
name
()));
}
}
...
...
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