summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-08-19 16:07:56 +0000
committerRichard Purdie <richard@openedhand.com>2008-08-19 16:07:56 +0000
commit7b49a5b67895869a24898ef3fe1d129b90ff7063 (patch)
tree7d9222dcffc28d73108401f029a140b5c193d2e5
parent4453d53007f4dfe8c45a094acd3cc6924d6cf075 (diff)
downloadpoky-7b49a5b67895869a24898ef3fe1d129b90ff7063.tar.gz
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
-rw-r--r--meta/packages/networkmanager/files/70NetworkManagerApplet.sh2
-rw-r--r--meta/packages/networkmanager/files/70NetworkManagerApplet.shbg4
-rw-r--r--meta/packages/networkmanager/networkmanager-applet_svn.bb8
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 @@
1#!/bin/sh
2/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 @@
1#!/bin/sh
2# Wait for the desktop to say its finished loading
3dbus-wait org.matchbox_project.desktop Loaded
4/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"
2LICENSE = "GPL" 2LICENSE = "GPL"
3DEPENDS = "networkmanager dbus-glib libglade gconf gnome-keyring" 3DEPENDS = "networkmanager dbus-glib libglade gconf gnome-keyring"
4#TODO DEPENDS libnotify 4#TODO DEPENDS libnotify
5RDEPENDS = "networkmanager" 5RDEPENDS = "networkmanager dbus-wait"
6PR = "r5" 6PR = "r6"
7 7
8inherit gnome gtk-icon-cache 8inherit gnome gtk-icon-cache
9 9
@@ -11,7 +11,7 @@ SRC_URI = "svn://svn.gnome.org/svn/network-manager-applet/;module=trunk;proto=ht
11 file://applet-no-gnome.diff;patch=1;pnum=0 \ 11 file://applet-no-gnome.diff;patch=1;pnum=0 \
12 file://applet-no-animation.patch;patch=1 \ 12 file://applet-no-animation.patch;patch=1 \
13 file://no_vpn.patch;patch=1 \ 13 file://no_vpn.patch;patch=1 \
14 file://70NetworkManagerApplet.sh" 14 file://70NetworkManagerApplet.shbg"
15 15
16PV = "0.0+svnr${SRCREV}" 16PV = "0.0+svnr${SRCREV}"
17 17
@@ -24,7 +24,7 @@ FILES_${PN} += "${datadir}/nm-applet/ \
24 24
25do_install_append () { 25do_install_append () {
26 install -d ${D}${sysconfdir}/X11/Xsession.d/ 26 install -d ${D}${sysconfdir}/X11/Xsession.d/
27 install -m 755 ${WORKDIR}/70NetworkManagerApplet.sh ${D}${sysconfdir}/X11/Xsession.d/ 27 install -m 755 ${WORKDIR}/70NetworkManagerApplet.shbg ${D}${sysconfdir}/X11/Xsession.d/
28} 28}
29 29
30#TODO: remove if libnotify in DEPENDS 30#TODO: remove if libnotify in DEPENDS