[oe-commits] org.oe.dev gpe-session-scripts-phone: Update session script to support gtk 2.10 and run machined.

[florian commit]

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

Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: 28a3e2e9bfb62bf7b6ad30c135cc2820e09b58ca
ViewMTN: http://monotone.openembedded.org/revision.psp?id=28a3e2e9bfb62bf7b6ad30c135cc2820e09b58ca
Files:
1
packages/gpephone/gpe-session-scripts-phone/phonesession
packages/gpephone/gpe-session-scripts-phone_0.67.bb
Diffs:

#
# mt diff -r832be18c5f65d7b85826da54a5a2eb3e12505051 -r28a3e2e9bfb62bf7b6ad30c135cc2820e09b58ca
#
# 
# 
# patch "packages/gpephone/gpe-session-scripts-phone/phonesession"
#  from [4eaaedce5e3bb2058cddbe9b64cd12f1149ec3f1]
#    to [e0f4897cf03774795773888e2931554df0824118]
# 
# patch "packages/gpephone/gpe-session-scripts-phone_0.67.bb"
#  from [2f4b948c60bf6f34259951b866ad2c3ae4c3c28e]
#    to [ea1d40745d9fe6c81ff23a05247b1fc791189eac]
# 
============================================================
--- packages/gpephone/gpe-session-scripts-phone/phonesession	4eaaedce5e3bb2058cddbe9b64cd12f1149ec3f1
+++ packages/gpephone/gpe-session-scripts-phone/phonesession	e0f4897cf03774795773888e2931554df0824118
@@ -31,7 +31,12 @@ export	CAL_RES_PATH=$APP_PATH/share/res
 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 @@ matchbox-window-manager -use_titlebar no
 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
============================================================
--- packages/gpephone/gpe-session-scripts-phone_0.67.bb	2f4b948c60bf6f34259951b866ad2c3ae4c3c28e
+++ packages/gpephone/gpe-session-scripts-phone_0.67.bb	ea1d40745d9fe6c81ff23a05247b1fc791189eac
@@ -14,7 +14,7 @@ SRC_URI = "${GPE_MIRROR}/gpe-session-scr
 	   file://disable-composite.xsettings \
            file://standard-apps.patch;patch=1"
 
-PR = "r6"
+PR = "r7"
 
 S = "${WORKDIR}/gpe-session-scripts-${PV}"