summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-11-16 15:51:16 +0000
committerRoss Burton <ross@openedhand.com>2007-11-16 15:51:16 +0000
commit93845cb7781a2d68e0b0f42f4165efaadeb260f8 (patch)
treeb794a9d79e962795e36309722dd704d604032c89
parent05d1dc2c33d16abb69c6f017c1fd074515b6e54b (diff)
downloadpoky-93845cb7781a2d68e0b0f42f4165efaadeb260f8.tar.gz
Don't depend on the old startup monitor
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3188 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rwxr-xr-xmeta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session2
-rw-r--r--meta/packages/matchbox-sato/matchbox-sato_0.1.bb4
2 files changed, 2 insertions, 4 deletions
diff --git a/meta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session b/meta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session
index 2e8dac3af7..db3516fcab 100755
--- a/meta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session
+++ b/meta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session
@@ -5,8 +5,6 @@ SHOWCURSOR="no"
5## All this should be done by themeing/xsettings.. ## 5## All this should be done by themeing/xsettings.. ##
6matchbox-desktop & 6matchbox-desktop &
7 7
8# mb-applet-startup-monitor &
9
10matchbox-panel --titlebar --start-applets showdesktop,windowselector --end-applets clock,battery,systray,startup & 8matchbox-panel --titlebar --start-applets showdesktop,windowselector --end-applets clock,battery,systray,startup &
11 9
12exec matchbox-window-manager -theme Sato -use_desktop_mode decorated -use_cursor $SHOWCURSOR $@ 10exec matchbox-window-manager -theme Sato -use_desktop_mode decorated -use_cursor $SHOWCURSOR $@
diff --git a/meta/packages/matchbox-sato/matchbox-sato_0.1.bb b/meta/packages/matchbox-sato/matchbox-sato_0.1.bb
index df21310b20..bf39d73571 100644
--- a/meta/packages/matchbox-sato/matchbox-sato_0.1.bb
+++ b/meta/packages/matchbox-sato/matchbox-sato_0.1.bb
@@ -1,9 +1,9 @@
1DESCRIPTION = "Custom MB session files for poky" 1DESCRIPTION = "Custom MB session files for poky"
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "x11" 3SECTION = "x11"
4RDEPENDS = "matchbox-applet-startup-monitor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato" 4RDEPENDS = "gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2 matchbox-desktop-sato"
5RCONFLICTS = "matchbox-common" 5RCONFLICTS = "matchbox-common"
6PR = "r15" 6PR = "r16"
7 7
8SRC_URI = "file://etc file://matchbox-session" 8SRC_URI = "file://etc file://matchbox-session"
9S = ${WORKDIR} 9S = ${WORKDIR}