5 files changed, 32 insertions, 6 deletions
diff --git a/packages/gpephone/gpe-session-scripts-phone/phonesession b/packages/gpephone/gpe-session-scripts-phone/phonesession
index 6f6d9d59ae..2dacc4c4c9 100755
--- 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 00031ac546..730a549aef 100644
--- 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}"
 
diff --git a/packages/gpephone/machined_svn.bb b/packages/gpephone/machined_svn.bb
new file mode 100644
index 0000000000..549071fdb0
--- /dev/null
+++ b/packages/gpephone/machined_svn.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "Device abstraction and support daemon"
+SECTION = "gpephone"
+PRIORITY = "required"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0"
+PV = "0.1+svn-${SRCDATE}"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+inherit gpephone pkgconfig autotools
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/;module=${PN}"
+
+S = "${WORKDIR}/${PN}"
+
+#FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/helper/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pixmaps"
+
diff --git a/packages/gpephone/ptim-engine_svn.bb b/packages/gpephone/ptim-engine_svn.bb
index 286a1edf8d..a2a38a0e2e 100644
--- a/packages/gpephone/ptim-engine_svn.bb
+++ b/packages/gpephone/ptim-engine_svn.bb
@@ -4,13 +4,13 @@ PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers"
 PV = "0.1+svn-${SRCDATE}"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
 inherit gpephone pkgconfig autotools
 
-SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imengine \
-           file://gtkmodule-location.patch;patch=1;pnum=0"
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imengine"
 
 S = "${WORKDIR}/imengine"
 
diff --git a/packages/gpephone/ptim-helper_svn.bb b/packages/gpephone/ptim-helper_svn.bb
index 0d0ac653b5..4aa308ccbf 100644
--- a/packages/gpephone/ptim-helper_svn.bb
+++ b/packages/gpephone/ptim-helper_svn.bb
@@ -4,13 +4,13 @@ PRIORITY = "optional"
 LICENSE = "LiPS"
 DEPENDS = "gtk+ ptim-headers"
 PV = "0.1+svn-${SRCDATE}"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
 inherit gpephone pkgconfig autotools
 
-SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imhelper \
-           file://gtkmodule-location.patch;patch=1;pnum=0"
+SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imhelper"
 
 S = "${WORKDIR}/imhelper"