summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-11-16 15:53:14 +0000
committerRoss Burton <ross@openedhand.com>2007-11-16 15:53:14 +0000
commitdd45ce7f888f6d05b15367275b5314860c263cdf (patch)
tree097a2d75503cbb068cab6bd5485d426b464e2ce9
parenta8484dbc6332f50b61d8407df3208cfa95efcef9 (diff)
downloadpoky-dd45ce7f888f6d05b15367275b5314860c263cdf.tar.gz
matchbox-sato: use formfactor to determine if we should show a cursor
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3190 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rwxr-xr-xmeta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session8
-rw-r--r--meta/packages/matchbox-sato/matchbox-sato_0.1.bb4
2 files changed, 9 insertions, 3 deletions
diff --git a/meta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session b/meta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session
index 8d095f3cd4..8a2bdd013a 100755
--- a/meta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session
+++ b/meta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session
@@ -1,6 +1,12 @@
1#!/bin/sh 1#!/bin/sh
2 2
3SHOWCURSOR="no" 3. /etc/formfactor/config
4
5if [ "$HAVE_TOUCHSCREEN" = "1" ]; then
6 SHOWCURSOR="no"
7else
8 SHOWCURSOR="yes"
9fi
4 10
5matchbox-desktop & 11matchbox-desktop &
6 12
diff --git a/meta/packages/matchbox-sato/matchbox-sato_0.1.bb b/meta/packages/matchbox-sato/matchbox-sato_0.1.bb
index bf39d73571..78598ce63d 100644
--- a/meta/packages/matchbox-sato/matchbox-sato_0.1.bb
+++ b/meta/packages/matchbox-sato/matchbox-sato_0.1.bb
@@ -1,9 +1,9 @@
1DESCRIPTION = "Custom MB session files for poky" 1DESCRIPTION = "Custom MB session files for poky"
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "x11" 3SECTION = "x11"
4RDEPENDS = "gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato" 4RDEPENDS = "formfactor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato"
5RCONFLICTS = "matchbox-common" 5RCONFLICTS = "matchbox-common"
6PR = "r16" 6PR = "r17"
7 7
8SRC_URI = "file://etc file://matchbox-session" 8SRC_URI = "file://etc file://matchbox-session"
9S = ${WORKDIR} 9S = ${WORKDIR}