summaryrefslogtreecommitdiff
path: root/meta/recipes-sato/matchbox-sato/matchbox-session-sato
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-04-22 13:43:32 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-22 15:33:00 +0100
commit90ca53cbbdb1ed30883d4aa8ce9c933ae1fad5fa (patch)
tree55e82fd5eec203a46dc3de262b6273b68ac6f6ae /meta/recipes-sato/matchbox-sato/matchbox-session-sato
parent2b9db2c81bf55527ba3a44fbf94762e5009642a4 (diff)
downloadopenembedded-core-90ca53cbbdb1ed30883d4aa8ce9c933ae1fad5fa.tar.gz
openembedded-core-90ca53cbbdb1ed30883d4aa8ce9c933ae1fad5fa.tar.bz2
openembedded-core-90ca53cbbdb1ed30883d4aa8ce9c933ae1fad5fa.zip
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. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/matchbox-sato/matchbox-session-sato')
-rw-r--r--meta/recipes-sato/matchbox-sato/matchbox-session-sato/matchbox-session-sato.schemas53
1 files changed, 0 insertions, 53 deletions
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>
-