--- 90consolekit.orig	2009-11-15 11:18:31.000000000 -0500
+++ 90consolekit	2009-11-15 11:17:09.000000000 -0500
@@ -4,8 +4,12 @@
 #
 # This file is sourced by Xsession(5), not executed.
 
+CK_GET_X11_DISPLAY_DEVICE=/usr/lib/ConsoleKit/ck-get-x11-display-device
+CK_LIST_SESSIONS=/usr/bin/ck-list-sessions
 CK_LAUNCH_SESSION=/usr/bin/ck-launch-session
 
-if [ -z "$XDG_SESSION_COOKIE" ] && [ -x "$CK_LAUNCH_SESSION" ]; then
-    STARTUP="$CK_LAUNCH_SESSION $STARTUP"
+if [ -x "$CK_GET_X11_DISPLAY_DEVICE" -a -x "$CK_LIST_SESSIONS" -a -x "$CK_LAUNCH_SESSION" ] ; then
+    if [ "$($CK_LIST_SESSIONS | grep "$($CK_GET_X11_DISPLAY_DEVICE)")" = "" ] ; then
+        STARTUP="$CK_LAUNCH_SESSION $STARTUP"
+    fi
 fi