summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-03-23 11:19:55 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-03-23 11:19:55 +0000
commitd71608dcdee07a3e87b640fdc5b1346f733d5379 (patch)
treeae2407db2b307b18f342b5d2da15fec4b9258af5
parent2bf05f47299bbd092ec27a7782d0ac883db41bdf (diff)
parent2dfd6528b6eb84aa9fee8656d6469c840bcbe35f (diff)
merge of '27da4e71e0cfec0f89680d407ee1de218f47d599'
and 'baa52bc73475b541acb6e71c042079c52be8330c'
-rw-r--r--packages/openmoko-base/files/session2
-rw-r--r--packages/openmoko-base/openmoko-session_svn.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/openmoko-base/files/session b/packages/openmoko-base/files/session
index 1fc2f4d17a..6f4fe6356e 100644
--- a/packages/openmoko-base/files/session
+++ b/packages/openmoko-base/files/session
@@ -8,7 +8,7 @@ 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,openmoko-panel-gsm &
+matchbox-panel --start-applets=openmoko-mainmenu,showdesktop,systray,windowselector --end-applets=openmoko-panel-demo-simple,openmoko-panel-battery,openmoko-panel-clock,openmoko-panel-gsm &
#start some old-style panel plugins to get a keyboard and battery status
mbinputmgr &
diff --git a/packages/openmoko-base/openmoko-session_svn.bb b/packages/openmoko-base/openmoko-session_svn.bb
index c085606a7d..c352cb7d91 100644
--- 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 = "r7"
+PR = "r8"
inherit openmoko-base