yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[xdgoutput] Only send initial name and description if set

Browse source 
Summary:
We hit this if we run an old kwin against new kwayland.

Kwin won't set the name so it's empty, so we'll call
zxdg_output_v1_send_name with an empty string

QtWayland will see that we receive this and update mOutputName to an
empty string which causes client issues.

Reviewers: #kwin

Subscribers: kde-frameworks-devel

Tags: #frameworks

Differential Revision: https://phabricator.kde.org/D28245
This commit is contained in:
David Edmundson 2020-03-24 16:31:58 +00:00
parent cbc38479d9
commit dcf03ad241
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/wayland/server/xdgoutput_interface.cpp
View file

@ -234,8 +234,12 @@ void XdgOutputInterface::Private::resourceConnected(XdgOutputV1Interface *resour
{
resource->setLogicalPosition(pos);
resource->setLogicalSize(size);
resource->setName(name);
resource->setDescription(description);
if (!name.isEmpty()) {
resource->setName(name);
}
if (!description.isEmpty()) {
resource->setDescription(description);
}
if (doneOnce) {
resource->done();
}