GitLab

Jonathan Marten authored Sep 19, 2021 and Laurent Montel committed Sep 21, 2021

This appears to be a consequence of commits 3e34c9f0 and 22d1bab9.
When the system tray icon is active, closing the main window should
merely hide it but keep KMail running in the background.  However,
the test "if (KMMainWidget::mainWidgetList())" in KMKernel::canQueryClose()
seems to be incorect, it is saying "if there is a main window, then
allow the close".  The effect is that KMail quits when the window is
closed.

The test may have been incorrect for a long time, but masked by the
second part of the conditional "and if there is more than one main
window" before commit 3e34c9f0.  Most users will only have one KMail
main window open and so will never satisfy the condition.

Reversing the test restores the correct behaviour, so that KMail keeps
running in the background (with the system tray icon shown if enabled)
when the main window is closed.

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Friedrich W. H. Kossebau authored Sep 15, 2021 and Laurent Montel committed Sep 16, 2021

GIT_SILENT

GIT_SILENT: we need to add KDEClangFormat* as we don't use KDEFrameworkCompilerSettings.cmake otherwise .clang-format is not generated

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

GIT_SILENT

when unused

Undo yesterday's changes. Carl Schwan's commit has been reverted. The plain text / HTML toggle bar is now always visible.

Undo yesterday's update. Carl Schwan's commit has been reverted. Plain text / HTML toggle bar is now shown on every message.

Clarify behavior of HTML / plain text toggle bar. See Carl Schwan's commit 6c10959b in PIM messagelib.