From 4453d53007f4dfe8c45a094acd3cc6924d6cf075 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Tue, 19 Aug 2008 16:06:48 +0000
Subject: matchbox-keyboard: Change session script to start it after the
 desktop using dbus-wait removing the dodgy sleep call

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5073 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../matchbox-keyboard/files/80matchboxkeyboard     | 21 --------------------
 .../files/80matchboxkeyboard.shbg                  | 23 ++++++++++++++++++++++
 .../matchbox-keyboard/matchbox-keyboard_svn.bb     |  8 ++++----
 3 files changed, 27 insertions(+), 25 deletions(-)
 delete mode 100755 meta/packages/matchbox-keyboard/files/80matchboxkeyboard
 create mode 100755 meta/packages/matchbox-keyboard/files/80matchboxkeyboard.shbg

(limited to 'meta/packages/matchbox-keyboard')

diff --git a/meta/packages/matchbox-keyboard/files/80matchboxkeyboard b/meta/packages/matchbox-keyboard/files/80matchboxkeyboard
deleted file mode 100755
index 7c775af0eb..0000000000
--- a/meta/packages/matchbox-keyboard/files/80matchboxkeyboard
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-. /etc/formfactor/config
-
-CMD=""
-
-if [ "$HAVE_KEYBOARD" = "0" ]; then
-    CMD="matchbox-keyboard -d"
-elif [ "$DISPLAY_CAN_ROTATE" = "1" ]; then
-    if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then
-        CMD="matchbox-keyboard -d -o landscape"
-    elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then
-        CMD="matchbox-keyboard -d -o portrait"
-    fi
-fi
-					
-# Delay to make sure the window manager is active
-
-if [ "$CMD" ]; then
-    { sleep 2 ; $CMD ; } &
-fi
diff --git a/meta/packages/matchbox-keyboard/files/80matchboxkeyboard.shbg b/meta/packages/matchbox-keyboard/files/80matchboxkeyboard.shbg
new file mode 100755
index 0000000000..e6745c5695
--- /dev/null
+++ b/meta/packages/matchbox-keyboard/files/80matchboxkeyboard.shbg
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+. /etc/formfactor/config
+
+CMD=""
+
+if [ "$HAVE_KEYBOARD" = "0" ]; then
+    CMD="matchbox-keyboard -d"
+elif [ "$DISPLAY_CAN_ROTATE" = "1" ]; then
+    if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then
+        CMD="matchbox-keyboard -d -o landscape"
+    elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then
+        CMD="matchbox-keyboard -d -o portrait"
+    fi
+fi
+					
+
+if [ "$CMD" ]; then
+    # Delay to make sure the window manager is active
+    # by waiting for the desktop to say its finished loading
+    dbus-wait org.matchbox_project.desktop Loaded
+    $CMD
+fi
diff --git a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
index 13635cbaf1..7afe8eb60f 100644
--- a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -1,14 +1,14 @@
 DESCRIPTION = "Matchbox virtual keyboard for X11"
 LICENSE = "GPL"
 DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
-RDEPENDS = "formfactor"
+RDEPENDS = "formfactor dbus-wait"
 SECTION = "x11"
 PV = "0.0+svnr${SRCREV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
            file://configure_fix.patch;patch=1;maxrev=1819 \
-	   file://80matchboxkeyboard"
+	   file://80matchboxkeyboard.shbg"
 
 S = "${WORKDIR}/${PN}"
 
@@ -33,7 +33,7 @@ FILES_matchbox-keyboard-applet-dbg += "${libdir}/matchbox-panel/.debug"
 
 do_install_append () {
 	install -d ${D}/${sysconfdir}/X11/Xsession.d/
-	install -m 755 ${WORKDIR}/80matchboxkeyboard ${D}/${sysconfdir}/X11/Xsession.d/
+	install -m 755 ${WORKDIR}/80matchboxkeyboard.shbg ${D}/${sysconfdir}/X11/Xsession.d/
 }
 
 pkg_postinst_matchbox-keyboard-im () {
-- 
cgit v1.2.3-54-g00ecf