xserver: Branch 'server-1.11-branch'

[Jeremy Huddleston]

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

New commits:
commit db9620c022e992f12bbbf2e9de9a25b9f0b2226d
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Mon Oct 24 16:45:36 2011 -0700

    XQuartz: Fix the filename of our log file
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
    (cherry picked from commit fb55f8f790f69f30b0ab18648c337bde9d41f5ff)

diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index b483000..465a96d 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -621,7 +621,7 @@ void OsVendorInit(void)
         char *lf;
         char *home = getenv("HOME");
         assert(home);
-        assert(0 < asprintf(&lf, "%s/Library/Logs/X11.%s.log", home, bundle_id_prefix));
+        assert(0 < asprintf(&lf, "%s/Library/Logs/%s.X11.log", home, bundle_id_prefix));
         LogInit(lf, ".old");
         free(lf);