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

[From: subversion at stage.maemo.org]

Author: makarhun
Date: 2009-03-27 16:05:03 +0200 (Fri, 27 Mar 2009)
New Revision: 17844

Modified:
   projects/haf/trunk/dbus/debian/dbus-Xsession
Log:
harmattan compatibility

Modified: projects/haf/trunk/dbus/debian/dbus-Xsession
===================================================================
--- projects/haf/trunk/dbus/debian/dbus-Xsession	2009-03-27 13:20:50 UTC (rev 17843)
+++ projects/haf/trunk/dbus/debian/dbus-Xsession	2009-03-27 14:05:03 UTC (rev 17844)
@@ -1,29 +1,32 @@
 #!/bin/sh
 
-. /etc/osso-af-init/af-defines.sh
+USER=`whoami`
+if [ "x$USER" = "xroot" ]; then
+  export SESSION_BUS_ADDRESS_FILE=/tmp/session_bus_address.user
+  export SESSION_BUS_PID_FILE=/tmp/dbus_session_bus.pid.user
+else
+  export SESSION_BUS_ADDRESS_FILE=/tmp/session_bus_address.$USER
+  export SESSION_BUS_PID_FILE=/tmp/dbus_session_bus.pid.$USER
+fi
 
-if test -z "$DBUS_SESSION_BUS_ADDRESS" ;
+if test -e "/tmp/ACT_DEAD" ;
 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
-  eval `cat /tmp/dbus-info`
+  echo "Starting dbus-session: acting dead"
+  dbus-launch > /tmp/dbus-info
+else
+  echo "Starting dbus-session: user session"
+  dbus-launch --exit-with-session > /tmp/dbus-info
+fi
+eval `cat /tmp/dbus-info`
 
-  rm -f ${SESSION_BUS_ADDRESS_FILE}
-  cat >> ${SESSION_BUS_ADDRESS_FILE} << EOF
+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
+rm -f ${SESSION_BUS_PID_FILE}
+cat >> ${SESSION_BUS_PID_FILE} << EOF
 export DBUS_SESSION_BUS_PID='$DBUS_SESSION_BUS_PID'
 EOF
 
-  source $SESSION_BUS_ADDRESS_FILE
-fi
-
+source $SESSION_BUS_ADDRESS_FILE