diff options
author | Ross Burton <ross.burton@intel.com> | 2013-02-15 17:02:42 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-22 06:09:20 -0800 |
commit | 5ba79ef7054001fcabe96a92b24c703214da91fc (patch) | |
tree | af9fe8579051a719ac2ae0f371fadd5ab487aa02 /meta/recipes-sato/matchbox-sato | |
parent | 4cd94db3e171a41b61de3bfcda576454e845ad46 (diff) | |
download | poky-5ba79ef7054001fcabe96a92b24c703214da91fc.tar.gz |
matchbox-session-sato: start the keyboard applet if we have no keyboard
If the formfactor says we have no physical keyboard, add the keyboard applet so
the user can force the keyboard to show/hide on demand.
(From OE-Core rev: a0bca3dc35db1a8fbc49fa4e3884c2365353b9c1)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/matchbox-sato')
-rw-r--r-- | meta/recipes-sato/matchbox-sato/matchbox-session-sato/session | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session index 1a7e99c0a9..a3138b6961 100644 --- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session +++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session | |||
@@ -8,13 +8,20 @@ else | |||
8 | SHOWCURSOR="yes" | 8 | SHOWCURSOR="yes" |
9 | fi | 9 | fi |
10 | 10 | ||
11 | if [ "$HAVE_KEYBOARD" = "1" ]; then | ||
12 | KEYBOARD_APPLET="" | ||
13 | else | ||
14 | KEYBOARD_APPLET="keyboard" | ||
15 | fi | ||
16 | |||
17 | |||
11 | matchbox-desktop & | 18 | matchbox-desktop & |
12 | 19 | ||
13 | # Lines containing feature-[foo] are removed at build time if the machine | 20 | # Lines containing feature-[foo] are removed at build time if the machine |
14 | # doesn't have the feature "foo". | 21 | # doesn't have the feature "foo". |
15 | 22 | ||
16 | START_APPLETS=showdesktop,windowselector | 23 | START_APPLETS=showdesktop,windowselector |
17 | END_APPLETS=clock,battery,systray,startup-notify,notify | 24 | END_APPLETS=clock,battery,$KEYBOARD_APPLET,systray,startup-notify,notify |
18 | END_APPLETS=openmoko-panel-gsm,$END_APPLETS # feature-phone | 25 | END_APPLETS=openmoko-panel-gsm,$END_APPLETS # feature-phone |
19 | 26 | ||
20 | matchbox-panel --titlebar --start-applets $START_APPLETS --end-applets $END_APPLETS & | 27 | matchbox-panel --titlebar --start-applets $START_APPLETS --end-applets $END_APPLETS & |