Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Williams2018-05-23 14:51:43 +0000
committerAlexander Kurtakov2018-06-06 12:25:03 +0000
commit010ef698fc87044d3f105fa4db68d85b8632940b (patch)
tree1e4d754e928f1906d8ef325bc7f15be3aa9172b5 /bundles/org.eclipse.core.net/natives/unix/linux
parent5147ed2f5c66369f6abdea0725c76e3de4c2c335 (diff)
downloadeclipse.platform.team-010ef698fc87044d3f105fa4db68d85b8632940b.tar.gz
eclipse.platform.team-010ef698fc87044d3f105fa4db68d85b8632940b.tar.xz
eclipse.platform.team-010ef698fc87044d3f105fa4db68d85b8632940b.zip
Use GSettings instead of GConf2 to fetch proxy settings from GNOME. Instead it now uses the following GSettings schemas for proxies: org.gnome.system.proxy org.gnome.system.proxy.http org.gnome.system.proxy.https org.gnome.system.proxy.socks org.gnome.system.proxy.ftp You can get/set values for the keys in each of these schemas by running gsettings [get/set] schema key value. For example, to set the SOCKS proxy host, run: gsettings set org.gnome.system.proxy.socks host <value> To test in Eclipse, import the org.eclipse.core.net and org.eclipse.core.net.linux.x86_64 projects into your workspace. Launch a child Eclipse that depends on these two workspace plugins, and make sure the child Eclipse launches with the argument: -Dorg.eclipse.core.net.enableGnome as this enables the GNOME proxy functionality. In the child Eclipse, go to Window -> Preferences -> General -> Network connections. Selecting the "native" combo option will pull in proxy/network settings as set via GNOME. Change-Id: I0f620275aa15205245ae4156d9ed63ebf20c3568 Signed-off-by: Eric Williams <ericwill@redhat.com>
Diffstat (limited to 'bundles/org.eclipse.core.net/natives/unix/linux')
-rw-r--r--bundles/org.eclipse.core.net/natives/unix/linux/makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/bundles/org.eclipse.core.net/natives/unix/linux/makefile b/bundles/org.eclipse.core.net/natives/unix/linux/makefile
index b0e551922..65f682008 100644
--- a/bundles/org.eclipse.core.net/natives/unix/linux/makefile
+++ b/bundles/org.eclipse.core.net/natives/unix/linux/makefile
@@ -1,6 +1,6 @@
#**********************************************************************
-# Copyright (c) 2008, 2012 Oakland Software Incorporated and others.
-# All rights reserved. This program and the accompanying materials
+# Copyright (c) 2008, 2018 Oakland Software Incorporated and others.
+# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
@@ -8,8 +8,9 @@
# Contributors:
# Oakland Software Incorporated - initial submission
# IBM Corporation - refactoring, bug 245849
+# Red Hat - GSettings implementation and code clean up (bug 394087)
#
-#**********************************************************************
+#**********************************************************************
#
# makefile for libgnomeproxy-1.0.0.so
@@ -20,10 +21,10 @@ LIB_NAME_FULL = libgnomeproxy-1.0.0.so
OS_TYPE = linux
JDK_INCLUDE = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS_TYPE}
-INCLUDE = `pkg-config --cflags gconf-2.0`
+INCLUDE = `pkg-config --cflags gio-2.0`
COMPILER_FLAGS = -O0 -fPIC -g3 -Wall -c -fmessage-length=0 ${TARGET_ENVIRONMENT}
-LIBS := `pkg-config --libs gconf-2.0`
+LIBS := `pkg-config --libs gio-2.0`
LINKER_FLAGS= ${TARGET_ENVIRONMENT}
all: link

Back to the top