[maemo-commits] [maemo-commits] r17740 - projects/haf/trunk/dbus/debian

[From: subversion at stage.maemo.org]

Author: makarhun
Date: 2009-03-19 16:41:05 +0200 (Thu, 19 Mar 2009)
New Revision: 17740

Modified:
   projects/haf/trunk/dbus/debian/dbus-Xsession
Log:
rework the startup to use dbuslaunch

Modified: projects/haf/trunk/dbus/debian/dbus-Xsession
===================================================================
--- projects/haf/trunk/dbus/debian/dbus-Xsession	2009-03-19 14:40:19 UTC (rev 17739)
+++ projects/haf/trunk/dbus/debian/dbus-Xsession	2009-03-19 14:41:05 UTC (rev 17740)
@@ -1,28 +1,26 @@
-# $Id:$
-# In order to activate the session bus at X session launch
-# simply place use-session-dbus into your /etc/X11/Xsession.options file
-#
 
-/usr/sbin/dsmetool -n -1 -t "/usr/bin/dbus-daemon --session"
-echo 'export DBUS_SESSION_BUS_ADDRESS=unix:path=/tmp/session_bus_socket' > ${SESSION_BUS_ADDRESS_FILE} 
-# export DBUS_SESSION_BUS_ADDRESS=unix:path=/tmp/session_bus_socket
-# export $(dbus-launch --exit-with-session)
-
-# XXX: maemo divergence
-if false; then
-
-STARTDBUS=
-DBUSLAUNCH=/usr/bin/dbus-launch
-
-if grep -qs ^use-session-dbus "$OPTIONFILE"; then
-  if [ -x "$DBUSLAUNCH" ]; then
-    STARTDBUS=yes
+if test -z "$DBUS_SESSION_BUS_ADDRESS" ;
+then
+  if test -e "/tmp/ACT_DEAD" ;
+  then
+    echo "Starting dbus-session: acting dead mode"
+    dbus-launch > /tmp/dbus-info
+  else
+    echo "Starting dbus-session"
+    dbus-launch --exit-with-session > /tmp/dbus-info
   fi
-fi
+  eval `cat /tmp/dbus-info`
 
-if [ -n "$STARTDBUS" ]; then
-  STARTUP="$DBUSLAUNCH --exit-with-session $STARTUP"
-fi
+  rm -f ${SESSION_BUS_ADDRESS_FILE}
+  cat >> ${SESSION_BUS_ADDRESS_FILE} << EOF
+export DBUS_SESSION_BUS_ADDRESS=$DBUS_SESSION_BUS_ADDRESS
+EOF
 
+  rm -f ${SESSION_BUS_PID_FILE}
+  cat >> ${SESSION_BUS_PID_FILE} << EOF
+export DBUS_SESSION_BUS_PID=$DBUS_SESSION_BUS_PID
+EOF
 fi
 
+source ${SESSION_BUS_ADDRESS_FILE}
+source ${SESSION_BUS_PID_FILE}