1--- a/src/java.desktop/share/classes/javax/swing/UIManager.java
2+++ b/src/java.desktop/share/classes/javax/swing/UIManager.java
3@@ -607,11 +607,9 @@
4 if (osType == OSInfo.OSType.WINDOWS) {
5 return "com.sun.java.swing.plaf.windows.WindowsLookAndFeel";
6 } else {
7- String desktop = AccessController.doPrivileged(new GetPropertyAction("sun.desktop"));
8 Toolkit toolkit = Toolkit.getDefaultToolkit();
9- if ("gnome".equals(desktop) &&
10- toolkit instanceof SunToolkit &&
11- ((SunToolkit) toolkit).isNativeGTKAvailable()) {
12+ if (toolkit instanceof SunToolkit &&
13+ ((SunToolkit) toolkit).isNativeGTKAvailable()) {
14 // May be set on Linux and Solaris boxs.
15 return "com.sun.java.swing.plaf.gtk.GTKLookAndFeel";
16 }
17@@ -1341,7 +1339,7 @@
18 lafName = (String) lafData.remove("defaultlaf");
19 }
20 if (lafName == null) {
21- lafName = getCrossPlatformLookAndFeelClassName();
22+ lafName = getSystemLookAndFeelClassName();
23 }
24 lafName = swingProps.getProperty(defaultLAFKey, lafName);