From 10e725e3821e40d66c5cd7402ed57e8ac9bc8c71 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 19 Feb 2010 06:51:41 +0100 Subject: debian/90consolekit: gdm already creates a CK session for us, so do not run the expensive D-Bus calls if we have $GDMSESSION. --- debian/90consolekit | 4 +++- debian/changelog | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/90consolekit b/debian/90consolekit index be7aa6c..f0082a7 100644 --- a/debian/90consolekit +++ b/debian/90consolekit @@ -24,7 +24,9 @@ is_on_console() { fi } -if [ -x "$CK_LAUNCH_SESSION" ] && \ +# gdm already creates a CK session for us, so do not run the expensive D-Bus +# calls if we have $GDMSESSION +if [ -z "$GDMSESSION" ] && [ -x "$CK_LAUNCH_SESSION" ] && \ ( [ -z "$XDG_SESSION_COOKIE" ] || is_on_console ) ; then STARTUP="$CK_LAUNCH_SESSION $STARTUP" fi diff --git a/debian/changelog b/debian/changelog index c45795c..42b3d38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +consolekit (0.4.1-4) UNRELEASED; urgency=low + + * debian/90consolekit: gdm already creates a CK session for us, so do not + run the expensive D-Bus calls if we have $GDMSESSION. + + -- Martin Pitt Fri, 19 Feb 2010 06:50:58 +0100 + consolekit (0.4.1-3) unstable; urgency=low [ Martin Pitt ] -- cgit v1.2.3