summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@gnome-db.org>2010-10-27 15:30:29 +0200
committerRodrigo Moya <rodrigo@gnome-db.org>2010-10-27 15:30:29 +0200
commit4e50db84424481687f7eb5bc2dc8e37a23cbf5a5 (patch)
treefe8cd1734f55011b74ddc1f0bec788e51b9b03c2
parent1d31afe8057f196193c20342275c2e19a49ee79b (diff)
downloadgsettings-desktop-schemas-4e50db84424481687f7eb5bc2dc8e37a23cbf5a5.tar.gz
Add missing key to proxy schemas needed for Network panel in g-c-c
-rw-r--r--schemas/gsettings-desktop-schemas.convert1
-rw-r--r--schemas/org.gnome.system.proxy.gschema.xml5
2 files changed, 6 insertions, 0 deletions
diff --git a/schemas/gsettings-desktop-schemas.convert b/schemas/gsettings-desktop-schemas.convert
index 2870fd4..0a86ae4 100644
--- a/schemas/gsettings-desktop-schemas.convert
+++ b/schemas/gsettings-desktop-schemas.convert
@@ -83,6 +83,7 @@ disable-application-handlers = /desktop/gnome/lockdown/disable_application_handl
mode = /system/proxy/mode
autoconfig-url = /system/proxy/autoconfig_url
ignore-hosts = /system/http_proxy/ignore_hosts
+use-same-proxy = /system/http_proxy/use_same_proxy
[org.gnome.system.proxy.http]
enabled = /system/http_proxy/use_http_proxy
diff --git a/schemas/org.gnome.system.proxy.gschema.xml b/schemas/org.gnome.system.proxy.gschema.xml
index 51f82a2..bb7188d 100644
--- a/schemas/org.gnome.system.proxy.gschema.xml
+++ b/schemas/org.gnome.system.proxy.gschema.xml
@@ -30,6 +30,11 @@
(something like 192.168.0.0/24).
</description>
</key>
+ <key name="use-same-proxy" type="b">
+ <default>true</default>
+ <summary>Use same proxy for all protocols</summary>
+ <description>Whether to use the same proxy for all protocols or not.</description>
+ </key>
</schema>
<schema id="org.gnome.system.proxy.http" path="/system/proxy/http/">
<key name="enabled" type="b">