summaryrefslogtreecommitdiff
path: root/services
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-10-08 07:39:33 -0400
committerMatthew Barnes <mbarnes@redhat.com>2013-10-25 13:27:05 -0400
commite4a2cdb121379f729b6a47145cd02cdc44962392 (patch)
tree6aac6bd43a2a311a3e2a1a135edcf55b90631d66 /services
parent6002a4e29f2774a0c3bfa85e1270616bbaac36c4 (diff)
downloadevolution-data-server-e4a2cdb121379f729b6a47145cd02cdc44962392.tar.gz
Add a built-in "system-proxy" data source.
This represents the default proxy profile in E-D-S. New accounts will automatically reference this proxy profile. Additional proxy profiles can be defined as needed for particular accounts.
Diffstat (limited to 'services')
-rw-r--r--services/evolution-source-registry/Makefile.am1
-rw-r--r--services/evolution-source-registry/builtin/system-proxy.source.in9
-rw-r--r--services/evolution-source-registry/evolution-source-registry-resource.xml1
3 files changed, 11 insertions, 0 deletions
diff --git a/services/evolution-source-registry/Makefile.am b/services/evolution-source-registry/Makefile.am
index 88f32f1dd..65d8dd70d 100644
--- a/services/evolution-source-registry/Makefile.am
+++ b/services/evolution-source-registry/Makefile.am
@@ -15,6 +15,7 @@ builtin_sources_in_files = \
builtin/system-address-book.source.in \
builtin/system-calendar.source.in \
builtin/system-memo-list.source.in \
+ builtin/system-proxy.source.in \
builtin/system-task-list.source.in \
builtin/vfolder.source.in \
$(NULL)
diff --git a/services/evolution-source-registry/builtin/system-proxy.source.in b/services/evolution-source-registry/builtin/system-proxy.source.in
new file mode 100644
index 000000000..a7a351f53
--- /dev/null
+++ b/services/evolution-source-registry/builtin/system-proxy.source.in
@@ -0,0 +1,9 @@
+
+[Data Source]
+_DisplayName=Default Proxy Settings
+Enabled=true
+Parent=
+
+[Proxy]
+Method=default
+IgnoreHosts=localhost;127.0.0.0/8;::1;
diff --git a/services/evolution-source-registry/evolution-source-registry-resource.xml b/services/evolution-source-registry/evolution-source-registry-resource.xml
index aa6059735..af0776bec 100644
--- a/services/evolution-source-registry/evolution-source-registry-resource.xml
+++ b/services/evolution-source-registry/evolution-source-registry-resource.xml
@@ -17,6 +17,7 @@
<file>system-address-book.source</file>
<file>system-calendar.source</file>
<file>system-memo-list.source</file>
+ <file>system-proxy.source</file>
<file>system-task-list.source</file>
<file>vfolder.source</file>
</gresource>