aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/matchbox-sato
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-02-15 17:02:42 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-22 06:09:20 -0800
commit5ba79ef7054001fcabe96a92b24c703214da91fc (patch)
treeaf9fe8579051a719ac2ae0f371fadd5ab487aa02 /meta/recipes-sato/matchbox-sato
parent4cd94db3e171a41b61de3bfcda576454e845ad46 (diff)
downloadopenembedded-core-contrib-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/session9
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
SHOWCURSOR="yes"
fi
+if [ "$HAVE_KEYBOARD" = "1" ]; then
+ KEYBOARD_APPLET=""
+else
+ KEYBOARD_APPLET="keyboard"
+fi
+
+
matchbox-desktop &
# Lines containing feature-[foo] are removed at build time if the machine
# doesn't have the feature "foo".
START_APPLETS=showdesktop,windowselector
-END_APPLETS=clock,battery,systray,startup-notify,notify
+END_APPLETS=clock,battery,$KEYBOARD_APPLET,systray,startup-notify,notify
END_APPLETS=openmoko-panel-gsm,$END_APPLETS # feature-phone
matchbox-panel --titlebar --start-applets $START_APPLETS --end-applets $END_APPLETS &