openmoko-session: start some panel applets by default

diff --git a/packages/openmoko-base/files/session b/packages/openmoko-base/files/session
index 82b9bfe..4b3d50d 100644 (file)
--- a/packages/openmoko-base/files/session
+++ b/packages/openmoko-base/files/session
@@ -8,7 +8,8 @@ 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 &
-matchbox-panel -ns -nm --id 2 &
+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 &
 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 13cf7bf..edb58b0 100644 (file)
--- a/packages/openmoko-base/openmoko-session_svn.bb
+++ b/packages/openmoko-base/openmoko-session_svn.bb
@@ -2,21 +2,21 @@ 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 = "r3"
+PR = "r4"
 
 inherit openmoko-base
 
-SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE};module=etc;proto=https \
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE};module=etc;proto=http \
            file://session"
 S = "${WORKDIR}"
 
 do_install() {
-       cp -R ${S}/etc ${D}/etc
-       rm -fR ${D}/etc/.svn
-       rm -fR ${D}/etc/matchbox/.svn
-       chmod -R 755 ${D}/etc
+       cp -R ${S}/etc ${D}/${sysconfdir}
+       rm -fR ${D}/${sysconfdir}/.svn
+       rm -fR ${D}/${sysconfdir}/matchbox/.svn
+       chmod -R 755 ${D}/${sysconfdir}
         # DEMO only!
-       install -m 0755 ${WORKDIR}/session ${D}/etc/matchbox/session
+       install -m 0755 ${WORKDIR}/session ${D}/${sysconfdir}/matchbox/session
 }
 
 pkg_postinst_openmoko-session () {