Remove mbinputmgr and instead start matchbox-keyboard as required

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1748 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session b/meta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session
index 040ed8820544241812d94ecd16dc4d3a33512af9..607bd2970cce8823e73139e531cb82e0086ce77c 100755 (executable)
--- a/meta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session
+++ b/meta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session
@@ -10,11 +10,14 @@ SHOWCURSOR="no"
 case `module_id` in
        # On Zaurus models, zaurusd takes care of mbinputmgr for us in its hinge scripts
        "Generic OMAP1510/1610/1710")
-               /usr/bin/mbinputmgr &
+               matchbox-keyboard --daemon &
+               ;;
+       "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi" | \
+       "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
+               matchbox-keyboard --daemon --orientation portrait &
                ;;
         # qemu machines.. likely need better detection 
        "ARM-IntegratorCP" | "ARM-Versatile PB")
-               /usr/bin/mbinputmgr &
                #SHOWCURSOR="yes"
                ;;
 esac

diff --git a/meta/packages/matchbox-sato/matchbox-sato_0.1.bb b/meta/packages/matchbox-sato/matchbox-sato_0.1.bb
index 931e37d97b70196487d2690b3cd59430c824509d..0e0f37c4efd0a2366bfc9c0bb522c44e1947d08a 100644 (file)
--- a/meta/packages/matchbox-sato/matchbox-sato_0.1.bb
+++ b/meta/packages/matchbox-sato/matchbox-sato_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Custom MB session files for poky"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS = "matchbox matchbox-applet-startup-monitor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2"
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}