slitaz-configs rev 162

Dont start apps from openbox autostart, we may want a clean openbox session, lxde session will use XDG autostart files in /etc/xdg/autostart
author Christophe Lincoln <pankso@slitaz.org>
date Fri Apr 20 17:00:57 2012 +0200 (2012-04-20)
parents e36c810bdea1
children 4b0eaa4704b6
files rootfs/etc/skel/.cache/README rootfs/etc/skel/.config/README rootfs/etc/skel/.config/parcellite/parcelliterc rootfs/etc/skel/.config/pcmanfm/main rootfs/etc/skel/.isomaster rootfs/etc/skel/.mhwaveedit/config rootfs/etc/skel/.xinitrc rootfs/etc/xdg/openbox/autostart.sh
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/rootfs/etc/skel/.cache/README	Fri Apr 20 17:00:57 2012 +0200
     1.3 @@ -0,0 +1,4 @@
     1.4 +
     1.5 +User cache directory
     1.6 +
     1.7 +XDG variable: XDG_CACHE_HOME
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/rootfs/etc/skel/.config/README	Fri Apr 20 17:00:57 2012 +0200
     2.3 @@ -0,0 +1,4 @@
     2.4 +
     2.5 +Peer user and application configuration file
     2.6 +
     2.7 +XDG variable: XDG_CONFIG_HOME
     3.1 --- a/rootfs/etc/skel/.config/parcellite/parcelliterc	Fri Apr 20 16:24:42 2012 +0200
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,10 +0,0 @@
     3.4 -
     3.5 -[rc]
     3.6 -history_limit=25
     3.7 -character_length=50
     3.8 -ellipsize=2
     3.9 -history_key=F11
    3.10 -actions_key=F12
    3.11 -save_history=true
    3.12 -single_line_mode=true
    3.13 -hyperlinks_mode=false
     4.1 --- a/rootfs/etc/skel/.config/pcmanfm/main	Fri Apr 20 16:24:42 2012 +0200
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,15 +0,0 @@
     4.4 -[General]
     4.5 -big_icon_size=32
     4.6 -terminal=xterm
     4.7 -
     4.8 -[Window]
     4.9 -width=640
    4.10 -height=480
    4.11 -splitter_pos=160
    4.12 -maximized=0
    4.13 -
    4.14 -[Desktop]
    4.15 -show_desktop=1
    4.16 -show_wallpaper=1
    4.17 -wallpaper=/usr/share/images/slitaz-background.jpg
    4.18 -show_wm_menu=1
     5.1 --- a/rootfs/etc/skel/.isomaster	Fri Apr 20 16:24:42 2012 +0200
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,18 +0,0 @@
     5.4 -
     5.5 -[ui]
     5.6 -windowwidth                    = 632
     5.7 -windowheight                   = 550
     5.8 -toppaneheight                  = 200
     5.9 -showhiddenfilesfs              = 0
    5.10 -sortdirsfirst                  = 1
    5.11 -scanforduplicatefiles          = 1
    5.12 -followsymlinks                 = 0
    5.13 -appendextension                = 1
    5.14 -editor                         = leafpad
    5.15 -viewer                         = firefox
    5.16 -tempdir                        = /tmp
    5.17 -isosortcolumnid                = 1
    5.18 -isosortdirection               = 0
    5.19 -fssortcolumnid                 = 1
    5.20 -fssortdirection                = 0
    5.21 -
     6.1 --- a/rootfs/etc/skel/.mhwaveedit/config	Fri Apr 20 16:24:42 2012 +0200
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,38 +0,0 @@
     6.4 -# mhWaveEdit configuration file.
     6.5 -# Automatically generated by mhWaveEdit 1.4.14
     6.6 -# May be hand edited but extra comments will be removed when the 
     6.7 -# settings are saved.
     6.8 -# Remove this file to restore default settings.
     6.9 -
    6.10 -diskEditingThreshold = 131072
    6.11 -speedSmooth = true
    6.12 -speedConv = 0
    6.13 -viewQuality = 128
    6.14 -showVerticalZoom = true
    6.15 -soundLock = false
    6.16 -centerCursor = true
    6.17 -tempfilesFP = true
    6.18 -ditherEditing = 1
    6.19 -outputByteswap = false
    6.20 -tempDir1 = /home/hacker/.mhwaveedit
    6.21 -playerFallback_SampleSize = 2
    6.22 -varispeed = true
    6.23 -varispeedConv = 0
    6.24 -ditherPlayback = 0
    6.25 -useGeometry = false
    6.26 -drawImprove = true
    6.27 -autoPlayMark = false
    6.28 -showSpeed = true
    6.29 -mainwinFront = true
    6.30 -recentFiles = 4
    6.31 -playerFallback_Signed = true
    6.32 -speedReset = false
    6.33 -windowGeometry = 168_168_540_230
    6.34 -mixerUtility = xterm -e alsamixer
    6.35 -soundDriver = auto
    6.36 -soundBufferSize = 65536
    6.37 -timeDisplay = 0
    6.38 -rollCursor = false
    6.39 -showTimeScale = true
    6.40 -showHorizontalZoom = true
    6.41 -playerFallback_BigEndian = false
     7.1 --- a/rootfs/etc/skel/.xinitrc	Fri Apr 20 16:24:42 2012 +0200
     7.2 +++ b/rootfs/etc/skel/.xinitrc	Fri Apr 20 17:00:57 2012 +0200
     7.3 @@ -1,29 +1,20 @@
     7.4 -# ~/.xinitrc: Executed by slim login manager to startx X session.
     7.5 +# ~/.xinitrc: Executed by Slim/LXDM login manager to startx X session.
     7.6  # You can use F1 with Slim to change your window manager or configure
     7.7  # it permanently with your personal applications.conf file.
     7.8  #
     7.9  . $HOME/.config/slitaz/applications.conf
    7.10  
    7.11  case $1 in
    7.12 -	e17|enlightenment*)
    7.13 +	openbox|lxde*|xfce4|compiz|karmen|dwm) 
    7.14 +		exec ${1%-session}-session ;;
    7.15 +	razor*) 
    7.16 +		exec razor-session ;;
    7.17 +	enlightenment)
    7.18  		exec enlightenment_start ;;
    7.19 -	openbox|openbox-session|ob)
    7.20 -		exec openbox-session ;;
    7.21 -	dwm|dwm-session)
    7.22 -		exec dwm-session ;;
    7.23 -	fluxbox|startfluxbox)
    7.24 -		exec startfluxbox ;;
    7.25 -	awesome)
    7.26 -		exec awesome ;;
    7.27 -	pekwm)
    7.28 -		exec pekwm ;;
    7.29 -	karmen|karmen-session)
    7.30 -		exec karmen-session ;;
    7.31 -	jwm)
    7.32 -		lxpanel &
    7.33 -		exec jwm ;;
    7.34 -	xfce|xfce4|xfce4-session)
    7.35 -		xfce4-session ;;
    7.36 -	*)
    7.37 +	fluxbox)
    7.38 +		exec start${1} ;;
    7.39 +	jwm|awesome|pekwm) 
    7.40 +		exec $1 ;;
    7.41 +	*) 
    7.42  		exec $WINDOW_MANAGER ;;
    7.43  esac
     8.1 --- a/rootfs/etc/xdg/openbox/autostart.sh	Fri Apr 20 16:24:42 2012 +0200
     8.2 +++ b/rootfs/etc/xdg/openbox/autostart.sh	Fri Apr 20 17:00:57 2012 +0200
     8.3 @@ -1,20 +1,24 @@
     8.4  # This shell script is run before Openbox launches.
     8.5  # Environment variables set here are passed to the Openbox session.
     8.6  
     8.7 -# DBUS message bus (automount removable devices).
     8.8 -dbus-launch --exit-with-session &
     8.9 +# Export XDG standard directories
    8.10 +export XDG_CONFIG_HOME="$HOME/.config"
    8.11 +export XDG_CACHE_HOME="$HOME/.cache"
    8.12 +export XDG_CURRENT_DESKTOP=openbox
    8.13  
    8.14 -# Handle Hal events with Ivman (notification with desktopbox).
    8.15 -#ivman &
    8.16 +# Start DBUS session.
    8.17 +if [ ! "$DBUS_SESSION_BUS_ADDRESS" ]; then
    8.18 +	dbus-launch --sh-syntax --exit-with-session &
    8.19 +fi
    8.20  
    8.21  # Start PCmanFM as daemon for Wallpaper and desktop icons.
    8.22 -pcmanfm -d &
    8.23 +#pcmanfm -d &
    8.24  
    8.25  # Start the Freedesktop panel standard menu.
    8.26 -lxpanel --profile slitaz &
    8.27 +#lxpanel --profile slitaz &
    8.28  
    8.29  # Packages update notification.
    8.30 -tazpkg-notify &
    8.31 +#tazpkg-notify &
    8.32  
    8.33  # Start Parcellite clipboard manager.
    8.34  #parcellite &