diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2010-12-20 20:54:54 -0600 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2010-12-20 20:54:54 -0600 |
| commit | 2c80188af4bfc6dfd814be3d24dd99bfa56a96f3 (patch) | |
| tree | fb43ae5c23431546d54b044cd7151ab145e5de1f /desktop/matchbox-window-manager/xinitrc.matchbox | |
| parent | 86abf5e435261720ad15bdf57c6fdea304416b40 (diff) | |
| download | slackbuilds-2c80188af4bfc6dfd814be3d24dd99bfa56a96f3.tar.gz | |
desktop/matchbox-window-manager: Poke consolekit in xinitrc
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'desktop/matchbox-window-manager/xinitrc.matchbox')
| -rw-r--r-- | desktop/matchbox-window-manager/xinitrc.matchbox | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/desktop/matchbox-window-manager/xinitrc.matchbox b/desktop/matchbox-window-manager/xinitrc.matchbox index 64c2ea46ed..be55eda85e 100644 --- a/desktop/matchbox-window-manager/xinitrc.matchbox +++ b/desktop/matchbox-window-manager/xinitrc.matchbox @@ -2,8 +2,8 @@ userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap -sysresources=/usr/lib/X11/xinit/.Xresources -sysmodmap=/usr/lib/X11/xinit/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap # Merge in defaults and keymaps [ -f $sysresources ] && /usr/bin/xrdb -merge $sysresources @@ -12,9 +12,14 @@ sysmodmap=/usr/lib/X11/xinit/.Xmodmap [ -f $usermodmap ] && /usr/bin/xmodmap $usermodmap # Start Matchbox -if [ -x /usr/bin/matchbox-session ]; then - matchbox-session +if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then + if [ -x /usr/bin/matchbox-session ]; then + ck-launch-session matchbox-session + else + matchbox-session + fi else xterm & matchbox-window-manager fi + |