Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xfce4-session: Backport querying lock command in xflock4 #30211

Merged
merged 1 commit into from Dec 19, 2017
Merged

xfce4-session: Backport querying lock command in xflock4 #30211

merged 1 commit into from Dec 19, 2017

Conversation

NakedFerret
Copy link
Contributor

@NakedFerret NakedFerret commented Oct 8, 2017

Motivation for this change

Up until xfce 4.13, xflock4 only had support for "whitelisted" (cough hardcoded cough) locks screens. Version 4.13 added the ability for the user to specify the lock command via the xfce settings. This PR backports that functionality

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@NakedFerret NakedFerret changed the title Backport querying lock command in xflock4 xfce4-session: Backport querying lock command in xflock4 Oct 8, 2017
@lukateras lukateras self-assigned this Dec 18, 2017
@lukateras lukateras added the 6.topic: xfce The Xfce Desktop Environment label Dec 18, 2017
@grahamc
Copy link
Member

grahamc commented Dec 19, 2017

@GrahamcOfBorg eval

@lukateras
Copy link
Member

Rebuilt system with this patch, tested via:

xfconf-query -c xfce4-session -p /general/LockCommand -s true -t string --create
xflock4

As expected, lock screen didn't show up.

Up until xfce 4.13, xflock4 only had support for "whitelisted"
(*cough* hardcoded *cough*) locks screens. Version 4.13 added the
ability for the user to specify the lock command via the xfce
settings. This PR backports that functionality

https://github.com/xfce-mirror/xfce4-session/blob/xfce4-session-4.13.0/scripts/xflock4
@lukateras lukateras merged commit c9c1ccd into NixOS:master Dec 19, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants