tcberner added a comment.
We could certainly do that by removing the wrapping `if ( NOT HAVE_LOGINCTL
)`.
Additionally, also the order of the if-branches in `abstractlocker.cpp` would
probably need to be reordered as to prefere login1.
REPOSITORY
R133 KScreenLocker
REVISION DETAIL
graesslin added inline comments.
INLINE COMMENTS
> arfrever wrote in CMakeLists.txt:97
> I would suggest that this build-time detection of ConsoleKit occur always,
> and as a result, that ck-unlock-session be always installed if ConsoleKit is
> installed.
> For example, I have both loginctl
arfrever added inline comments.
INLINE COMMENTS
> CMakeLists.txt:97
> +if ( NOT HAVE_LOGINCTL )
> +find_package(ConsoleKit)
> +set_package_properties(ConsoleKit PROPERTIES
I would suggest that this build-time detection of ConsoleKit occur always, and
as a result, that ck-unlock-session
This revision was automatically updated to reflect the committed changes.
tcberner marked an inline comment as done.
Closed by commit R133:68fb0b7d3e1c: Add script to unlock a broken session via
ConsoleKit. (authored by tcberner).
REPOSITORY
R133 KScreenLocker
CHANGES SINCE LAST UPDATE
graesslin accepted this revision.
REPOSITORY
R133 KScreenLocker
BRANCH
master
REVISION DETAIL
https://phabricator.kde.org/D9713
To: tcberner, graesslin, #freebsd, #plasma
Cc: broulik, PureTryOut, adridg, pprkut, graesslin, plasma-devel, ZrenBot,
lesliezhai, ali-mohamed, jensreuterberg,
tcberner updated this revision to Diff 27901.
tcberner added a comment.
- Switch the url to https://github.com/ConsoleKit2/ConsoleKit2
- coble together something less "unfortunate" from the official description:
//ConsoleKit2 is a framework for defining and tracking users, login sessions,
pprkut added inline comments.
INLINE COMMENTS
> CMakeLists.txt:99
> +set_package_properties(ConsoleKit PROPERTIES
> +URL "http://www.freedesktop.org/wiki/Software/ConsoleKit;
> +DESCRIPTION "Framework for defining and tracking users"
It's probably better to refer to
broulik added a comment.
> Framework for […] tracking users
is a bit of an unfortunate term
REPOSITORY
R133 KScreenLocker
BRANCH
master
REVISION DETAIL
https://phabricator.kde.org/D9713
To: tcberner, graesslin, #freebsd, #plasma
Cc: broulik, PureTryOut, adridg, pprkut,
tcberner added a comment.
On FreeBSD the configure now looks like:
[...]
-- Could NOT find loginctl (missing: loginctl_EXECUTABLE)
-- Found ConsoleKit: /usr/local/bin/ck-list-sessions
[...]
* prctl/procctl tracing control, Required for disallowing ptrace on
greeter
tcberner updated this revision to Diff 27898.
tcberner added a comment.
- Fix logind1 dbus path
- Improve CMakeLists.txt to only display the feature once
REPOSITORY
R133 KScreenLocker
CHANGES SINCE LAST UPDATE
https://phabricator.kde.org/D9713?vs=26031=27898
BRANCH
master
REVISION
adridg added inline comments.
INLINE COMMENTS
> abstractlocker.cpp:69
> +text = text_ck;
> +} else if (haveService("org.freedesktop.login1.Session")) {
> +text = text_ld;
Drop ".Session", since the service is registered (Manjaro, KDE Neon) as
pprkut added inline comments.
INLINE COMMENTS
> CMakeLists.txt:102
> +TYPE RECOMMENDED
> +PURPOSE "Needed for emergency unlock in case that the greeter is
> broken. In case your distribution does not provide loginctl please contact
> plasma-devel@kde.org to discuss
graesslin accepted this revision.
graesslin added a comment.
This revision is now accepted and ready to land.
I like it! Thanks a lot for adding the runtime checking.
REPOSITORY
R133 KScreenLocker
BRANCH
master
REVISION DETAIL
https://phabricator.kde.org/D9713
To: tcberner,
tcberner added a reviewer: Plasma.
REPOSITORY
R133 KScreenLocker
REVISION DETAIL
https://phabricator.kde.org/D9713
To: tcberner, graesslin, #freebsd, #plasma
Cc: graesslin, plasma-devel, ZrenBot, progwolff, lesliezhai, ali-mohamed,
jensreuterberg, abetts, sebas, apol, mart
tcberner added a reviewer: FreeBSD.
REPOSITORY
R133 KScreenLocker
REVISION DETAIL
https://phabricator.kde.org/D9713
To: tcberner, graesslin, #freebsd
Cc: graesslin, plasma-devel, ZrenBot, progwolff, lesliezhai, ali-mohamed,
jensreuterberg, abetts, sebas, apol, mart
tcberner updated this revision to Diff 26031.
tcberner added a comment.
Use QDbus to query whether ConsoleKit or LoginD is presnet (note, I have not
tested LoginD :) )
REPOSITORY
R133 KScreenLocker
CHANGES SINCE LAST UPDATE
https://phabricator.kde.org/D9713?vs=24891=26031
BRANCH
graesslin added inline comments.
INLINE COMMENTS
> tcberner wrote in abstractlocker.cpp:53
> So something ala
>
> - if logingd-runing then logindmessage
> - if consolekit-running then consolekitmessage
> - else falback message
That would be the ultimate solution ;-)
REPOSITORY
R133
tcberner added inline comments.
INLINE COMMENTS
> graesslin wrote in abstractlocker.cpp:53
> I think this needs to be runtime detected.
So something ala
- if logingd-runing then logindmessage
- if consolekit-running then consolekitmessage
- else falback message
REPOSITORY
R133 KScreenLocker
graesslin requested changes to this revision.
graesslin added inline comments.
This revision now requires changes to proceed.
INLINE COMMENTS
> abstractlocker.cpp:53
> +#if HAVE_CONSOLEKIT
> +auto text = ki18n("The screen locker is broken and unlocking is not
> possible anymore.\n"
> +
tcberner created this revision.
Restricted Application added a project: Plasma.
Restricted Application added a subscriber: plasma-devel.
tcberner requested review of this revision.
REPOSITORY
R133 KScreenLocker
BRANCH
master
REVISION DETAIL
https://phabricator.kde.org/D9713
AFFECTED
20 matches
Mail list logo
