diff options
| author | Alexander Kurtakov | 2018-09-11 08:52:21 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2018-09-11 08:52:21 +0000 |
| commit | aca12a62dda63dff7357137927ac4b8ef6a180e7 (patch) | |
| tree | 612338236d7d5cfd809f6b887646446955481cd8 | |
| parent | 1c05ebb0a4b4d502a0d1bdf1d0faffade202ff40 (diff) | |
| download | eclipse.platform.swt-aca12a62dda63dff7357137927ac4b8ef6a180e7.tar.gz eclipse.platform.swt-aca12a62dda63dff7357137927ac4b8ef6a180e7.tar.xz eclipse.platform.swt-aca12a62dda63dff7357137927ac4b8ef6a180e7.zip | |
Bug 530841 - [GTK2] Remove GTK 2.x support
Do not try to load swt-pi so file, only swt-pi3 (aka gtk3) exists now.
Change-Id: I4c0addd6861f52e31c714980b6952cc1592cfcf9
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/gtk/org/eclipse/swt/internal/gtk/OS.java | 16 |
1 files changed, 1 insertions, 15 deletions
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 221e1a6c1f..dd5a248820 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 @@ -74,21 +74,7 @@ public class OS extends C { /** Initialization; load native libraries */ static { - String propertyName = "SWT_GTK3"; - String gtk3 = getEnvironmentalVariable (propertyName); - if (gtk3 != null && gtk3.equals("0")) { - try { - Library.loadLibrary("swt-pi"); - } catch (Throwable e) { - Library.loadLibrary("swt-pi3"); - } - } else { - try { - Library.loadLibrary("swt-pi3"); - } catch (Throwable e) { - Library.loadLibrary("swt-pi"); - } - } + Library.loadLibrary("swt-pi3"); cachejvmptr(); } |