xserver: Branch 'master' - 4 commits

[Daniel Stone]

 configure.ac            |    7 ++++++-
 hw/kdrive/ephyr/ephyr.c |    2 ++
 os/connection.c         |    2 ++
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
diff-tree 811675733e97416c990e6dc9c19271b43d96248d (from 8f6961d385bda92703f18090cff551409d2710c9)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Thu Feb 15 19:09:00 2007 +0200

    os: fix client privates leak
    Minor leak here.  Oops.

diff --git a/os/connection.c b/os/connection.c
index ffe911e..d0ffb81 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -1066,6 +1066,8 @@ CloseDownConnection(ClientPtr client)
     XdmcpCloseDisplay(oc->fd);
 #endif
     CloseDownFileDescriptor(oc);
+    FreeOsBuffers(oc);
+    xfree(client->osPrivate);
     client->osPrivate = (pointer)NULL;
     if (auditTrailLevel > 1)
 	AuditF("client %d disconnected\n", client->index);
diff-tree 8f6961d385bda92703f18090cff551409d2710c9 (from a3b62623b8aac56b219633bdb2c2f6de19b0580b)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Thu Feb 15 19:08:46 2007 +0200

    configure.ac: add xdarwin stubs
    Add stub AM_CONDITIONALs to at least fix the build.

diff --git a/configure.ac b/configure.ac
index 9611065..afbf980 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1737,6 +1737,11 @@ AM_CONDITIONAL(XFAKESERVER, [test "x$KDR
 AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes])
 AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes])
 
+dnl XDarwin DDX (FIXME)
+AM_CONDITIONAL(XQUARTZ, false)
+AM_CONDITIONAL(HAVE_X_PLUGIN, false)
+AM_CONDITIONAL(HAVE_AGL_FRAMEWORK, false)
+
 dnl these only go in xkb-config.h (which is shared by the Xorg and Xnest servers)
 AC_DEFINE(__XKBDEFRULES__, "xorg", [Default XKB rules])
 AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data])
diff-tree a3b62623b8aac56b219633bdb2c2f6de19b0580b (from 0f6dd4aea6176507dbe1c90c950d332fecbcaacb)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Thu Feb 15 17:07:42 2007 +0200

    change versioning for new server version scheme
    See:
    http://xorg.freedesktop.org/wiki/XDC2007Notes#head-2719037a1905516c45cf74f0e155c8703221e446

diff --git a/configure.ac b/configure.ac
index 92dc5c9..9611065 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ dnl Process this file with autoconf to c
 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.2.99.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.3.99.0, [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
diff-tree 0f6dd4aea6176507dbe1c90c950d332fecbcaacb (from 9ecf79ca0111dd899ca88dd54156f71013220fcc)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Thu Feb 15 16:14:57 2007 +0200

    kdrive/ephyr: free screen struct
    Free screen->driver on screenFini, instead of just leaking it.

diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index 2ca51c3..e8001df 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -675,6 +675,8 @@ ephyrRestore (KdCardInfo *card)
 void
 ephyrScreenFini (KdScreenInfo *screen)
 {
+    xfree(screen->driver);
+    screen->driver = NULL;
 }
 
 /*