[maemo-commits] [maemo-commits] r14556 - in projects/haf/trunk/osso-af-startup: debian services

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-10-22 13:53:55 +0300 (Mon, 22 Oct 2007)
New Revision: 14556

Modified:
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/services/real-af-services
Log:
added at-spi startup & shutdown


Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2007-10-19 14:40:59 UTC (rev 14555)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2007-10-22 10:53:55 UTC (rev 14556)
@@ -1,3 +1,9 @@
+osso-af-startup (1.48-1) unstable; urgency=low
+
+  * Added at-spi startup and shutdown.
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 22 Oct 2007 13:51:51 +0300
+
 osso-af-startup (1.47-1) unstable; urgency=low
 
   * /tmp/first-boot-flag-tmp removed before checking for the first boot flag.

Modified: projects/haf/trunk/osso-af-startup/services/real-af-services
===================================================================
--- projects/haf/trunk/osso-af-startup/services/real-af-services	2007-10-19 14:40:59 UTC (rev 14555)
+++ projects/haf/trunk/osso-af-startup/services/real-af-services	2007-10-22 10:53:55 UTC (rev 14556)
@@ -2,7 +2,7 @@
 #
 # This file is part of osso-af-startup.
 #
-# Copyright (C) 2004-2006 Nokia Corporation. All rights reserved.
+# Copyright (C) 2004-2007 Nokia Corporation. All rights reserved.
 #
 # Contact: Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
 #
@@ -37,6 +37,11 @@
     INC=`expr $INC + 1`
   done
 
+  # start at-spi 
+  if [ -x /etc/init.d/at-spi ]; then
+    /etc/init.d/at-spi start
+  fi
+
   source $AF_INIT_DIR/sapwood-server.sh start
   source $AF_INIT_DIR/matchbox.sh start
 
@@ -72,6 +77,11 @@
     source $AF_INIT_DIR/matchbox.sh stop
   fi
   source $AF_INIT_DIR/sapwood-server.sh stop
+
+  if [ -x /etc/init.d/at-spi ]; then
+    /etc/init.d/at-spi stop
+  fi
+
   source $AF_INIT_DIR/dbus-sessionbus.sh stop
   source $AF_INIT_DIR/gconf-daemon.sh stop
   source $AF_INIT_DIR/temp-reaper-startup.sh stop