[gnome-color-manager] Install a schema file to launch gcm-apply by default in new versions of gnome-settings-daemon

[Richard Hughes <rhughes src gnome org>]

commit f46c244a34a3e272913ae63aecedb4bb664c1338
Author: Richard Hughes <richard hughsie com>
Date:   Wed Oct 27 12:26:20 2010 +0100

    Install a schema file to launch gcm-apply by default in new versions of gnome-settings-daemon

 data/Makefile.am                                   |    4 +++-
 ...gnome.settings-daemon.plugins.color.gschema.xml |    9 +++++++++
 src/gcm-apply.c                                    |   12 ------------
 3 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index e511494..bd83b2d 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -28,7 +28,9 @@ $(service_DATA): $(service_in_files) Makefile
 	@sed -e "s|\ servicedir\@|$(bindir)|" $< > $@
 
 @GSETTINGS_RULES@
-gsettings_SCHEMAS = org.gnome.color-manager.gschema.xml
+gsettings_SCHEMAS =					\
+	org.gnome.color-manager.gschema.xml		\
+	org.gnome.settings-daemon.plugins.color.gschema.xml
 
 pkgdata_DATA =						\
 	gcm-calibrate.ui				\
diff --git a/data/org.gnome.settings-daemon.plugins.color.gschema.xml b/data/org.gnome.settings-daemon.plugins.color.gschema.xml
new file mode 100644
index 0000000..2a1fbae
--- /dev/null
+++ b/data/org.gnome.settings-daemon.plugins.color.gschema.xml
@@ -0,0 +1,9 @@
+<schemalist>
+  <schema id="org.gnome.settings-daemon.plugins.color" path="/apps/gnome-settings-daemon/plugins/color/">
+    <key name="active" type="b">
+      <default>true</default>
+      <_summary>Activation of this plugin</_summary>
+      <_description>Whether this plugin would be activated by gnome-settings-daemon or not</_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/src/gcm-apply.c b/src/gcm-apply.c
index 5feb064..22fe290 100644
--- a/src/gcm-apply.c
+++ b/src/gcm-apply.c
@@ -131,18 +131,6 @@ main (int argc, char **argv)
 	g_option_context_parse (context, &argc, &argv, NULL);
 	g_option_context_free (context);
 
-	/*
-	 * FIXME: THIS IS A HACK.
-	 * When gnome-settings-daemon ports from GConf to GSettings we can do this
-	 * properly and install a schema file. Until then, eugh.
-	 */
-	ret = g_spawn_command_line_async ("gconftool-2 --set --type=bool /apps/gnome_settings_daemon/plugins/color/active true", &error);
-	if (!ret) {
-		g_warning ("failed to install GConf key: %s", error->message);
-		/* non-fatal */
-		g_clear_error (&error);
-	}
-
 	/* get devices */
 	client = gcm_client_new ();
 	ret = gcm_client_coldplug (client, GCM_CLIENT_COLDPLUG_XRANDR, &error);