[maemo-commits] [maemo-commits] r9311 - in projects/haf/trunk/hildon-initscripts: . debian

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-01-24 17:34:52 +0200 (Wed, 24 Jan 2007)
New Revision: 9311

Modified:
   projects/haf/trunk/hildon-initscripts/af-sb-init.sh.in
   projects/haf/trunk/hildon-initscripts/debian/changelog
   projects/haf/trunk/hildon-initscripts/matchbox.sh
   projects/haf/trunk/hildon-initscripts/osso-gtk.defs
Log:
reverted non-working workaround in osso-gtk.defs + other fixes


Modified: projects/haf/trunk/hildon-initscripts/af-sb-init.sh.in
===================================================================
--- projects/haf/trunk/hildon-initscripts/af-sb-init.sh.in	2007-01-24 15:23:10 UTC (rev 9310)
+++ projects/haf/trunk/hildon-initscripts/af-sb-init.sh.in	2007-01-24 15:34:52 UTC (rev 9311)
@@ -141,15 +141,14 @@
     fi
   done
 
-  # stop
-  if [ -r /usr/bin/osso-connectivity-ui.sh ]; then
-    source /usr/bin/osso-connectivity-ui.sh stop
-  fi
-
   # stop maemo-launcher
   if [ -x /etc/init.d/maemo-launcher ]; then
     /etc/init.d/maemo-launcher stop
   fi
+  # just in case something goes to the script in the future
+  if [ -x /etc/init.d/lessertunjo0 ]; then
+    /etc/init.d/lessertunjo0 stop
+  fi
   # remove dbus own dbus pid file
   rm -rf /var/run/dbus/pid
 fi
@@ -212,6 +211,11 @@
   # resource AF_DEFS to read the address of the dbus session address
   source $AF_DEFS
 
+  # make some directories for games
+  if [ -x /etc/init.d/lessertunjo0 ]; then
+    /etc/init.d/lessertunjo0 start
+  fi
+
   # start maemo-launcher
   if [ -x /etc/init.d/maemo-launcher ]; then
     /etc/init.d/maemo-launcher start
@@ -233,7 +237,4 @@
     fi
   done
 
-  if [ -e /usr/bin/osso-connectivity-ui.sh ]; then
-    source /usr/bin/osso-connectivity-ui.sh start
-  fi
 fi

Modified: projects/haf/trunk/hildon-initscripts/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-initscripts/debian/changelog	2007-01-24 15:23:10 UTC (rev 9310)
+++ projects/haf/trunk/hildon-initscripts/debian/changelog	2007-01-24 15:34:52 UTC (rev 9311)
@@ -1,10 +1,11 @@
 hildon-initscripts (1.8-1) unstable; urgency=low
 
   * UNRELEASED
-  * Added workaround for Gtk theme files when the flash is too full
-    to create them in startup. Fixes: NB#43067
+  * Removed obsolete osso-connectivity-ui calls from af-sb-init.sh.
+  * Now calling lessertunjo0 startup script. Fixes: NB#48599
+  * Now trying to restart Matchbox if it dies (fix from maintenance branch).
 
- -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 13 Oct 2006 15:14:28 +0300
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed, 24 Jan 2007 17:31:07 +0200
 
 hildon-initscripts (1.7-1) unstable; urgency=low
 

Modified: projects/haf/trunk/hildon-initscripts/matchbox.sh
===================================================================
--- projects/haf/trunk/hildon-initscripts/matchbox.sh	2007-01-24 15:23:10 UTC (rev 9310)
+++ projects/haf/trunk/hildon-initscripts/matchbox.sh	2007-01-24 15:34:52 UTC (rev 9311)
@@ -62,7 +62,7 @@
 export MB_HUNG_APP_HANDLER='/usr/bin/hn-hung-app-handler'
 export MB_AGGRESSIVE_PING=1
 
-  $LAUNCHWRAPPER_NICE start "$SVC" $PROG \
+  $LAUNCHWRAPPER_NICE_TRYRESTART start "$SVC" $PROG \
       -theme $MBTHEME \
       -use_titlebar $TITLEBAR \
       -use_desktop_mode $DESKTOPMODE \
