5 files changed, 10 insertions, 86 deletions
diff --git a/packages/opie-taskbar/opie-taskbar.inc b/packages/opie-taskbar/opie-taskbar.inc
index edc2c7a479..4c357f54b6 100644
--- a/packages/opie-taskbar/opie-taskbar.inc
+++ b/packages/opie-taskbar/opie-taskbar.inc
@@ -23,7 +23,9 @@ PIXMAP_SIZE_spitz	= "-640x480"
 PIXMAP_SIZE_akita	= "-640x480"
 PIXMAP_SIZE_tosa 	= "-480x640"
 PIXMAP_SIZE_simpad 	= "-800x600"
+PIXMAP_SIZE_asus730     = "-480x640"
 PIXMAP_SIZE_htcuniversal= "-480x640"
+PIXMAP_SIZE_hx4700      = "-480x640"
 
 inherit opie update-rc.d
 
diff --git a/packages/opie-taskbar/opie-taskbar/htcuniversal/opie b/packages/opie-taskbar/opie-taskbar/htcuniversal/opie
deleted file mode 100644
index ac8cf18df4..0000000000
--- a/packages/opie-taskbar/opie-taskbar/htcuniversal/opie
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/sh
-#
-[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
-[ -z $HOME ] && export HOME=/home/$LOGNAME
-
-export QTDIR=/opt/QtPalmtop
-export OPIEDIR=/opt/QtPalmtop
-export QPEDIR=/opt/QtPalmtop
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
-export PATH=$PATH:$OPIEDIR/bin
-export QWS_MOUSE_PROTO=TPanel:`detect-stylus --device`
-export QWS_KEYBOARD=USB:/dev/input/event1
-
-if [ ! -x "$OPIEDIR/bin/qpe" ] ; then 
-    echo Opie not installed
-    exit 0 
-fi
-
-. /etc/profile
-
-for conf in $OPIEDIR/etc/skel/*.conf; do
-	conf_basename=`basename $conf`
-	if [ ! -e "$HOME/Settings/$conf_basename" ] ; then
-		echo "Copying default $conf_basename into $HOME/Settings/"
-		mkdir -p $HOME/Settings/
-		cat $conf >$HOME/Settings/$conf_basename
-	fi
-done
-
-if [ ! -e "$HOME/systeminfo/linkver" ] ; then
-    mkdir -p $HOME/systeminfo/
-    echo "1.13" >$HOME/systeminfo/linkver
-fi
-
-if [ ! -e "/opt/Qtopia" ] ; then
-    ln -sf /opt/QtPalmtop /opt/Qtopia
-fi
-
-case $1 in
-'start')
-    #/sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0
-    
-    if [ -x "$OPIEDIR/bin/opie-login" ]; then
-            echo Starting Opie-login....
-            $OPIEDIR/bin/opie-login -terminal 2
-    else
-        $OPIEDIR/bin/opie-reorgfiles
-        if [ -x /usr/bin/ssh-agent ]; then
-             SSHAGENT=/usr/bin/ssh-agent
-        else
-             SSHAGENT=""
-        fi
-        
-        if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then
-            export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
-        fi           
-        echo Starting Opie....
-        $SSHAGENT $OPIEDIR/bin/qpe -terminal 2
-    fi
-
-    ;;
-
-'stop')
-    echo "Stopping Opie..."
-    killall qpe 2>/dev/null
-    killall opie-login 2>/dev/null
-    killall quicklauncher 2>/dev/null
-
-    ;;
-
-'restart')
-	$0 stop && $0 start
-
-	;;
-
-*)
-    echo "usage: $0 { start | stop | restart }"
-
-    ;;
-
-esac
-
diff --git a/packages/opie-taskbar/opie-taskbar/opie b/packages/opie-taskbar/opie-taskbar/opie
index 3320dbe7c5..b2677ddc0d 100755
--- a/packages/opie-taskbar/opie-taskbar/opie
+++ b/packages/opie-taskbar/opie-taskbar/opie
@@ -16,6 +16,10 @@ fi
 
 . /etc/profile
 
+if [ ! -e $TSLIB_TSDEVICE ]; then
+    export QWS_MOUSE_PROTO=MouseMan:/dev/input/mice
+fi
+
 for conf in $OPIEDIR/etc/skel/*.conf; do
 	conf_basename=`basename $conf`
 	if [ ! -e "$HOME/Settings/$conf_basename" ] ; then
@@ -40,7 +44,7 @@ case $1 in
     
     if [ -x "$OPIEDIR/bin/opie-login" ]; then
             echo Starting Opie-login....
-            $OPIEDIR/bin/opie-login -terminal 2
+            $OPIEDIR/bin/opie-login -terminal 3
     else
         $OPIEDIR/bin/opie-reorgfiles
         if [ -x /usr/bin/ssh-agent ]; then
@@ -53,7 +57,7 @@ case $1 in
             export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
         fi           
         echo Starting Opie....
-        $SSHAGENT $OPIEDIR/bin/qpe -terminal 2
+        $SSHAGENT $OPIEDIR/bin/qpe -terminal 3
     fi
 
     ;;
diff --git a/packages/opie-taskbar/opie-taskbar_1.2.2.bb b/packages/opie-taskbar/opie-taskbar_1.2.2.bb
index 9b1cd8c461..384fbd0ec8 100644
--- a/packages/opie-taskbar/opie-taskbar_1.2.2.bb
+++ b/packages/opie-taskbar/opie-taskbar_1.2.2.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
-PR = "r1"
+PR = "r4"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index 799d8a1d30..38172af970 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r1"
+PR = "r4"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \
            ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \