summaryrefslogtreecommitdiff
path: root/daemon
diff options
context:
space:
mode:
authorGeorge Lebl <jirka@5z.com>2004-10-01 04:05:36 +0000
committerGeorge Lebl <jirka@src.gnome.org>2004-10-01 04:05:36 +0000
commit47936d8a5a3b1f410073b8e27ccfad580f8c890c (patch)
tree476e1533118a7ac0e1cbd4bfe5e5598996ee3fc1 /daemon
parent67a7729efda2ef52f4c0c93eecd442b061312030 (diff)
downloadgdm-47936d8a5a3b1f410073b8e27ccfad580f8c890c.tar.gz
set GDM_XSERVER_LOCATION with the x server type
Thu Sep 30 20:49:26 2004 George Lebl <jirka@5z.com> * daemon/slave.c: set GDM_XSERVER_LOCATION with the x server type
Diffstat (limited to 'daemon')
-rw-r--r--daemon/slave.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/daemon/slave.c b/daemon/slave.c
index 1474a478..aa11e75e 100644
--- a/daemon/slave.c
+++ b/daemon/slave.c
@@ -3487,6 +3487,19 @@ session_child_run (struct passwd *pwent,
ve_setenv ("SHELL", pwent->pw_shell, TRUE);
ve_unsetenv ("MAIL"); /* Unset $MAIL for broken shells */
+ if (d->type == TYPE_LOCAL) {
+ ve_setenv ("GDM_XSERVER_LOCATION", "local", TRUE);
+ } else if (d->type == TYPE_XDMCP) {
+ ve_setenv ("GDM_XSERVER_LOCATION", "xdmcp", TRUE);
+ } else if (d->type == TYPE_FLEXI) {
+ ve_setenv ("GDM_XSERVER_LOCATION", "flexi", TRUE);
+ } else if (d->type == TYPE_FLEXI_XNEST) {
+ ve_setenv ("GDM_XSERVER_LOCATION", "flexi-xnest", TRUE);
+ } else {
+ /* huh? */
+ ve_setenv ("GDM_XSERVER_LOCATION", "unknown", TRUE);
+ }
+
if (gnome_session != NULL)
ve_setenv ("GDM_GNOME_SESSION", gnome_session, TRUE);