diff options
| author | Grant Gayed <grant_gayed@ca.ibm.com> | 2013-05-15 16:20:30 -0400 |
|---|---|---|
| committer | Grant Gayed <grant_gayed@ca.ibm.com> | 2013-05-15 16:20:30 -0400 |
| commit | 2acd4f33955e0302ee2ed62b6217b9bce1de8a6a (patch) | |
| tree | 574680bc3ab62363a08bdd16a905b2b02722164b /bundles | |
| parent | f7ed03552953c333f8ee290a7426d527441b2e35 (diff) | |
| download | eclipse.platform.swt-2acd4f33955e0302ee2ed62b6217b9bce1de8a6a.tar.gz eclipse.platform.swt-2acd4f33955e0302ee2ed62b6217b9bce1de8a6a.tar.xz eclipse.platform.swt-2acd4f33955e0302ee2ed62b6217b9bce1de8a6a.zip | |
ensure XULRunner 17 does not run on Linux
Diffstat (limited to 'bundles')
6 files changed, 26 insertions, 0 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/carbon/org/eclipse/swt/browser/MozillaDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/carbon/org/eclipse/swt/browser/MozillaDelegate.java index c8006353e0..1ae38cd00d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/carbon/org/eclipse/swt/browser/MozillaDelegate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/carbon/org/eclipse/swt/browser/MozillaDelegate.java @@ -95,6 +95,10 @@ static boolean needsSpinup () { return false; } +static boolean supportsXULRunner17 () { + return false; +} + static byte[] wcsToMbcs (String codePage, String string, boolean terminate) { char[] chars = new char [string.length()]; string.getChars (0, chars.length, chars, 0); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java index 64baf3ee96..6b8d6b12ec 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/cocoa/org/eclipse/swt/browser/MozillaDelegate.java @@ -98,6 +98,10 @@ static boolean needsSpinup () { return false; } +static boolean supportsXULRunner17 () { + return true; +} + static byte[] wcsToMbcs (String codePage, String string, boolean terminate) { // char[] chars = new char [string.length()]; // string.getChars (0, chars.length, chars, 0); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java index 51e978f57b..f2430fc309 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java @@ -2103,6 +2103,12 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) { browser.dispose (); error (XPCOM.NS_ERROR_NULL_POINTER); } + + if (nsISupports.IsXULRunner17 && !MozillaDelegate.supportsXULRunner17 ()) { + browser.dispose (); + SWT.error (SWT.ERROR_NO_HANDLES, null, " [XULRunner 17 is not supported on this platform]"); //$NON-NLS-1$ + } + if (IsPre_4) { rc = XPCOM.Call (functionPtr, localFile.getAddress (), localFile.getAddress (), LocationProvider.getAddress (), 0, 0); } else { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java index 4c13d7393e..a4f74c6502 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/gtk/org/eclipse/swt/browser/MozillaDelegate.java @@ -156,6 +156,10 @@ static boolean needsSpinup () { return true; } +static boolean supportsXULRunner17 () { + return false; +} + static byte[] wcsToMbcs (String codePage, String string, boolean terminate) { return Converter.wcsToMbcs (codePage, string, terminate); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/motif/org/eclipse/swt/browser/MozillaDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/motif/org/eclipse/swt/browser/MozillaDelegate.java index 4188e402c7..85fabfb686 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/motif/org/eclipse/swt/browser/MozillaDelegate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/motif/org/eclipse/swt/browser/MozillaDelegate.java @@ -121,6 +121,10 @@ static boolean needsSpinup () { return true; } +static boolean supportsXULRunner17 () { + return false; +} + static byte[] wcsToMbcs (String codePage, String string, boolean terminate) { return Converter.wcsToMbcs (codePage, string, terminate); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/win32/org/eclipse/swt/browser/MozillaDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/win32/org/eclipse/swt/browser/MozillaDelegate.java index f73f1d23f1..e1a6cddcdf 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/win32/org/eclipse/swt/browser/MozillaDelegate.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/win32/org/eclipse/swt/browser/MozillaDelegate.java @@ -89,6 +89,10 @@ static boolean needsSpinup () { return false; } +static boolean supportsXULRunner17 () { + return true; +} + static byte[] wcsToMbcs (String codePage, String string, boolean terminate) { int byteCount; char[] chars = new char[string.length()]; |