[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kwin] libinput: libinput/connection: Don't hardcode seat0 anymore
From:       Martin_Flöser <null () kde ! org>
Date:       2018-04-22 15:29:55
Message-ID: E1fAGw7-0003N9-5I () code ! kde ! org
[Download RAW message or body]

Git commit ddda524974d99249570e72d17f34215a735b2acc by Martin Flöser, on behalf of Nerdopolis Turfwalker.
Committed on 22/04/2018 at 15:29.
Pushed by graesslin into branch 'master'.

libinput/connection: Don't hardcode seat0 anymore

Summary: use a new function to get the logind, instead of assuming seat0

Test Plan: kwin still starts

Reviewers: #kwin, davidedmundson

Reviewed By: davidedmundson

Subscribers: davidedmundson, rkflx, graesslin, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D9552

M  +2    -3    libinput/connection.cpp

https://commits.kde.org/kwin/ddda524974d99249570e72d17f34215a735b2acc

diff --git a/libinput/connection.cpp b/libinput/connection.cpp
index 82c374d71..7664659d6 100644
--- a/libinput/connection.cpp
+++ b/libinput/connection.cpp
@@ -135,9 +135,8 @@ Connection *Connection::create(QObject *parent)
             s_context = nullptr;
             return nullptr;
         }
-        // TODO: don't hardcode seat name
-        if (!s_context->assignSeat("seat0")) {
-            qCWarning(KWIN_LIBINPUT) << "Failed to assign seat seat0";
+        if (!s_context->assignSeat(LogindIntegration::self()->seat().toUtf8().constData())) {
+            qCWarning(KWIN_LIBINPUT) << "Failed to assign seat" << LogindIntegration::self()->seat();
             delete s_context;
             s_context = nullptr;
             return nullptr;
[prev in list] [next in list] [prev in thread] [next in thread]