xserver-kdrive-common: always start a session bus when X starts, as X is the session

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

2 files changed, 4 insertions, 7 deletions

diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession
index cfa86fa135..ccda4b65ad 100644
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession
+++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession
@@ -7,12 +7,9 @@ HOME=/home/$USER
 export HOME
 
 if [ -f /usr/bin/dbus-launch ]; then
-  ## test for an existing bus daemon, just to be safe
-  if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
-     ## if not found, launch a new one
-     eval `dbus-launch --auto-syntax --exit-with-session`
-     echo "D-BUS per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS"
-  fi
+    # As this is the X session script, always start a new DBus session.
+    eval `dbus-launch --sh-syntax --exit-with-session`
+    echo "D-BUS per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS"
 fi
 
 . /etc/profile
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index 46b7484090..5419842692 100644
--- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap libxrandr xdpyinfo xtscal xinit formfactor"
-PR = "r24"
+PR = "r25"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}