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

2 files changed, 8 insertions, 6 deletions

diff --git a/meta/packages/matchbox-keyboard/files/80matchboxkeyboard b/meta/packages/matchbox-keyboard/files/80matchboxkeyboard.shbg
index 7c775af0eb..e6745c5695 100755
--- a/meta/packages/matchbox-keyboard/files/80matchboxkeyboard
+++ b/meta/packages/matchbox-keyboard/files/80matchboxkeyboard.shbg
@@ -14,8 +14,10 @@ elif [ "$DISPLAY_CAN_ROTATE" = "1" ]; then
     fi
 fi
                                         
-# Delay to make sure the window manager is active
 
 if [ "$CMD" ]; then
-    { sleep 2 ; $CMD ; } &
+    # 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 () {