diff options
| author | Alexander Kurtakov | 2018-01-04 11:32:16 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2018-01-04 11:34:40 +0000 |
| commit | 0a2fac8213a37315c20128a7320d37ca5c476d42 (patch) | |
| tree | af989479cd224f0c407a5d6ed51a52a94cf52927 | |
| parent | 9d6902ba720f13df892cc69bde869ade34445761 (diff) | |
| download | eclipse.platform.swt-0a2fac8213a37315c20128a7320d37ca5c476d42.tar.gz eclipse.platform.swt-0a2fac8213a37315c20128a7320d37ca5c476d42.tar.xz eclipse.platform.swt-0a2fac8213a37315c20128a7320d37ca5c476d42.zip | |
Bug 528844 - [Webkit2] Make webkit2 default.
Try to first load webkit2 and fallback to webkit1 if webkit2 is not
available or SWT_WEBKIT2=0 env variable is set.
Change-Id: I211aa4b11d13c452ebc95d6b02c7ba7efd8fbc95
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h index 084b11eb51..0563eeeb85 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/library/webkitgtk.h @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 IBM Corporation and others. All rights reserved. + * Copyright (c) 2009, 2018 IBM Corporation and others. All rights reserved. * The contents of this file are made available under the terms * of the GNU Lesser General Public License (LGPL) Version 2.1 that * accompanies this distribution (lgpl-v21.txt). The LGPL is also @@ -44,12 +44,12 @@ char *gtk3 = getenv("SWT_GTK3"); \ if (gtk3 == NULL || strcmp(gtk3, "1") == 0) { \ char *webkit2 = getenv("SWT_WEBKIT2"); \ - if (webkit2 != NULL && strcmp(webkit2, "1") == 0) { \ - handle = dlopen("libwebkit2gtk-4.0.so.37", LOAD_FLAGS); /* webkit2 */ \ - } else { \ + if (webkit2 != NULL && strcmp(webkit2, "0") == 0) { \ handle = dlopen("libwebkitgtk-3.0.so.0", LOAD_FLAGS); /* webkitgtk >= 3.x lib */ \ + } else { \ + handle = dlopen("libwebkit2gtk-4.0.so.37", LOAD_FLAGS); /* webkit2 */ \ if (!handle) { \ - handle = dlopen("libwebkit2gtk-4.0.so.37", LOAD_FLAGS); /* webkit2 as machine doesn't have webkitgtk 3.x*/ \ + handle = dlopen("libwebkitgtk-3.0.so.0", LOAD_FLAGS); /* webkitgtk 3.x as machine doesn't have webkit2gtk */ \ } \ } \ } else { \ |