openmoko-session: sync a bit with openmoko svn

diff --git a/packages/openmoko-base/files/session b/packages/openmoko-base/files/session
index 1ac858f..91b38a0 100644 (file)
--- a/packages/openmoko-base/files/session
+++ b/packages/openmoko-base/files/session
@@ -2,18 +2,16 @@
 
 SHOWCURSOR="no"
 
-matchbox-desktop --icon-size 96 \
-                 --icon-padding 60 \
-                 --font sans-16 \
-                 --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-2 --start-applets=openmoko-panel-mainmenu,showdesktop,systray,windowselector --end-applets=openmoko-panel-battery,openmoko-panel-clock,openmoko-panel-gsm &
+matchbox-panel-2 \
+       --start-applets=openmoko-panel-mainmenu,systray \
+       --end-applets=openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock &
 
 #start some old-style panel plugins to get a keyboard and battery status
 mbinputmgr &
+mb-applet-startup-monitor &
 
 openmoko-footer &
+openmoko-today --desktop &
 openmoko-dialer &
 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 6daacb2..1878149 100644 (file)
--- a/packages/openmoko-base/openmoko-session_svn.bb
+++ b/packages/openmoko-base/openmoko-session_svn.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "Matchbox session files for OpenMoko"
 SECTION = "openmoko/base"
-RDEPENDS = "matchbox-panel-2 matchbox-wm  gconf matchbox-applet-startup-monitor gtk-theme-clearlooks"
+RDEPENDS = "matchbox-panel-2 matchbox-wm openmoko-today gconf matchbox-applet-startup-monitor gtk-theme-clearlooks"
 PV = "0.0+svn${SRCDATE}"
-PR = "r9"
+PR = "r11"
 
 inherit openmoko-base