summaryrefslogtreecommitdiffstats
path: root/meta-openmoko/packages/openmoko2/openmoko-session2
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-05-23 14:10:08 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-05-23 14:10:08 +0000
commit56bd25c1cac0d0b433c3b2b5b4e075319b4aa324 (patch)
tree9ce3944acd48cd1bca09e0e422d71d6ef8e63c6e /meta-openmoko/packages/openmoko2/openmoko-session2
parentfb8af86c44daed3714b0ee1c611c74a736b0823d (diff)
downloadpoky-56bd25c1cac0d0b433c3b2b5b4e075319b4aa324.tar.gz
openmoko: merge with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4552 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta-openmoko/packages/openmoko2/openmoko-session2')
-rwxr-xr-xmeta-openmoko/packages/openmoko2/openmoko-session2/etc/matchbox/session9
-rwxr-xr-x[-rw-r--r--]meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session0
2 files changed, 5 insertions, 4 deletions
diff --git a/meta-openmoko/packages/openmoko2/openmoko-session2/etc/matchbox/session b/meta-openmoko/packages/openmoko2/openmoko-session2/etc/matchbox/session
index 787d9c72ba..732cce9d3f 100755
--- a/meta-openmoko/packages/openmoko2/openmoko-session2/etc/matchbox/session
+++ b/meta-openmoko/packages/openmoko2/openmoko-session2/etc/matchbox/session
@@ -1,11 +1,12 @@
1#!/bin/sh 1#!/bin/sh
2
3SHOWCURSOR="no" 2SHOWCURSOR="no"
4 3
5openmoko-today & 4openmoko-today &
6openmoko-dialer & 5phone-kit &
7 6
8matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ & 7matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme Moko -use_cursor $SHOWCURSOR $@ &
9 8
10exec matchbox-panel --start-applets showdesktop --end-applets clock,battery,systray,startup --titlebar 9matchbox-panel-2 --start-applets systray,startup \
10 --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-memory,openmoko-panel-wifi --titlebar &
11 11
12exec neod
diff --git a/meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session b/meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session
index 65f1ce72ca..65f1ce72ca 100644..100755
--- a/meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session
+++ b/meta-openmoko/packages/openmoko2/openmoko-session2/matchbox-session