~brandontschaefer/unity/lp.1099815-fix

Viewing all changes in revision 3243.

  • Committer: Tarmac
  • Author(s): Martin Pitt
  • Date: 2013-03-21 11:43:07 UTC
  • mfrom: (3226.3.7 unity)
  • Revision ID: tarmac-20130321114307-y55vy9k252p640yq
Add logind alternatives to ConsoleKit and UPower suspend/hibernate calls (LP: #1155021)

ConsoleKit is being deprecated, so add support for logind for logout, shutdown, and reboot.

Future UPower versions will drop suspend/release calls, as they moved into logind:
  http://lists.freedesktop.org/archives/devkit-devel/2013-January/001339.html

With ConsoleKit, sessions get $XDG_SESSION_COOKIE set, while with logind they get $XDG_SESSION_ID. So use that to determine which one to talk to until we drop support for ConsoleKit/upower. Fixes: https://bugs.launchpad.net/bugs/1155021.

Approved by PS Jenkins bot, Marco Trevisan (Treviño).

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: