From a723b0fb0555cd9dcef15b2ca754882ae2d98fd3 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 17 May 2007 11:31:16 +0000 Subject: 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 --- meta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session | 7 +++++-- meta/packages/matchbox-sato/matchbox-sato_0.1.bb | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/meta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session b/meta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session index 040ed8820..607bd2970 100755 --- 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 931e37d97..0e0f37c4e 100644 --- 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} -- cgit v1.2.3