Make integration with KScreenLocker optional in WaylandServer
ClosedPublic

Authored by graesslin on Apr 25 2016, 6:54 AM.

Details

Summary

In order to start the WaylandServer in kwin_x11 we need to make sure
that WaylandServer does not start the KScreenLocker integration. On
X11 the lock screen is provided by a different application (in Plasma
by ksmserver).

A new init flag is added to WaylandServer to not integrate with
KScreenLocker. Thus the default is still to integrate with KScreenLocker.

All direct usages of KScreenLocker are guarded to not be called if
the screenlocker integration is not present.

Diff Detail

Repository
R108 KWin
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
graesslin updated this revision to Diff 3500.Apr 25 2016, 6:54 AM
graesslin retitled this revision from to Make integration with KScreenLocker optional in WaylandServer.
graesslin updated this object.
graesslin edited the test plan for this revision. (Show Details)
graesslin added a reviewer: Plasma.
Restricted Application added a project: Plasma. · View Herald TranscriptApr 25 2016, 6:54 AM
Restricted Application added a subscriber: plasma-devel. · View Herald Transcript
bshah accepted this revision.Apr 25 2016, 7:35 AM
bshah added a reviewer: bshah.
This revision is now accepted and ready to land.Apr 25 2016, 7:35 AM
This revision was automatically updated to reflect the committed changes.