Start ssh-agent or gpg-agent even if called by kdm

svn path=/nixos/trunk/; revision=21100

modules/services/x11/display-managers/default.nix

@@ -21,9 +21,6 @@ let
     ''
       #! /bin/sh
 
-      # Handle being called by kdm.
-      if test "''${1:0:1}" = /; then eval exec "$1"; fi
-
       # The first argument of this script is the session type.
       sessionType="$1"
       if test "$sessionType" = default; then sessionType=""; fi
@@ -60,6 +57,9 @@ let
           exec ${pkgs.consolekit}/bin/ck-launch-session "$0" "$sessionType"
       fi
 
+      # Handle being called by kdm.
+      if test "''${1:0:1}" = /; then eval exec "$1"; fi
+
       # Load X defaults.
       if test -e ~/.Xdefaults; then
           ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults