From 955d26d465ccb3637adf776afe7b7299e32bd11d Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan@datenfreihafen.org>
Date: Wed, 5 Sep 2007 12:28:05 +0000
Subject: openmoko-session2: Use the new matchbox-keyboard applet.

---
 packages/openmoko2/openmoko-session2.bb                   | 2 +-
 packages/openmoko2/openmoko-session2/etc/matchbox/session | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'packages/openmoko2')

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
-- 
cgit v1.2.3