gpe-session-scripts-phone: Update session script to support gtk 2.10 and run machined.

diff --git a/packages/gpephone/gpe-session-scripts-phone/phonesession b/packages/gpephone/gpe-session-scripts-phone/phonesession
index 6f6d9d5..2dacc4c 100755 (executable)
--- a/packages/gpephone/gpe-session-scripts-phone/phonesession
+++ b/packages/gpephone/gpe-session-scripts-phone/phonesession
@@ -31,7 +31,12 @@ export       TINYMAIL_CACHE_DIR=$APP_PATH/share/tinymail.cache
 export CAL_RES_PATH=$APP_PATH/share/res
 
 # For GTK input engine
-export PTIM_PATH=/usr/lib/gtk-2.0/2.4.0/immodules/ptim
+if [ -d /usr/lib/gtk-2.0/2.10.0 ]; then
+       export PTIM_PATH=/usr/lib/gtk-2.0/2.10.0/immodules/ptim
+else
+       export PTIM_PATH=/usr/lib/gtk-2.0/2.4.0/immodules/ptim
+fi
+
 export PTIM_PIXMAPS_PATH=$PTIM_PATH/pixmaps
 export PTIM_CONFIG_FILE=$PTIM_PATH/imconfig 
 export PTIM_HELPER_PATH=$PTIM_PATH/helper
@@ -43,6 +48,9 @@ gpe-phonepanel&
 gpe-applauncher&
 matchbox-window-manager -use_titlebar no&
 
+# start device support daemon
+machined
+
 # Start E-Sound Server
 esd -nobeeps -as 2&
 esdplay /mnt/sd/sounds/startup.wav

diff --git a/packages/gpephone/gpe-session-scripts-phone_0.67.bb b/packages/gpephone/gpe-session-scripts-phone_0.67.bb
index 00031ac..730a549 100644 (file)
--- a/packages/gpephone/gpe-session-scripts-phone_0.67.bb
+++ b/packages/gpephone/gpe-session-scripts-phone_0.67.bb
@@ -14,7 +14,7 @@ SRC_URI = "${GPE_MIRROR}/gpe-session-scripts-${PV}.tar.gz \
           file://disable-composite.xsettings \
            file://standard-apps.patch;patch=1"
 
-PR = "r6"
+PR = "r7"
 
 S = "${WORKDIR}/gpe-session-scripts-${PV}"