[oe-commits] org.oe.dev openmoko-session2: Use the new matchbox-keyboard applet.

[stefan commit]

openmoko-session2: Use the new matchbox-keyboard applet.

Author: stefan at openembedded.org
Branch: org.openembedded.dev
Revision: 7181fd7d242ef9d29a89f2d8fa4b4ab5d42801ba
ViewMTN: http://monotone.openembedded.org/revision.psp?id=7181fd7d242ef9d29a89f2d8fa4b4ab5d42801ba
Files:
1
packages/openmoko2/openmoko-session2/etc/matchbox/session
packages/openmoko2/openmoko-session2.bb
Diffs:

#
# mt diff -r4b363cb18c01238a6c87351b9d53e13e5b863adb -r7181fd7d242ef9d29a89f2d8fa4b4ab5d42801ba
#
# 
# 
# patch "packages/openmoko2/openmoko-session2/etc/matchbox/session"
#  from [4fea9c06a9f900ec7a8eaf57e3cf98052d0e8cc4]
#    to [d755c69ff62f959cd61f30c99b68d783420b3606]
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [6796cbe5628c54112219053af7446c291d38a29b]
#    to [cf10662aea8138defdb07d131192ae1de18ec644]
# 
============================================================
--- packages/openmoko2/openmoko-session2/etc/matchbox/session	4fea9c06a9f900ec7a8eaf57e3cf98052d0e8cc4
+++ packages/openmoko2/openmoko-session2/etc/matchbox/session	d755c69ff62f959cd61f30c99b68d783420b3606
@@ -8,7 +8,7 @@ matchbox-window-manager -use_titlebar ye
 
 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
============================================================
--- packages/openmoko2/openmoko-session2.bb	6796cbe5628c54112219053af7446c291d38a29b
+++ packages/openmoko2/openmoko-session2.bb	cf10662aea8138defdb07d131192ae1de18ec644
@@ -1,10 +1,10 @@ RCONFLICTS = "openmoko-session"
 DESCRIPTION = "Custom MB session files for OpenMoko"
 LICENSE = "GPL"
 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}