diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2007-09-05 12:43:38 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2007-09-05 12:43:38 +0000 |
| commit | ea8c70b53b4ce9fea288bc7c255cd16d29a1ac18 (patch) | |
| tree | 6e0b4ddeef2b71f8c1cd118f5eaeeab0ce5c25f6 /packages/openmoko2 | |
| parent | e55876c2ba87d64c803332a181643f875a93876e (diff) | |
| parent | 955d26d465ccb3637adf776afe7b7299e32bd11d (diff) | |
merge of '4d795eb920749e4b57552891946fac066af26b7d'
and '7181fd7d242ef9d29a89f2d8fa4b4ab5d42801ba'
Diffstat (limited to 'packages/openmoko2')
| -rw-r--r-- | packages/openmoko2/openmoko-session2.bb | 2 | ||||
| -rwxr-xr-x | packages/openmoko2/openmoko-session2/etc/matchbox/session | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index 31d38382df..de2d7cdff6 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -4,7 +4,7 @@ SECTION = "x11" RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2" RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2" RCONFLICTS = "openmoko-session" -PR = "r30" +PR = "r31" SRC_URI = "file://etc" S = ${WORKDIR} diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session index dee3e58051..9e1c0a2aad 100755 --- a/packages/openmoko2/openmoko-session2/etc/matchbox/session +++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session @@ -8,7 +8,7 @@ openmoko-dialer & matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ & -matchbox-panel-2 --start-applets systray,startup \ - --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock --titlebar & +matchbox-panel-2 --start-applets startup \ + --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock,keyboard --titlebar & exec neod |