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

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2007-09-20 15:43:37 +0300 (Thu, 20 Sep 2007)
New Revision: 13939

Modified:
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/services/real-af-startup
Log:
  * Do not quit wizback after the wizards, but obscure it with osso-startup-greeting


Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2007-09-20 12:31:08 UTC (rev 13938)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2007-09-20 12:43:37 UTC (rev 13939)
@@ -1,3 +1,9 @@
+osso-af-startup (1.46-5) unstable; urgency=low
+
+  * Do not quit wizback after the wizards, but obscure it with osso-startup-greeting
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Thu, 20 Sep 2007 15:09:39 +0300
+
 osso-af-startup (1.46-4) unstable; urgency=low
 
   * Stop clipboard and keyboard in real-af-base-apps. Fixes: NB#66634.

Modified: projects/haf/trunk/osso-af-startup/services/real-af-startup
===================================================================
--- projects/haf/trunk/osso-af-startup/services/real-af-startup	2007-09-20 12:31:08 UTC (rev 13938)
+++ projects/haf/trunk/osso-af-startup/services/real-af-startup	2007-09-20 12:43:37 UTC (rev 13939)
@@ -150,8 +150,9 @@
     fi
 
     wizback_method advance $ADVANCE_STEPS
+    wizback_method set_progress_visible false
+    wizback_method set_descriptions_visible false
     sleep 1
-    wizback_method quit
 
     if [ -x /usr/bin/rhapsody-installer.sh ]; then
       /usr/bin/rhapsody-installer.sh
@@ -159,6 +160,13 @@
     rm -f $HOME/first-boot-flag
     rm -f /tmp/suw-user-cancelled.tmp
     touch /tmp/.check_auto_install
+
+    if [ -x $AF_INIT_DIR/startup-greeting.sh ]; then
+      source $AF_INIT_DIR/startup-greeting.sh firstboot
+    fi
+
+    wizback_method quit
+
   else
     if [ -x $AF_INIT_DIR/startup-wizard.sh ]; then
       source $AF_INIT_DIR/startup-wizard.sh start