Commit dcf03ad2 authored by David Edmundson's avatar David Edmundson
Browse files

[xdgoutput] Only send initial name and description if set

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
parent cbc38479
......@@ -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();
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment