[Scummvm-cvs-logs] SF.net SVN: scummvm:[48389] scummvm/branches/branch-1-1-0/dists/maemo

[fanoush at users.sourceforge.net]

Revision: 48389
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48389&view=rev
Author:   fanoush
Date:     2010-03-24 20:11:03 +0000 (Wed, 24 Mar 2010)

Log Message:
-----------
desktop and service items for launching

Modified Paths:
--------------
    scummvm/branches/branch-1-1-0/dists/maemo/scummvm.wrapper

Added Paths:
-----------
    scummvm/branches/branch-1-1-0/dists/maemo/scummvm.service
    scummvm/branches/branch-1-1-0/dists/maemo/scummvm.servicedesktop
    scummvm/branches/branch-1-1-0/dists/maemo/scummvm.servicewrapper

Copied: scummvm/branches/branch-1-1-0/dists/maemo/scummvm.service (from rev 48386, scummvm/trunk/dists/maemo/scummvm.service)
===================================================================
--- scummvm/branches/branch-1-1-0/dists/maemo/scummvm.service	                        (rev 0)
+++ scummvm/branches/branch-1-1-0/dists/maemo/scummvm.service	2010-03-24 20:11:03 UTC (rev 48389)
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=com.nokia.scummvm
+Exec=/usr/games/scummvm

Copied: scummvm/branches/branch-1-1-0/dists/maemo/scummvm.servicedesktop (from rev 48386, scummvm/trunk/dists/maemo/scummvm.servicedesktop)
===================================================================
--- scummvm/branches/branch-1-1-0/dists/maemo/scummvm.servicedesktop	                        (rev 0)
+++ scummvm/branches/branch-1-1-0/dists/maemo/scummvm.servicedesktop	2010-03-24 20:11:03 UTC (rev 48389)
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Name=ScummVM
+Exec=/usr/games/scummvm
+Icon=scummvm
+X-Icon-path=/usr/share/icons
+X-Window-Icon=scummvm
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable
+X-Osso-Service=scummvm
+StartupWMClass=scummvm

Copied: scummvm/branches/branch-1-1-0/dists/maemo/scummvm.servicewrapper (from rev 48386, scummvm/trunk/dists/maemo/scummvm.servicewrapper)
===================================================================
--- scummvm/branches/branch-1-1-0/dists/maemo/scummvm.servicewrapper	                        (rev 0)
+++ scummvm/branches/branch-1-1-0/dists/maemo/scummvm.servicewrapper	2010-03-24 20:11:03 UTC (rev 48389)
@@ -0,0 +1,12 @@
+#!/bin/sh
+# wrapper for proper WM_CLASS name in SDL apps (needed for icon in taskbar)
+#BASEDIR=`dirname $0`
+BASENAME=`basename $0`
+export SDL_VIDEO_X11_WMCLASS=${BASENAME}
+export SCUMMVM_MAEMO_DEVICE=$(awk '/^product/ { print $2;}' /proc/component_version)
+# no exec, we are really not a d-bus service
+# we need to run scummvm with diferent pid so hildon-desktop will kill the wrapper, not scummvm
+[ -x ${0}.bin ] && ${0}.bin "$@"
+# optified binary
+[ -x /opt/scummvm/bin/scummvm ] && /opt/scummvm/bin/scummvm "$@"
+

Modified: scummvm/branches/branch-1-1-0/dists/maemo/scummvm.wrapper
===================================================================
--- scummvm/branches/branch-1-1-0/dists/maemo/scummvm.wrapper	2010-03-24 20:06:05 UTC (rev 48388)
+++ scummvm/branches/branch-1-1-0/dists/maemo/scummvm.wrapper	2010-03-24 20:11:03 UTC (rev 48389)
@@ -4,4 +4,6 @@
 BASENAME=`basename $0`
 export SDL_VIDEO_X11_WMCLASS=${BASENAME}
 export SCUMMVM_MAEMO_DEVICE=$(awk '/^product/ { print $2;}' /proc/component_version)
-exec ${0}.bin "$@"
+[ -x ${0}.bin ] && exec ${0}.bin "$@"
+# optified binary
+[ -x /opt/scummvm/bin/scummvm ] && exec /opt/scummvm/bin/scummvm "$@"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.