Convert GConf schema to GSettings schema

3 files changed, 29 insertions, 48 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 07608da..179e08f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,9 @@
-schemasdir	 = $(GCONF_SCHEMA_FILE_DIR)
-schemas_DATA 	 = telepathy-logger.schemas
+gsettings_files = \
+	org.freedesktop.Telepathy.Logger.gschema.xml.in \
+	$(NULL)
+gsettings_SCHEMAS = $(gsettings_files:.xml.in=.xml)
+@INTLTOOL_XML_NOMERGE_RULE@
+@GSETTINGS_RULES@
 
 servicefiledir = $(datadir)/dbus-1/services
 servicefile_in_files = \
@@ -12,22 +16,11 @@ servicefile_DATA = $(servicefile_in_files:.service.in=.service)
 clientfiledir = $(datarootdir)/telepathy/clients
 clientfile_DATA = Logger.client
 
-if GCONF_SCHEMAS_INSTALL
-install-data-local:
-	if test -z "$(DESTDIR)" ; then \
-	  for p in $(schemas_DATA) ; do \
-	    GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p ; \
-	  done \
-	fi
-else
-install-data-local:
-endif
-
 EXTRA_DIST = 				\
-	$(schemas_in_files)		\
-	$(schemas_DATA)			\
+	$(gsettings_files)		\
 	$(clientfile_DATA)		\
 	$(servicefile_in_files)
 
-CLEANFILES = 		\
+CLEANFILES = \
+	$(gsettings_SCHEMAS) \
 	$(servicefile_DATA)
diff --git a/data/org.freedesktop.Telepathy.Logger.gschema.xml.in b/data/org.freedesktop.Telepathy.Logger.gschema.xml.in
new file mode 100644
index 0000000..a7ecac6
--- /dev/null
+++ b/data/org.freedesktop.Telepathy.Logger.gschema.xml.in
@@ -0,0 +1,20 @@
+<schemalist>
+  <schema id="org.freedesktop.Telepathy.Logger" path="/apps/telepathy-logger/">
+    <key name="enabled" type="b">
+      <default>true</default>
+      <_summary>Enable logging</_summary>
+      <_description>
+        Globally enable or disable the Telepathy logger system. Setting it to
+        "false" will completely disable all logging.
+      </_description>
+    </key>
+    <key name="ignore-accounts" type="ao">
+      <default>[]</default>
+      <_summary>Accounts for which logging is disabled</_summary>
+      <_description>
+        Disables logging for the named accounts, even when logging is globally
+        enabled. Object paths are Telepathy Account objects.
+      </_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/telepathy-logger.schemas b/data/telepathy-logger.schemas
deleted file mode 100644
index 6f9b575..0000000
--- a/data/telepathy-logger.schemas
+++ /dev/null
@@ -1,32 +0,0 @@
-<gconfschemafile>
-  <schemalist>
-
-    <schema>
-      <key>/schemas/apps/telepathy-logger/logging/turned_on</key>
-      <applyto>/apps/telepathy-logger/logging/turned_on</applyto>
-      <owner>telepathy-logger</owner>
-      <type>bool</type>
-      <default>TRUE</default>
-      <locale name="C">
-        <short>Turn on/off logging</short>
-        <long>Globally enable or disable the telepathy logging system.
-Setting it to "false" will completely disable any logging facility (it won't shut down the service)</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/telepathy-logger/logging/accounts/ignorelist</key>
-      <applyto>/apps/telepathy-logger/logging/accounts/ignorelist</applyto>
-      <owner>telepathy-logger</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <default>[]</default>
-      <locale name="C">
-        <short>A list of accounts for which logging is disabled</short>
-        <long>Disables logging for the named accounts, when logging is
-globally enabled. Meaningful only if global logging is turned on/enabled</long>
-      </locale>
-    </schema>
-
-</schemalist>
-</gconfschemafile>