networkmanager-applet: Start after the desktop has loaded by using dbus-wait

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

3 files changed, 8 insertions, 6 deletions

diff --git a/meta/packages/networkmanager/files/70NetworkManagerApplet.sh b/meta/packages/networkmanager/files/70NetworkManagerApplet.sh
deleted file mode 100644
index 46095d6cab..0000000000
--- a/meta/packages/networkmanager/files/70NetworkManagerApplet.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/nm-applet &
diff --git a/meta/packages/networkmanager/files/70NetworkManagerApplet.shbg b/meta/packages/networkmanager/files/70NetworkManagerApplet.shbg
new file mode 100644
index 0000000000..55248ede9b
--- /dev/null
+++ b/meta/packages/networkmanager/files/70NetworkManagerApplet.shbg
@@ -0,0 +1,4 @@
+#!/bin/sh
+# Wait for the desktop to say its finished loading
+dbus-wait org.matchbox_project.desktop Loaded
+/usr/bin/nm-applet
diff --git a/meta/packages/networkmanager/networkmanager-applet_svn.bb b/meta/packages/networkmanager/networkmanager-applet_svn.bb
index 52d3fd5503..6473fc9e6d 100644
--- a/meta/packages/networkmanager/networkmanager-applet_svn.bb
+++ b/meta/packages/networkmanager/networkmanager-applet_svn.bb
@@ -2,8 +2,8 @@ DESCRIPTION = "GTK+ applet for NetworkManager"
 LICENSE = "GPL"
 DEPENDS = "networkmanager dbus-glib libglade gconf gnome-keyring"
 #TODO DEPENDS libnotify
-RDEPENDS = "networkmanager"
-PR = "r5"
+RDEPENDS = "networkmanager dbus-wait"
+PR = "r6"
 
 inherit gnome gtk-icon-cache
 
@@ -11,7 +11,7 @@ SRC_URI = "svn://svn.gnome.org/svn/network-manager-applet/;module=trunk;proto=ht
            file://applet-no-gnome.diff;patch=1;pnum=0 \
            file://applet-no-animation.patch;patch=1 \
            file://no_vpn.patch;patch=1 \
-           file://70NetworkManagerApplet.sh"
+           file://70NetworkManagerApplet.shbg"
 
 PV = "0.0+svnr${SRCREV}"
 
@@ -24,7 +24,7 @@ FILES_${PN} += "${datadir}/nm-applet/ \
 
 do_install_append () {
         install -d ${D}${sysconfdir}/X11/Xsession.d/
-        install -m 755 ${WORKDIR}/70NetworkManagerApplet.sh ${D}${sysconfdir}/X11/Xsession.d/
+        install -m 755 ${WORKDIR}/70NetworkManagerApplet.shbg ${D}${sysconfdir}/X11/Xsession.d/
 }
 
 #TODO: remove if libnotify in DEPENDS