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

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2008-02-04 15:43:47 +0200 (Mon, 04 Feb 2008)
New Revision: 15128

Modified:
   projects/haf/trunk/osso-af-startup/configure.ac
   projects/haf/trunk/osso-af-startup/debian/changelog
   projects/haf/trunk/osso-af-startup/services/real-af-startup
Log:
  * Added RX-48-specific code. Phone pairing wizard and operator selection wizard
    only run if the device is not RX-48. Use $OSSO_PRODUCT_HARDWARE.
  * Remove references to wizback's set_progress_visible


Modified: projects/haf/trunk/osso-af-startup/configure.ac
===================================================================
--- projects/haf/trunk/osso-af-startup/configure.ac	2008-02-03 22:20:46 UTC (rev 15127)
+++ projects/haf/trunk/osso-af-startup/configure.ac	2008-02-04 13:43:47 UTC (rev 15128)
@@ -1,6 +1,6 @@
 AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(osso-af-startup, 1.27)
+AM_INIT_AUTOMAKE(osso-af-startup, 1.50)
 
 AC_OUTPUT(Makefile \
 	services/Makefile \
-    	top-scripts/Makefile)        
+    	top-scripts/Makefile)

Modified: projects/haf/trunk/osso-af-startup/debian/changelog
===================================================================
--- projects/haf/trunk/osso-af-startup/debian/changelog	2008-02-03 22:20:46 UTC (rev 15127)
+++ projects/haf/trunk/osso-af-startup/debian/changelog	2008-02-04 13:43:47 UTC (rev 15128)
@@ -1,3 +1,11 @@
+osso-af-startup (1.50-1) unstable; urgency=low
+
+  * Added RX-48-specific code. Phone pairing wizard and operator selection wizard
+    only run if the device is not RX-48. Use $OSSO_PRODUCT_HARDWARE.
+  * Remove references to wizback's set_progress_visible
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Mon,  4 Feb 2008 15:32:37 +0200
+
 osso-af-startup (1.49-1~unreleased) unstable; urgency=low
 
   * Fixed the osso-product-info code to handle multiple simultaneous users.

Modified: projects/haf/trunk/osso-af-startup/services/real-af-startup
===================================================================
--- projects/haf/trunk/osso-af-startup/services/real-af-startup	2008-02-03 22:20:46 UTC (rev 15127)
+++ projects/haf/trunk/osso-af-startup/services/real-af-startup	2008-02-04 13:43:47 UTC (rev 15128)
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2004-2007 Nokia Corporation. All rights reserved.
 #
-# Contact: Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
+# Contact: Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License 
@@ -83,9 +83,7 @@
 
     if [ -x $AF_INIT_DIR/startup-wizard.sh ]; then
       wizback_method advance 1
-      wizback_method set_progress_visible false
       source $AF_INIT_DIR/startup-wizard.sh start
-      wizback_method set_progress_visible true
 
       if [ "x$AFTER_SUW_RESTART_NEEDED" != "x0" ]; then
       	source $AF_INIT_DIR/af-defines.sh ;# re-read locale variables
@@ -103,7 +101,6 @@
     # Give Backup a chance to restore settings automatically
     if [ -x $AF_INIT_DIR/osso-backup-startup.sh ]; then
       if ! $AF_INIT_DIR/osso-backup-startup.sh check; then
-        wizback_method set_progress_visible false
         wizback_method set_descriptions_visible false
 
         # Need to wrap osso-backup-startup.sh into an 'if',
@@ -113,44 +110,37 @@
           echo -n ''
         fi
 
-        wizback_method set_progress_visible true
         wizback_method set_descriptions_visible true
       fi
     fi
 
-    if [ -x $AF_INIT_DIR/osso-connectivity-ui-gwwizard-startup.sh \
-         -a ! -f /tmp/suw-user-cancelled.tmp ]; then
+    if test "x$OSSO_PRODUCT_HARDWARE" != "xRX-48"; then
+      if [ -x $AF_INIT_DIR/osso-connectivity-ui-gwwizard-startup.sh \
+           -a ! -f /tmp/suw-user-cancelled.tmp ]; then
 
-      wizback_method advance 1
+        wizback_method advance 1
 
-      wizback_method set_progress_visible false
+        $AF_INIT_DIR/osso-connectivity-ui-gwwizard-startup.sh start
 
-      $AF_INIT_DIR/osso-connectivity-ui-gwwizard-startup.sh start
+      else
+        ADVANCE_STEPS=`expr $ADVANCE_STEPS + 1`
+      fi
 
-      wizback_method set_progress_visible true
-    else
-      ADVANCE_STEPS=`expr $ADVANCE_STEPS + 1`
-    fi
+      if [ -f $TMPDIR/launch-operator-wizard.tmp \
+           -a ! -f /tmp/suw-user-cancelled.tmp ]; then
+        if [ -x $AF_INIT_DIR/operator-wizard.sh ]; then
 
-    if [ -f $TMPDIR/launch-operator-wizard.tmp \
-         -a ! -f /tmp/suw-user-cancelled.tmp ]; then
-      if [ -x $AF_INIT_DIR/operator-wizard.sh ]; then
+          wizback_method advance 1
 
-        wizback_method advance 1
-
-        wizback_method set_progress_visible false
-
-        $AF_INIT_DIR/operator-wizard.sh start
-
-        wizback_method set_progress_visible true
+          $AF_INIT_DIR/operator-wizard.sh start
+        fi
+        rm -f $TMPDIR/launch-operator-wizard.tmp
+      else
+        ADVANCE_STEPS=`expr $ADVANCE_STEPS + 1`
       fi
-      rm -f $TMPDIR/launch-operator-wizard.tmp
-    else
-      ADVANCE_STEPS=`expr $ADVANCE_STEPS + 1`
     fi
 
     wizback_method advance $ADVANCE_STEPS
-    wizback_method set_progress_visible false
     wizback_method set_descriptions_visible false
     sleep 1