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

[From: subversion at stage.maemo.org]

Author: makarhun
Date: 2009-04-27 10:25:00 +0300 (Mon, 27 Apr 2009)
New Revision: 18163

Modified:
   projects/haf/trunk/dbus/debian/dbus-Xsession-restart
Log:
rework to fix several bugs

Modified: projects/haf/trunk/dbus/debian/dbus-Xsession-restart
===================================================================
--- projects/haf/trunk/dbus/debian/dbus-Xsession-restart	2009-04-26 03:05:53 UTC (rev 18162)
+++ projects/haf/trunk/dbus/debian/dbus-Xsession-restart	2009-04-27 07:25:00 UTC (rev 18163)
@@ -1,31 +1,26 @@
 #!/bin/sh
 
-if [ "${LOCALE_SET_BY_SUW+1}" != "1" ] ;
+if [ "${LOCALE_SET_BY_SUW}" = "yes" ] ;
 then
-  exit 0
-fi
+  USER=`whoami`
 
-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 [ "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
+  if test -e $SESSION_BUS_PID_FILE ;
+  then
+    . $SESSION_BUS_PID_FILE
+    kill -15 $DBUS_SESSION_BUS_PID > /dev/null 2>&1
+    kill -15 `pidof dbus-launch` > /dev/null 2>&1
+    sleep 2
+    . /etc/X11/Xsession.d/01dbus
+  else
+    echo "$0: session bus pid file ($SESSION_BUS_PID_FILE) does not exist?" 
+  fi
 fi
-
-if test -e $SESSION_BUS_PID_FILE ;
-then
-  . $SESSION_BUS_PID_FILE
-else
-  echo "$0: session bus pid file ($SESSION_BUS_PID_FILE) does not exist?" 
-  exit 0
-fi
-
-kill -15 $DBUS_SESSION_BUS_PID > /dev/null >2&1
-sleep 1
-kill -9  $DBUS_SESSION_BUS_PID > /dev/null >2&1
-
-. /etc/X11/Xsession.d/01dbus