openmoko-session: use openmoko-footer instead of second panel (thanks Mickey!), start...

diff --git a/packages/openmoko-base/files/session b/packages/openmoko-base/files/session
index 4b3d50d..41bb8a2 100644 (file)
--- a/packages/openmoko-base/files/session
+++ b/packages/openmoko-base/files/session
@@ -8,8 +8,11 @@ matchbox-desktop --icon-size 96 \
                  --titlefont sans-20:bold \
                  --bg img-tiled:/usr/share/themes/openmoko-standard/gtk-2.0/mokopanedwindow-upper-enclosing.png &
 #                 --bg col-gradient-vertical:#000000,#aaaaaa &
-matchbox-panel --start-applets=showdesktop,systray,windowselector --end-applets=openmoko-panel-demo-simple,openmoko-panel-battery,openmoko-panel-clock &&
-#can't figure out a way to start a panel-2 at the bottom...
-#matchbox-panel &
+matchbox-panel --start-applets=showdesktop,systray,windowselector --end-applets=openmoko-panel-demo-simple,openmoko-panel-battery,openmoko-panel-clock &
+
+#start some old-style panel plugins to get a keyboard and battery status
+mbinputmgr &
+
+openmoko-footer &
 exec matchbox-window-manager -use_titlebar no -use_cursor $SHOWCURSOR $@
 

diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb
index edb58b0..00e4ec6 100644 (file)
--- a/packages/openmoko-base/openmoko-session_svn.bb
+++ b/packages/openmoko-base/openmoko-session_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox session files for OpenMoko"
 SECTION = "openmoko/base"
 RDEPENDS = "matchbox gconf matchbox-applet-startup-monitor gtk-theme-clearlooks"
 PV = "0.0+svn${SRCDATE}"
-PR = "r4"
+PR = "r5"
 
 inherit openmoko-base