4 files changed, 36 insertions, 65 deletions
diff --git a/Makefile.am b/Makefile.am
index 42039d93..1e337dc4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,15 +13,19 @@ if HAVE_TYPING_BREAK
 SUBDIRS += typing-break
 endif
 
-schemasdir = @MATECONF_SCHEMA_FILE_DIR@
-schemas_in_files = mate-control-center.schemas.in
-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-@INTLTOOL_SCHEMAS_RULE@
+@INTLTOOL_XML_NOMERGE_RULE@
+gsettings_SCHEMAS = org.mate.control-center.gschema.xml
+@GSETTINGS_RULES@
+
+%.gschema.xml.in: %.gschema.xml.in.in Makefile
+ $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
 
 ACLOCAL_AMFLAGS = -I m4
 
 CLEANFILES = \
- $(schemas_DATA)
+ $(gsettings_SCHEMAS_in) \
+ $(gsettings_SCHEMAS) \
+ *.gschema.valid
 
 DISTCLEANFILES = \
 mate-doc-utils.make
@@ -46,7 +50,7 @@ MAINTAINERCLEANFILES = \
 `find "$(srcdir)" -type f -name Makefile.in -print`
 
 EXTRA_DIST = \
- $(schemas_in_files) \
+ $(gsettings_schemas_in_in) \
 MAINTAINERS \
 mate-doc-utils.make
 
@@ -56,15 +60,6 @@ GITIGNOREFILES=m4
 
 -include $(top_srcdir)/git.mk
 
-install-data-local:
-if MATECONF_SCHEMAS_INSTALL
- if test -z "$(DESTDIR)" ; then \
- for p in $(schemas_DATA) ; do \
- MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $(top_builddir)/$$p >&1 > /dev/null; \
- done \
- fi
-endif
-
 dist-hook:
 @if test -d "$(srcdir)/.git"; \
 then \
diff --git a/mate-control-center.schemas.in b/mate-control-center.schemas.in
deleted file mode 100644
index 6ddacae7..00000000
--- a/mate-control-center.schemas.in
+++ /dev/null
@@ -1,49 +0,0 @@
-<mateconfschemafile>
- <schemalist>
-
- <schema>
- <key>/schemas/apps/control-center/appearance/more_backgrounds_url</key>
- <applyto>/apps/control-center/appearance/more_backgrounds_url</applyto>
- <owner>control-center</owner>
- <type>string</type>
- <default>http://art.gnome.org/backgrounds/</default>
- <locale name="C">
- <short>More backgrounds URL</short>
- <long>
- URL for where to get more desktop backgrounds. If set to an
- empty string the link will not appear.
- </long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/control-center/appearance/more_themes_url</key>
- <applyto>/apps/control-center/appearance/more_themes_url</applyto>
- <owner>control-center</owner>
- <type>string</type>
- <default>http://art.gnome.org/themes/</default>
- <locale name="C">
- <short>More themes URL</short>
- <long>
- URL for where to get more desktop themes. If set to an
- empty string the link will not appear.
- </long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/control-center/network/current_location</key>
- <applyto>/apps/control-center/network/current_location</applyto>
- <owner>control-center</owner>
- <type>string</type>
- <default></default>
- <locale name="C">
- <short>Current network location</short>
- <long>
- Set this to your current location name. This is used to
- determine the appropriate network proxy configuration.
- </long>
- </locale>
- </schema>
-
- </schemalist>
-</mateconfschemafile>
-
diff --git a/org.mate.control-center.gschema.xml.in.in b/org.mate.control-center.gschema.xml.in.in
new file mode 100644
index 00000000..3adf65d4
--- /dev/null
+++ b/org.mate.control-center.gschema.xml.in.in
@@ -0,0 +1,25 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+ <schema id="org.mate.control-center" path="/org/mate/control-center/">
+ <child name="appearance" schema="org.mate.control-center.appearance" />
+ <child name="network" schema="org.mate.control-center.network" />
+ </schema>
+ <schema id="org.mate.control-center.appearance" path="/org/mate/control-center/appearance/">
+ <key name="more-backgrounds-url" type="s">
+ <default>'http://art.gnome.org/backgrounds/'</default>
+ <_summary>More backgrounds URL</_summary>
+ <_description>URL for where to get more desktop backgrounds. If set to an empty string the link will not appear.</_description>
+ </key>
+ <key name="more-themes-url" type="s">
+ <default>'http://art.gnome.org/themes/'</default>
+ <_summary>More themes URL</_summary>
+ <_description>URL for where to get more desktop themes. If set to an empty string the link will not appear.</_description>
+ </key>
+ </schema>
+ <schema id="org.mate.control-center.network" path="/org/mate/control-center/network/">
+ <key name="current-location" type="s">
+ <default>''</default>
+ <_summary>Current network location</_summary>
+ <_description>Set this to your current location name. This is used to determine the appropriate network proxy configuration.</_description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c5c0aaa0..2b2b9d05 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,7 +1,7 @@
 # Add files with translateable strings here.
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
-mate-control-center.schemas.in
+org.mate.control-center.gschema.xml.in.in
 capplets/about-me/eel-alert-dialog.c
 capplets/about-me/e-image-chooser.c
 capplets/about-me/mate-about-me.c