[oe-commits] org.oe.dev merge of '08f4abe0b59e692c9044f0c59f6e046959c301f2'

[mickeyl commit]

merge of '08f4abe0b59e692c9044f0c59f6e046959c301f2'
     and '4ed4d79390a6068104e811416de62ad3af9b3949'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 9c8c9d1da282e7fa893b34c07ed5b5c73e0b1013
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9c8c9d1da282e7fa893b34c07ed5b5c73e0b1013
Files:
1
packages/openmoko2/openmoko-session2/etc/matchbox/session
packages/openmoko2/openmoko-session2.bb
packages/fluxbox/fluxbox_0.99+1.0rc.bb
Diffs:

#
# mt diff -r08f4abe0b59e692c9044f0c59f6e046959c301f2 -r9c8c9d1da282e7fa893b34c07ed5b5c73e0b1013
#
# 
# 
# patch "packages/openmoko2/openmoko-session2/etc/matchbox/session"
#  from [ed1a438b5a4f8b18384d223b866c8184e3ee15c8]
#    to [917f5caeabbd29912246a902cb4d3458f7febf57]
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [a2ff88b8fef6a076a6682858bd847bf0dc7ecb8f]
#    to [172c156032ce87fb7210144f8b5f5a05cd2ec05c]
# 
============================================================
--- packages/openmoko2/openmoko-session2/etc/matchbox/session	ed1a438b5a4f8b18384d223b866c8184e3ee15c8
+++ packages/openmoko2/openmoko-session2/etc/matchbox/session	917f5caeabbd29912246a902cb4d3458f7febf57
@@ -7,5 +7,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 &
+
+exec neod
-exec 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
============================================================
--- packages/openmoko2/openmoko-session2.bb	a2ff88b8fef6a076a6682858bd847bf0dc7ecb8f
+++ packages/openmoko2/openmoko-session2.bb	172c156032ce87fb7210144f8b5f5a05cd2ec05c
@@ -1,9 +1,9 @@ RCONFLICTS = "openmoko-session"
 DESCRIPTION = "Custom MB session files for poky"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
 RCONFLICTS = "openmoko-session"
-PR = "r24"
+PR = "r25"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}
@@ -25,4 +25,6 @@ gconftool-2 --config-source=xml::$D${sys
 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme openmoko-standard
 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 5"
 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/poky/peripherals/mouse/drag_threshold 8
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/openmoko/neod/power_management 2
+
 }


#
# mt diff -r4ed4d79390a6068104e811416de62ad3af9b3949 -r9c8c9d1da282e7fa893b34c07ed5b5c73e0b1013
#
# 
# 
# patch "packages/fluxbox/fluxbox_0.99+1.0rc.bb"
#  from [1cb1c0fa7894a09de7c0c9d3612653bea405ec61]
#    to [d176450b6c987ffa0fd0a593403eaa78b75a1a29]
# 
============================================================
--- packages/fluxbox/fluxbox_0.99+1.0rc.bb	1cb1c0fa7894a09de7c0c9d3612653bea405ec61
+++ packages/fluxbox/fluxbox_0.99+1.0rc.bb	d176450b6c987ffa0fd0a593403eaa78b75a1a29
@@ -57,7 +57,7 @@ FILES_${PN}-gpe = "${datadir}/fluxbox/ap
 FILES_${PN}-gpe = "${datadir}/fluxbox/apps.gpe* \
 		   ${datadir}/fluxbox/keys.* \
 		   ${bindir}/gpe-logout.fluxbox \
-		   ${sysconfdir}keylaunchrc.fluxbox \
+		   ${sysconfdir}/keylaunchrc.fluxbox \
 		   ${datadir}/fluxbox/styles/gpe-default \
 		   ${datadir}/fluxbox/session \
 		   ${bindir}/fluxbox-gpe-session"