commit 4c10ac183b1459e653d9c7dcc84e0184ca05d977
author Eric Williams <ericwill@redhat.com> Mon Dec 03 09:49:03 2018 -0500
committer Eric Williams <ericwill@redhat.com> Mon Dec 03 11:52:52 2018 -0500
tree dd3fd890984f48ea9642bf000e10386945692770
parent 3b5aa306780b5267ef952b42b620958cff2c07ec

Bug 540801: [GTK4] Build SWT on GTK4

Make GTK3 default for now until GTK4 is stable.

Change-Id: I4449fcf496d599dd9cd4f76696e8ca364b4b3cd9
Signed-off-by: Eric Williams <ericwill@redhat.com>

bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
index 8938b2b..b407f96 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java
@@ -75,17 +75,17 @@
 	static {
 		String propertyName = "SWT_GTK4";
 		String gtk4 = getEnvironmentalVariable (propertyName);
-		if (gtk4 != null && gtk4.equals("0")) {
+		if (gtk4 != null && gtk4.equals("1")) {
 			try {
-				Library.loadLibrary("swt-pi3");
-			} catch (Throwable e) {
 				Library.loadLibrary("swt-pi4");
+			} catch (Throwable e) {
+				Library.loadLibrary("swt-pi3");
 			}
 		} else {
 			try {
-				Library.loadLibrary("swt-pi4");
-			} catch (Throwable e) {
 				Library.loadLibrary("swt-pi3");
+			} catch (Throwable e) {
+				Library.loadLibrary("swt-pi4");
 			}
 		}
 		cachejvmptr();