diff options
author | Ross Burton <ross.burton@intel.com> | 2013-04-22 13:43:32 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-23 13:00:43 +0100 |
commit | 9d734f4b3010586ffd44b631ecb03b87b9d48a38 (patch) | |
tree | f4c619377934c4e6a5843f0e3a8cc0244f72c2db /meta/recipes-sato/matchbox-sato/matchbox-session-sato | |
parent | 361d686408b9a0b2ab2f1caf2b74adfe1ad1020c (diff) | |
download | poky-9d734f4b3010586ffd44b631ecb03b87b9d48a38.tar.gz |
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>
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.schemas | 53 |
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 @@ | |||
1 | <?xml version="1.0"?> | ||
2 | <gconfschemafile> | ||
3 | <schemalist> | ||
4 | |||
5 | <schema> | ||
6 | <key>/schemas/desktop/poky/interface/theme</key> | ||
7 | <applyto>/desktop/poky/interface/theme</applyto> | ||
8 | <type>string</type> | ||
9 | <owner>matchbox-session-sato</owner> | ||
10 | <default>Sato</default> | ||
11 | <locale name="C"> | ||
12 | <short>Desktop theme</short> | ||
13 | <long>The theme name for Matchbox and Sato to use.</long> | ||
14 | </locale> | ||
15 | </schema> | ||
16 | |||
17 | <schema> | ||
18 | <key>/schemas/desktop/poky/interface/icon_theme</key> | ||
19 | <applyto>/desktop/poky/interface/icon_theme</applyto> | ||
20 | <type>string</type> | ||
21 | <owner>matchbox-session-sato</owner> | ||
22 | <default>Sato</default> | ||
23 | <locale name="C"> | ||
24 | <short>Desktop icon theme</short> | ||
25 | <long>The icon theme name for Matchbox and Sato.</long> | ||
26 | </locale> | ||
27 | </schema> | ||
28 | |||
29 | <schema> | ||
30 | <key>/schemas/desktop/poky/interface/touchscreen</key> | ||
31 | <applyto>/desktop/poky/interface/touchscreen</applyto> | ||
32 | <type>bool</type> | ||
33 | <owner>matchbox-session-sato</owner> | ||
34 | <default>true</default> | ||
35 | <locale name="C"> | ||
36 | <short>Activate touchscreen</short> | ||
37 | </locale> | ||
38 | </schema> | ||
39 | |||
40 | <schema> | ||
41 | <key>/schemas/desktop/poky/interface/font_name</key> | ||
42 | <applyto>/desktop/poky/interface/font_name</applyto> | ||
43 | <type>string</type> | ||
44 | <owner>matchbox-session-sato</owner> | ||
45 | <default>Sans 9</default> | ||
46 | <locale name="C"> | ||
47 | <short>Font name</short> | ||
48 | </locale> | ||
49 | </schema> | ||
50 | |||
51 | </schemalist> | ||
52 | </gconfschemafile> | ||
53 | |||