Noah Davis authored Dec 24, 2021 and Nate Graham committed Dec 24, 2021

BUG: 446991


(cherry picked from commit df558583)

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"

David Edmundson authored Dec 19, 2021 and Fushan Wen committed Dec 19, 2021

In an &operator= we already have an object. It will have the d-pointer
already allocated.

If we create a new private implementation our old one leaks


(cherry picked from commit 079552b3)

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"

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"

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"

David Edmundson authored Dec 06, 2021 and Nate Graham committed Dec 13, 2021

removeItemFromModel calls entry.uninstalledFiles().constFirst

In the (re)installation case we don't check if it had uninstalled files.

BUG: 446100


(cherry picked from commit 24c337de)

Ensures `i18n` in C++ side of things works


(cherry picked from commit 42efa49b)

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"

Alexander Lohnau authored Dec 08, 2021 and Nate Graham committed Dec 08, 2021

BUG: 439797


(cherry picked from commit d168d2a5)

The `introAnimation` only kicks in at stage 2 so you might catch a
glimpse of the logo before its fade-in animation starts.


(cherry picked from commit 5f8f1514)

ValdikSS ValdikSS authored Dec 05, 2021 and Nate Graham committed Dec 05, 2021

Commit f9669af2 introduced a regression with Klipper Actions: it used
truncated text as a source for the action, which resulted in truncated
output.

BUG: 444365


(cherry picked from commit 49365857)

David Edmundson authored Dec 05, 2021 and Nate Graham committed Dec 05, 2021

In a recent commit HistoryItem::text() became the visual representation
of the mimedata; often a truncated string.

mimeData()->text() always returns the full value.

BUG: 446441


(cherry picked from commit 2db375f6)

GIT_SILENT

CCBUG: 440650
(cherry picked from commit c007e68a)

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"

David Edmundson authored Nov 25, 2021 and Nate Graham committed Nov 26, 2021

This matches what kwin's effects have always been searching for. It only
used to appear to work as "ksmserver ksmserver" was checked in previous
versions.

BUG: 444898
BUG: 444899
(cherry picked from commit a7fa0101)

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"

This fixes a race condition.


(cherry picked from commit 64458873)

Due to async nature of QDBusPendingReply, services could be already
registered by QDBusServiceWatcher when the pending reply takes a long
time to finish, so it's possible that QDBusServiceWatcher::serviceRegistered
signal is emitted before the pending reply emits QDBusPendingCallWatcher::finished,
which will make the same service added twice and crash plasmashell.

We need to check if a service is already added in m_sniServices before
processing registered items in QDBusReply.

BUG: 443961


(cherry picked from commit c0b8f687)

Otherwise we exit and KRunner runner into a long timeout.

By making this a dedicated DBus error KRunner can also know, that this
runner can not be started. Consequently making new attempts to query
this runner can be prevented.

Because the runner is DBus-Activated, we can not exit the process, otherwise other
processes (like the search in the app launcher) will have the same issue with the timeout.
BUG: 445342


(cherry picked from commit fa5ac3fe)

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"

GIT_SILENT

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"

KWin can't notice soon enough the window being an osd type, so work around
by setting min and max size hints to the same value to make it non resizable

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"

don't set layout size hints from the contents size. this will cause
binding loops. use the implicit size instead.
This solves an issue visible especially on wayland (different roundtrip of timing of resizes in x11 seems to mask this problem) where the clock tooltip
sometimes gets stuck in an infinite resize loop freezing the whole plasma shell
BUG:422072

Oxalica -- authored Nov 02, 2021 and Nate Graham committed Nov 03, 2021

This fix crash when turn off and on the only primary display.

BUG: 438839
BUG: 444801


(cherry picked from commit d39592c3)

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"

Oxalica -- authored Nov 02, 2021 and David Edmundson committed Nov 02, 2021

Systemd units which are symlinked to the service directory will be in
`linked` or `linked-runtime` state. They are also available and
runnable. This can happen when the package manager uses symlinks to
install systemd units instead of copying them, like on NixOS.


(cherry picked from commit a6e513d0)

Base the width on the actual thickness of the SVG provided by the theme,
otherwise it might get stretched way too much.


(cherry picked from commit 31b3a130)

David Edmundson authored Oct 27, 2021 and Nate Graham committed Oct 28, 2021

XdgActivationTokens are loaded async. To acheive a job like pattern we
were comparing serials in our slot when one was created.

On wayland this isn't ideal because we're slowly building up an
increasibly long list of lambdas being run, but they'll all no-op.

On X11 because lastInputSerial is always 0 we run the slot multiple
times for every system tray item each time an item is clicked or an
application is launched.

For xembedsniproxy this is especially problematic problematic as we will
trigger synthesised input events in our slot.

BUG: 444385


(cherry picked from commit e55c2744)

This is needed for the runner, which has two different keywords for the two scripting modes

CCBUG: 444366


(cherry picked from commit 63bea079)