summaryrefslogtreecommitdiff
path: root/hw/xquartz/X11Application.m
diff options
context:
space:
mode:
authorJeremy Huddleston Sequoia <jeremyhu@apple.com>2016-09-18 23:13:20 -0700
committerJeremy Huddleston Sequoia <jeremyhu@apple.com>2016-09-22 14:55:02 -0700
commit81493d30981d7deb38f57bca2a35487add5ea509 (patch)
tree80c7cf1e90cb07b9e9e8c2091a8029b24cdb70a3 /hw/xquartz/X11Application.m
parent9153ec8464336c280f2a6e79ffa443104bbeb98c (diff)
XQuartz: Remove X11ApplicationFatalError
AppKit handles crashes on app launch with their own dialog now, so we shouldn't need to do this ourselves. Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Diffstat (limited to 'hw/xquartz/X11Application.m')
-rw-r--r--hw/xquartz/X11Application.m48
1 files changed, 0 insertions, 48 deletions
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 9a2290990..19e9451f7 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -84,7 +84,6 @@ static dispatch_queue_t eventTranslationQueue;
extern Bool noTestExtensions;
extern Bool noRenderExtension;
-extern BOOL serverRunning;
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
static TISInputSourceRef last_key_layout;
@@ -1096,53 +1095,6 @@ X11ApplicationCanEnterRandR(void)
}
}
-void
-X11ApplicationFatalError(const char *f, va_list args)
-{
-#ifdef HAVE_LIBDISPATCH
- NSString *title, *msg;
- char *error_msg;
-
- /* This is called by FatalError() in the server thread just before
- * we would abort. If the server never got off the ground, We should
- * inform the user of the error rather than letting the ever-so-friendly
- * CrashReporter do it for us.
- *
- * This also has the benefit of forcing user interaction rather than
- * allowing an infinite throttled-restart if the crash occurs before
- * we can drain the launchd socket.
- */
-
- if (serverRunning) {
- return;
- }
-
- title = NSLocalizedString(@"The application X11 could not be opened.",
- @"Dialog title when encountering a fatal error");
- msg = NSLocalizedString(
- @"An error occurred while starting the X11 server: \"%s\"\n\nClick Quit to quit X11. Click Report to see more details or send a report to Apple.",
- @"Dialog when encountering a fatal error");
-
- vasprintf(&error_msg, f, args);
- msg = [NSString stringWithFormat:msg, error_msg];
-
- /* We want the AppKit thread to actually service the alert or we will race [NSApp run] and create an
- * 'NSInternalInconsistencyException', reason: 'NSApp with wrong _running count'
- */
- dispatch_sync(dispatch_get_main_queue(), ^{
- if (NSAlertDefaultReturn ==
- NSRunAlertPanel (title, @"%@",
- NSLocalizedString (@"Quit", @""),
- NSLocalizedString (@"Report...", @""),
- nil, msg)) {
- exit (EXIT_FAILURE);
- }
- });
-
- /* fall back to caller to do the abort() in the DIX */
-#endif
-}
-
static void
check_xinitrc(void)
{