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, 0 insertions, 85 deletions

diff --git a/services/evolution-source-registry/Makefile.am b/services/evolution-source-registry/Makefile.am
index 6d0e5c0ba..8eafbd8ff 100644
--- a/services/evolution-source-registry/Makefile.am
+++ b/services/evolution-source-registry/Makefile.am
@@ -24,30 +24,20 @@ builtin_sources = $(builtin_sources_in_files:.source.in=.source)
 %.source: %.source.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po)
 	$(AM_V_GEN) $(MKDIR_P) builtin && LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
 
-gsettings_SCHEMAS = org.gnome.evolution.shell.network-config.gschema.xml
-@INTLTOOL_XML_NOMERGE_RULE@
-@GSETTINGS_RULES@
-
 service_in_files = org.gnome.evolution.dataserver.Sources.service.in
 servicedir = $(datadir)/dbus-1/services
 service_DATA = $(service_in_files:.service.in=.service)
 @EVO_SUBST_SERVICE_RULE@
 
-DISTCLEANFILES = \
-	$(gsettings_SCHEMAS) \
-	$(NULL)
-
 CLEANFILES = \
 	$(BUILT_SOURCES) \
 	$(builtin_sources) \
-	$(gsettings_SCHEMAS:.xml=.valid) \
 	$(service_DATA) \
 	$(NULL)
 
 EXTRA_DIST = \
 	evolution-source-registry-resource.xml \
 	$(builtin_sources_in_files) \
-	$(gsettings_SCHEMAS:.xml=.xml.in) \
 	$(service_in_files) \
 	$(NULL)
 
diff --git a/services/evolution-source-registry/org.gnome.evolution.shell.network-config.gschema.xml.in b/services/evolution-source-registry/org.gnome.evolution.shell.network-config.gschema.xml.in
deleted file mode 100644
index 265158258..000000000
--- a/services/evolution-source-registry/org.gnome.evolution.shell.network-config.gschema.xml.in
+++ /dev/null
@@ -1,75 +0,0 @@
-<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>