diff options
| author | Grant Gayed <ggayed> | 2011-05-09 16:09:27 +0000 |
|---|---|---|
| committer | Grant Gayed <ggayed> | 2011-05-09 16:09:27 +0000 |
| commit | d05fd93fefebb6bc1d07ca12de432d36944a8740 (patch) | |
| tree | 75f487a64c605ad27ba891e09826953cb5c3682e /bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java | |
| parent | 1ce7a633cce3ad52167ecaa7460be2c6fa1c93e2 (diff) | |
| download | eclipse.platform.swt-d05fd93fefebb6bc1d07ca12de432d36944a8740.tar.gz eclipse.platform.swt-d05fd93fefebb6bc1d07ca12de432d36944a8740.tar.xz eclipse.platform.swt-d05fd93fefebb6bc1d07ca12de432d36944a8740.zip | |
343454 - XULRunner 2.0 kills Eclipse when opening anything Browser relatedBEFORE_JAVADOC_BASH_FOR_37RC1
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java index 9a9ee3c0e6..784b4478e3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java @@ -89,10 +89,20 @@ class WebKit extends WebBrowser { static Callback JSObjectHasPropertyProc, JSObjectGetPropertyProc, JSObjectCallAsFunctionProc; static { + + /* + * WebKitGTK is binary-incompatible between its 1.2 and 1.4 releases, + * so swt has separate libraries compiled against each. + */ try { - Library.loadLibrary ("swt-webkit"); // $NON-NLS-1$ + Library.loadLibrary ("swt-webkit12"); // $NON-NLS-1$ LibraryLoaded = true; } catch (Throwable e) { + try { + Library.loadLibrary ("swt-webkit"); // $NON-NLS-1$ + LibraryLoaded = true; + } catch (Throwable e2) { + } } if (LibraryLoaded) { |