xserver: Branch 'xorg-server-1.2-apple' - 2 commits

[Jeremy Huddleston]

 configure.ac               |    2 +-
 hw/xquartz/X11Controller.m |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

    XQuartz 1.3.0-apple8

diff --git a/configure.ac b/configure.ac
index d87b1c0..5fbc21f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ dnl Process this file with autoconf to create configure.
 AC_PREREQ(2.57)
 dnl This is the not the Xorg version number, it's the server version number.
 dnl Yes, that's weird.
-AC_INIT([xorg-server], 1.3.0-apple7, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.3.0-apple8, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
commit 6deec3acc6f8010b5b53a1e55a0a2c4080ba69d2
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

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;