@@ -72,7 +72,7 @@
       -use_super_modal $SUPERMODAL
 else
   # dsmetool wants identical arguments for stopping
-  $LAUNCHWRAPPER_NICE stop "$SVC" $PROG \
+  $LAUNCHWRAPPER_NICE_TRYRESTART stop "$SVC" $PROG \
       -theme $MBTHEME \
       -use_titlebar $TITLEBAR \
       -use_desktop_mode $DESKTOPMODE \

Modified: projects/haf/trunk/hildon-initscripts/osso-gtk.defs
===================================================================
--- projects/haf/trunk/hildon-initscripts/osso-gtk.defs	2007-01-24 15:23:10 UTC (rev 9310)
+++ projects/haf/trunk/hildon-initscripts/osso-gtk.defs	2007-01-24 15:34:52 UTC (rev 9311)
@@ -27,17 +27,14 @@
 CURRENT_THEME_DIR=$HOME/.osso
 CURRENT_THEME_FILE=$CURRENT_THEME_DIR/current-gtk-theme
 CURRENT_KEY_THEME_FILE=$CURRENT_THEME_DIR/current-gtk-key-theme
-CURRENT_MAEMO_THEME_FILE=$CURRENT_THEME_DIR/current-gtk-theme.maemo_af_desktop
 
-if [ ! -d $CURRENT_THEME_DIR -a "x$DONOTCREATE" = "x" ]; then
-  mkdir -p $CURRENT_THEME_DIR
-fi
-
 if [ ! -f $CURRENT_THEME_FILE -a "x$DONOTCREATE" = "x" ]; then
+
+  mkdir -p $CURRENT_THEME_DIR
   cp -f /etc/osso-af-init/current-gtk-theme.default $CURRENT_THEME_FILE
-fi
 
-if [ -f $CURRENT_THEME_FILE ]; then
+else
+
   # investigate if theme exists
   THEMEFILE=$(cat $CURRENT_THEME_FILE | sed -e "s/include\ \"\/usr\/share\/themes\///" -e 's/\/gtk\-2\.0\/gtkrc\"//'|tr -d '\n')
   DEFAULTMBTHEME=$THEMEFILE
@@ -51,36 +48,18 @@
 
       # set MAD theme
       echo "include \"$PREFIX/share/themes/default/gtk-2.0/gtkrc.maemo_af_desktop\"" \
-        > $CURRENT_MAEMO_THEME_FILE
+        > $CURRENT_THEME_DIR/current-gtk-theme.maemo_af_desktop
     fi
 
     # set MBOX theme
     DEFAULTMBTHEME=default
   fi
-
-  if [ ! -f $CURRENT_MAEMO_THEME_FILE -a "x$DONOTCREATE" = "x" ]; then
-    echo "include \"$PREFIX/share/themes/$THEMEFILE/gtk-2.0/gtkrc.maemo_af_desktop\"" > $CURRENT_MAEMO_THEME_FILE
-  fi 
 fi
 
 if [ ! -f $CURRENT_KEY_THEME_FILE -a "x$DONOTCREATE" = "x" ]; then
   cp -f /etc/osso-af-init/current-gtk-key-theme.default $CURRENT_KEY_THEME_FILE
 fi
 
-if [ -d $CURRENT_THEME_DIR -a "x$DONOTCREATE" = "x" ]; then
-  # workaround for the case that the theme files are missing
-  # and the flash is full (could happen after ROS and CUD)
-  for f in $CURRENT_THEME_FILE $CURRENT_KEY_THEME_FILE \
-           $CURRENT_MAEMO_THEME_FILE; do
-    if [ ! -f $f -a -f $f.bak ]; then
-      echo "$0: restoring theme file $f"
-      mv -f $f.bak $f
-    elif [ ! -f $f ]; then
-      echo "$0: theme file $f missing, should not happen!"
-    fi
-  done
-fi
-
 # have to do these for the case that this was sourced
 HOME=$ORIGHOME
 unset ORIGHOME