From 9d734f4b3010586ffd44b631ecb03b87b9d48a38 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Mon, 22 Apr 2013 13:43:32 +0100
Subject: matchbox-session-sato: install GConf values directly instead of using
 schemas

Because both matchbox-session-sato and settings-daemon were attempting to
install their preferred values though schemas there was a race as to which ones
were used.

Revert matchbox-session-sato back to writing the values directly, adding a
dependency on gconf-native so that this can happen on the host.

(From OE-Core rev: 90ca53cbbdb1ed30883d4aa8ce9c933ae1fad5fa)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../matchbox-session-sato.schemas                  | 53 ----------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 meta/recipes-sato/matchbox-sato/matchbox-session-sato/matchbox-session-sato.schemas

(limited to 'meta/recipes-sato/matchbox-sato/matchbox-session-sato/matchbox-session-sato.schemas')

diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/matchbox-session-sato.schemas b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/matchbox-session-sato.schemas
deleted file mode 100644
index f5b770b62f..0000000000
--- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/matchbox-session-sato.schemas
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-<schemalist>
-
-  <schema>
-    <key>/schemas/desktop/poky/interface/theme</key>
-    <applyto>/desktop/poky/interface/theme</applyto>
-    <type>string</type>
-    <owner>matchbox-session-sato</owner>
-    <default>Sato</default>
-    <locale name="C">
-      <short>Desktop theme</short>
-      <long>The theme name for Matchbox and Sato to use.</long>
-    </locale>
-  </schema>
-
-  <schema>
-    <key>/schemas/desktop/poky/interface/icon_theme</key>
-    <applyto>/desktop/poky/interface/icon_theme</applyto>
-    <type>string</type>
-    <owner>matchbox-session-sato</owner>
-    <default>Sato</default>
-    <locale name="C">
-      <short>Desktop icon theme</short>
-      <long>The icon theme name for Matchbox and Sato.</long>
-    </locale>
-  </schema>
-
-  <schema>
-    <key>/schemas/desktop/poky/interface/touchscreen</key>
-    <applyto>/desktop/poky/interface/touchscreen</applyto>
-    <type>bool</type>
-    <owner>matchbox-session-sato</owner>
-    <default>true</default>
-    <locale name="C">
-      <short>Activate touchscreen</short>
-    </locale>
-  </schema>
-
-  <schema>
-    <key>/schemas/desktop/poky/interface/font_name</key>
-    <applyto>/desktop/poky/interface/font_name</applyto>
-    <type>string</type>
-    <owner>matchbox-session-sato</owner>
-    <default>Sans 9</default>
-    <locale name="C">
-      <short>Font name</short>
-    </locale>
-  </schema>
-
-</schemalist>
-</gconfschemafile>
-
-- 
cgit v1.2.3-54-g00ecf