diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-08-09 19:03:40 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-08-09 19:03:40 +0000 |
| commit | 049708b56d43ea28a890e2d868e980c90be1c356 (patch) | |
| tree | 5a08f32a4aaaa26ecce0d0a676ecd5b1fea58429 | |
| parent | 69289b150974e7551aeb9bbf6ed7ef9d27fd329d (diff) | |
| parent | d0a1e35dc5286ae64477f12c1b3e15a82960d48f (diff) | |
merge of '08f4abe0b59e692c9044f0c59f6e046959c301f2'
and '4ed4d79390a6068104e811416de62ad3af9b3949'
| -rw-r--r-- | packages/openmoko2/openmoko-session2.bb | 4 | ||||
| -rwxr-xr-x | packages/openmoko2/openmoko-session2/etc/matchbox/session | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index 0a3ac2d24b..21c2e9f6e3 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -3,7 +3,7 @@ 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${sysconfdir}/gconf/gconf.xml.defaults --dire 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 + } diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session index 5f71151215..0f8c67d7c4 100755 --- a/packages/openmoko2/openmoko-session2/etc/matchbox/session +++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session @@ -7,5 +7,7 @@ openmoko-dialer & matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ & -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 +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 |