# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1334934057 -7200
# Node ID 6adfdfd5b70302bc37b6afc230664e51d46f0eba
# Parent  e36c810bdea152dcfec42269d726560a559d0213
Dont start apps from openbox autostart, we may want a clean openbox session, lxde session will use XDG autostart files in /etc/xdg/autostart

diff -r e36c810bdea1 -r 6adfdfd5b703 rootfs/etc/skel/.cache/README
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rootfs/etc/skel/.cache/README	Fri Apr 20 17:00:57 2012 +0200
@@ -0,0 +1,4 @@
+
+User cache directory
+
+XDG variable: XDG_CACHE_HOME
diff -r e36c810bdea1 -r 6adfdfd5b703 rootfs/etc/skel/.config/README
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rootfs/etc/skel/.config/README	Fri Apr 20 17:00:57 2012 +0200
@@ -0,0 +1,4 @@
+
+Peer user and application configuration file
+
+XDG variable: XDG_CONFIG_HOME
diff -r e36c810bdea1 -r 6adfdfd5b703 rootfs/etc/skel/.config/parcellite/parcelliterc
--- a/rootfs/etc/skel/.config/parcellite/parcelliterc	Fri Apr 20 16:24:42 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-
-[rc]
-history_limit=25
-character_length=50
-ellipsize=2
-history_key=F11
-actions_key=F12
-save_history=true
-single_line_mode=true
-hyperlinks_mode=false
diff -r e36c810bdea1 -r 6adfdfd5b703 rootfs/etc/skel/.config/pcmanfm/main
--- a/rootfs/etc/skel/.config/pcmanfm/main	Fri Apr 20 16:24:42 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-[General]
-big_icon_size=32
-terminal=xterm
-
-[Window]
-width=640
-height=480
-splitter_pos=160
-maximized=0
-
-[Desktop]
-show_desktop=1
-show_wallpaper=1
-wallpaper=/usr/share/images/slitaz-background.jpg
-show_wm_menu=1
diff -r e36c810bdea1 -r 6adfdfd5b703 rootfs/etc/skel/.isomaster
--- a/rootfs/etc/skel/.isomaster	Fri Apr 20 16:24:42 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-
-[ui]
-windowwidth                    = 632
-windowheight                   = 550
-toppaneheight                  = 200
-showhiddenfilesfs              = 0
-sortdirsfirst                  = 1
-scanforduplicatefiles          = 1
-followsymlinks                 = 0
-appendextension                = 1
-editor                         = leafpad
-viewer                         = firefox
-tempdir                        = /tmp
-isosortcolumnid                = 1
-isosortdirection               = 0
-fssortcolumnid                 = 1
-fssortdirection                = 0
-
diff -r e36c810bdea1 -r 6adfdfd5b703 rootfs/etc/skel/.mhwaveedit/config
--- a/rootfs/etc/skel/.mhwaveedit/config	Fri Apr 20 16:24:42 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-# mhWaveEdit configuration file.
-# Automatically generated by mhWaveEdit 1.4.14
-# May be hand edited but extra comments will be removed when the 
-# settings are saved.
-# Remove this file to restore default settings.
-
-diskEditingThreshold = 131072
-speedSmooth = true
-speedConv = 0
-viewQuality = 128
-showVerticalZoom = true
-soundLock = false
-centerCursor = true
-tempfilesFP = true
-ditherEditing = 1
-outputByteswap = false
-tempDir1 = /home/hacker/.mhwaveedit
-playerFallback_SampleSize = 2
-varispeed = true
-varispeedConv = 0
-ditherPlayback = 0
-useGeometry = false
-drawImprove = true
-autoPlayMark = false
-showSpeed = true
-mainwinFront = true
-recentFiles = 4
-playerFallback_Signed = true
-speedReset = false
-windowGeometry = 168_168_540_230
-mixerUtility = xterm -e alsamixer
-soundDriver = auto
-soundBufferSize = 65536
-timeDisplay = 0
-rollCursor = false
-showTimeScale = true
-showHorizontalZoom = true
-playerFallback_BigEndian = false
diff -r e36c810bdea1 -r 6adfdfd5b703 rootfs/etc/skel/.xinitrc
--- a/rootfs/etc/skel/.xinitrc	Fri Apr 20 16:24:42 2012 +0200
+++ b/rootfs/etc/skel/.xinitrc	Fri Apr 20 17:00:57 2012 +0200
@@ -1,29 +1,20 @@
-# ~/.xinitrc: Executed by slim login manager to startx X session.
+# ~/.xinitrc: Executed by Slim/LXDM login manager to startx X session.
 # You can use F1 with Slim to change your window manager or configure
 # it permanently with your personal applications.conf file.
 #
 . $HOME/.config/slitaz/applications.conf
 
 case $1 in
-	e17|enlightenment*)
+	openbox|lxde*|xfce4|compiz|karmen|dwm) 
+		exec ${1%-session}-session ;;
+	razor*) 
+		exec razor-session ;;
+	enlightenment)
 		exec enlightenment_start ;;
-	openbox|openbox-session|ob)
-		exec openbox-session ;;
-	dwm|dwm-session)
-		exec dwm-session ;;
-	fluxbox|startfluxbox)
-		exec startfluxbox ;;
-	awesome)
-		exec awesome ;;
-	pekwm)
-		exec pekwm ;;
-	karmen|karmen-session)
-		exec karmen-session ;;
-	jwm)
-		lxpanel &
-		exec jwm ;;
-	xfce|xfce4|xfce4-session)
-		xfce4-session ;;
-	*)
+	fluxbox)
+		exec start${1} ;;
+	jwm|awesome|pekwm) 
+		exec $1 ;;
+	*) 
 		exec $WINDOW_MANAGER ;;
 esac
diff -r e36c810bdea1 -r 6adfdfd5b703 rootfs/etc/xdg/openbox/autostart.sh
--- a/rootfs/etc/xdg/openbox/autostart.sh	Fri Apr 20 16:24:42 2012 +0200
+++ b/rootfs/etc/xdg/openbox/autostart.sh	Fri Apr 20 17:00:57 2012 +0200
@@ -1,20 +1,24 @@
 # This shell script is run before Openbox launches.
 # Environment variables set here are passed to the Openbox session.
 
-# DBUS message bus (automount removable devices).
-dbus-launch --exit-with-session &
+# Export XDG standard directories
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_CURRENT_DESKTOP=openbox
 
-# Handle Hal events with Ivman (notification with desktopbox).
-#ivman &
+# Start DBUS session.
+if [ ! "$DBUS_SESSION_BUS_ADDRESS" ]; then
+	dbus-launch --sh-syntax --exit-with-session &
+fi
 
 # Start PCmanFM as daemon for Wallpaper and desktop icons.
-pcmanfm -d &
+#pcmanfm -d &
 
 # Start the Freedesktop panel standard menu.
-lxpanel --profile slitaz &
+#lxpanel --profile slitaz &
 
 # Packages update notification.
-tazpkg-notify &
+#tazpkg-notify &
 
 # Start Parcellite clipboard manager.
 #parcellite &