xserver: Branch 'xorg-server-1.4-apple'

[Jeremy Huddleston]

 hw/xquartz/X11Controller.m |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a459dde0b46d1daf08f8cd2eee0fc854df5e1f1d
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Sat Jan 12 21:24:34 2008 -0800

    XQuartz: Fixed copy-paste error with login_shell commit
    (cherry picked from commit 6deec3acc6f8010b5b53a1e55a0a2c4080ba69d2)

diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index e13edc1..d3f8365 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -302,7 +302,7 @@
   argv[0] = "/usr/bin/login";
   argv[1] = "-fp";
   argv[2] = getlogin();
-  argv[3] = [X11App prefs_get_string:@PREFS_FAKE_BUTTON2 default:"/bin/sh"];
+  argv[3] = [X11App prefs_get_string:@PREFS_LOGIN_SHELL default:"/bin/sh"];
   argv[4] = "-c";
   argv[5] = command;
   argv[6] = NULL;