Migrated org.gnome.evolution.shell.network-config.gschema.xml.in to data/ directory.

The gsettings schemas need to all be stored and installed from the data/
directory, this is because we compile them locally in-tree and set the
GSETTINGS_SCHEMA_DIR to a local directory in order to run our tests
at make check time (tests dont work without this, instead GSettings wants
to abort for a missing schema).

2 files changed, 77 insertions, 1 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 31a90ab97..0da5e8a3e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,8 @@
 gsettings_SCHEMAS =						\
 	org.gnome.Evolution.DefaultSources.gschema.xml		\
 	org.gnome.evolution-data-server.calendar.gschema.xml	\
-	org.gnome.evolution-data-server.addressbook.gschema.xml
+	org.gnome.evolution-data-server.addressbook.gschema.xml	\
+	org.gnome.evolution.shell.network-config.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
 
diff --git a/data/org.gnome.evolution.shell.network-config.gschema.xml.in b/data/org.gnome.evolution.shell.network-config.gschema.xml.in
new file mode 100644
index 000000000..265158258
--- /dev/null
+++ b/data/org.gnome.evolution.shell.network-config.gschema.xml.in
@@ -0,0 +1,75 @@
+<schemalist>
+  <schema gettext-domain="evolution-data-server" id="org.gnome.evolution.shell.network-config" path="/org/gnome/evolution/shell/network-config/">
+
+    <!-- This entire schema is deprecated.  Network proxy settings are
+         integrated into the ESource framework and are written to disk
+         as plain text key files.
+    -->
+
+    <key name="proxy-type" type="i">
+      <default>0</default>
+      <_summary>(Deprecated) Proxy type to use</_summary>
+      <_description>This key was deprecated in version 3.12 and should no longer be used.  Proxy settings are now integrated into Evolution-Data-Server's account system.  See the ESourceProxy API documentation for details.</_description>
+    </key>
+    <key name="use-http-proxy" type="b">
+      <default>false</default>
+      <_summary>(Deprecated) Whether to use http-proxy</_summary>
+      <_description>This key was deprecated in version 3.12 and should no longer be used.  Proxy settings are now integrated into Evolution-Data-Server's account system.  See the ESourceProxy API documentation for details.</_description>
+    </key>
+    <key name="use-authentication" type="b">
+      <default>false</default>
+      <_summary>(Deprecated) Whether proxy server requires authentication</_summary>
+      <_description>This key was deprecated in version 3.12 and should no longer be used.  Proxy settings are now integrated into Evolution-Data-Server's account system.  See the ESourceProxy API documentation for details.</_description>
+    </key>
+    <key name="http-host" type="s">
+      <default>''</default>
+      <_summary>(Deprecated) Host name for HTTP requests</_summary>
+      <_description>This key was deprecated in version 3.12 and should no longer be used.  Proxy settings are now integrated into Evolution-Data-Server's account system.  See the ESourceProxy API documentation for details.</_description>
+    </key>
+    <key name="http-port" type="i">
+      <default>0</default>
+      <_summary>(Deprecated) Port number for HTTP requests</_summary>
+      <_description>This key was deprecated in version 3.12 and should no longer be used.  Proxy settings are now integrated into Evolution-Data-Server's account system.  See the ESourceProxy API documentation for details.</_description>
+    </key>
+    <key name="authentication-user" type="s">
+      <default>''</default>
+      <_summary>(Deprecated) Proxy authentication user name</_summary>
+      <_description>This key was deprecated in version 3.12 and should no longer be used.  Proxy settings are now integrated into Evolution-Data-Server's account system.  See the ESourceProxy API documentation for details.</_description>
+    </key>
+    <key name="authentication-password" type="s">
+      <default>''</default>
+      <_summary>(Deprecated) Proxy authentication password</_summary>
+      <_description>This key was deprecated in version 3.12 and should no longer be used.  Proxy settings are now integrated into Evolution-Data-Server's account system.  See the ESourceProxy API documentation for details.</_description>
+    </key>
+    <key name="ignore-hosts" type="as">
+      <default>[]</default>
+      <_summary>(Deprecated) List of hosts to connect to without proxy</_summary>
+      <_description>This key was deprecated in version 3.12 and should no longer be used.  Proxy settings are now integrated into Evolution-Data-Server's account system.  See the ESourceProxy API documentation for details.</_description>
+    </key>
+    <key name="secure-host" type="s">
+      <default>''</default>
+      <_summary>(Deprecated) Host name for HTTPS requests</_summary>
+      <_description>This key was deprecated in version 3.12 and should no longer be used.  Proxy settings are now integrated into Evolution-Data-Server's account system.  See the ESourceProxy API documentation for details.</_description>
+    </key>
+    <key name="secure-port" type="i">
+      <default>0</default>
+      <_summary>(Deprecated) Port number for HTTPS requests</_summary>
+      <_description>This key was deprecated in version 3.12 and should no longer be used.  Proxy settings are now integrated into Evolution-Data-Server's account system.  See the ESourceProxy API documentation for details.</_description>
+    </key>
+    <key name="socks-host" type="s">
+      <default>''</default>
+      <_summary>(Deprecated) Host name for SOCKS requests</_summary>
+      <_description>This key was deprecated in version 3.12 and should no longer be used.  Proxy settings are now integrated into Evolution-Data-Server's account system.  See the ESourceProxy API documentation for details.</_description>
+    </key>
+    <key name="socks-port" type="i">
+      <default>0</default>
+      <_summary>(Deprecated) Port number for SOCKS requests</_summary>
+      <_description>This key was deprecated in version 3.12 and should no longer be used.  Proxy settings are now integrated into Evolution-Data-Server's account system.  See the ESourceProxy API documentation for details.</_description>
+    </key>
+    <key name="autoconfig-url" type="s">
+      <default>''</default>
+      <_summary>(Deprecated) Automatic proxy configuration URL</_summary>
+      <_description>This key was deprecated in version 3.12 and should no longer be used.  Proxy settings are now integrated into Evolution-Data-Server's account system.  See the ESourceProxy API documentation for details.</_description>
+    </key>
+  </schema>
+</schemalist>