[147786] Fixed problem where "I Agree" button in the license dialog was never being enabled on certain Linux systems.
diff --git a/plugins/org.eclipse.wst.internet.cache/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.internet.cache/META-INF/MANIFEST.MF
index 35f197a..8532d72 100644
--- a/plugins/org.eclipse.wst.internet.cache/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.internet.cache/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %_PLUGIN_NAME
Bundle-SymbolicName: org.eclipse.wst.internet.cache; singleton:=true
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.201.qualifier
Bundle-Activator: org.eclipse.wst.internet.cache.internal.CachePlugin
Bundle-Vendor: %_PLUGIN_PROVIDER
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/LicenseAcceptanceDialog.java b/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/LicenseAcceptanceDialog.java
index 369d7e4..562a74e 100644
--- a/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/LicenseAcceptanceDialog.java
+++ b/plugins/org.eclipse.wst.internet.cache/src/org/eclipse/wst/internet/cache/internal/LicenseAcceptanceDialog.java
@@ -156,6 +156,12 @@
gd = new GridData(SWT.FILL, SWT.FILL, true, true);
//gd.heightHint = 400;
+ // It's important that the license URL is set even if we read
+ // the contents of the license file ourselves (see below) as
+ // otherwise the progress monitor will not be called on certain
+ // linux systems with certain browsers.
+ browser.setUrl(licenseURL);
+
// The browser widget has problems loading files stored in jars
// so we read from the jar and set the browser text ourselves.
// See bug 154721.
@@ -193,10 +199,7 @@
}
}
}
- else
- {
- browser.setUrl(licenseURL);
- }
+
browser.setLayoutData(gd);
browser.addProgressListener(new ProgressListener(){
