Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawel Pogorzelski2009-05-22 14:03:11 +0000
committerPawel Pogorzelski2009-05-22 14:03:11 +0000
commit128744e447646d4cc0e64d21e58ea1bcb7d0ebc5 (patch)
treed7ab2d58526de7eefd3a1e8f5272638894513edc /bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net
parente5bb31207603fb0ebe6cb9e8c9bc0ecac8597c30 (diff)
downloadeclipse.platform.team-128744e447646d4cc0e64d21e58ea1bcb7d0ebc5.tar.gz
eclipse.platform.team-128744e447646d4cc0e64d21e58ea1bcb7d0ebc5.tar.xz
eclipse.platform.team-128744e447646d4cc0e64d21e58ea1bcb7d0ebc5.zip
Bug 268321 - [Net] UnixProxyProvider stuck on my RHEL5 gnome system
Diffstat (limited to 'bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net')
-rw-r--r--bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java
index 1bbb31c7f..1bcb3c297 100644
--- a/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java
+++ b/bundles/org.eclipse.core.net/src/org/eclipse/core/internal/net/proxy/unix/UnixProxyProvider.java
@@ -30,13 +30,18 @@ public class UnixProxyProvider extends AbstractProxyProvider {
private static final String LIBRARY_NAME = "gnomeproxy-1.0.0"; //$NON-NLS-1$
+ private static final String ENABLE_GNOME = Activator.ID + ".enableGnome"; //$NON-NLS-1$
+
private static boolean isGnomeLibLoaded = false;
static {
// We have to load this here otherwise gconf seems to have problems
// causing hangs and various other bad behavior,
// please don't move this to be initialized on another thread.
- loadGnomeLib();
+ String value = System.getProperty(ENABLE_GNOME);
+ if ("".equals(value) || "true".equals(value)) { //$NON-NLS-1$ //$NON-NLS-2$
+ loadGnomeLib();
+ }
}
public UnixProxyProvider() {

Back to the top