From 5ac87d00b28e7d6f169be16195f8d444a528735b Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Fri, 2 Jan 2009 10:36:43 -0800 Subject: [PATCH] Revert "XQuartz: Ignore mach IPC until the appkit thread is ready to avoid possible deadlock (this can be reversed once pbproxy uses server API)" Gonna try this a different way... This reverts commit 9eec2d3e3b4da2427a1c3a26538d36c4e8a7f1ed. --- hw/xquartz/X11Application.m | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m index 8530118d4..50212dc9b 100644 --- a/hw/xquartz/X11Application.m +++ b/hw/xquartz/X11Application.m @@ -69,8 +69,6 @@ static NSEventType keyState[NUM_KEYCODES]; int X11EnableKeyEquivalents = TRUE, quartzFullscreenMenu = FALSE; int quartzHasRoot = FALSE, quartzEnableRootless = TRUE; -static Bool appkitReady = FALSE; - extern Bool noTestExtensions; #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 @@ -123,15 +121,7 @@ static void init_ports (void) { static void message_kit_thread (SEL selector, NSObject *arg) { message msg; kern_return_t r; - - if(!appkitReady) { -#if 0 - ErrorF("%s: mach_msg failed: Appkit thread not ready\n", __FUNCTION__); - spewCallStack(); -#endif - return; - } - + msg.hdr.msgh_bits = MACH_MSGH_BITS (MACH_MSG_TYPE_MAKE_SEND, 0); msg.hdr.msgh_size = sizeof (msg); msg.hdr.msgh_remote_port = _port; @@ -936,9 +926,7 @@ void X11ApplicationMain (int argc, char **argv, char **envp) { if(!xpbproxy_init()) fprintf(stderr, "Error initializing xpbproxy\n"); - - appkitReady = TRUE; - + [NSApp run]; /* not reached */ }