From d5c4864e3a67eb0aeba2d7309d5df1d914685d1b Mon Sep 17 00:00:00 2001
From: uta <unknown>
Date: Fri, 23 Nov 2012 13:07:54 +0400
Subject: [PATCH] 8003898: X11 toolkit can be chosen as the default toolkit
 Summary: XToolkit is not selected for any values of system-wide environment
 variables (ex. DISPLAY). Reviewed-by: anthony, art

---
 src/solaris/native/java/lang/java_props_macosx.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/solaris/native/java/lang/java_props_macosx.c b/src/solaris/native/java/lang/java_props_macosx.c
index c890ea8c5..f9ad2e474 100644
--- a/src/solaris/native/java/lang/java_props_macosx.c
+++ b/src/solaris/native/java/lang/java_props_macosx.c
@@ -129,10 +129,6 @@ static bool isInAquaSession() {
     return true;
 }
 
-static bool isXDisplayDefined() {
-    return getenv("DISPLAY") != NULL;
-}
-
 PreferredToolkit getPreferredToolkit() {
     static PreferredToolkit pref = unset;
     if (pref != unset) return pref;
@@ -141,7 +137,6 @@ PreferredToolkit getPreferredToolkit() {
     if (prefFromEnv != unset) return pref = prefFromEnv;
 
     if (isInAquaSession()) return pref = CToolkit;
-    if (isXDisplayDefined()) return pref = XToolkit;
     return pref = HToolkit;
 }
 
-- 
GitLab