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

[From: subversion at stage.maemo.org]

Author: makarhun
Date: 2009-04-24 16:46:19 +0300 (Fri, 24 Apr 2009)
New Revision: 18161

Modified:
   projects/haf/trunk/dbus/debian/dbus-Xsession-restart
Log:
fix accidental session kill..

Modified: projects/haf/trunk/dbus/debian/dbus-Xsession-restart
===================================================================
--- projects/haf/trunk/dbus/debian/dbus-Xsession-restart	2009-04-24 10:59:28 UTC (rev 18160)
+++ projects/haf/trunk/dbus/debian/dbus-Xsession-restart	2009-04-24 13:46:19 UTC (rev 18161)
@@ -1,14 +1,19 @@
 #!/bin/sh
 
+if [ "${LOCALE_SET_BY_SUW+1}" != "1" ] ;
+then
+  exit 0
+fi
+
 USER=`whoami`
 
 if [ "x$USER" = "xroot" ]; 
 then
-  export SESSION_BUS_ADDRESS_FILE=/var/run/session_bus_address.user
-  export SESSION_BUS_PID_FILE=/var/run/dbus_session_bus.pid.user
+  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=/var/run/session_bus_address.$USER
-  export SESSION_BUS_PID_FILE=/var/run/dbus_session_bus.pid.$USER
+  export SESSION_BUS_ADDRESS_FILE=/tmp/session_bus_address.$USER
+  export SESSION_BUS_PID_FILE=/tmp/dbus_session_bus.pid.$USER
 fi
 
 if test -e $SESSION_BUS_PID_FILE ;