--- alx-src/branches/alxconf-060/functions/config_sessions.sh	2011/06/16 16:21:11	2435
+++ alx-src/branches/alxconf-060/functions/config_sessions.sh	2011/06/27 12:47:25	2454
@@ -159,15 +159,7 @@
 	[[ -z ${name} ]] && return 1
 	[[ -z ${command} ]] && return 1
 
-	# which utility are we using idesk|xtdesk ?
-	if [ -x /usr/bin/idesk ]
-	then
-		utility="idesk"
-		[[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.idesktop/${name}.lnk"
-	else
-		utility="xtdesk"
-		[[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.xtdesktop/${name}.lnk"
-	fi
+	[[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.idesktop/${name}.lnk"
 
 	# use some defaults for icon, dest, {x,y}res
 	[[ -z ${xres} ]] && xres=30
@@ -183,7 +175,6 @@
 	clearconfig
 
 	addconfig 'table Icon'
-	[[ ${utility} = xtdesk ]] && addconfig '  Type: Program'
 	addconfig "  Caption: ${name}"
 	addconfig "  Command: ${command}"
 	addconfig "  Icon: ${icon}"
@@ -193,16 +184,8 @@
 	# add these only if not zero
 	if [[ ! -z ${iwidth} ]] && [[ ! -z ${iheight} ]]
 	then
-		if [[ ${utility} = xtdesk ]]
-		then
-			addconfig "  IconWidth: ${iwidth}"
-			addconfig "  IconHeight: ${iheight}"
-		fi
-		if [[ ${utility} = idesk ]]
-		then
-			addconfig "  Width: ${iwidth}"
-			addconfig "  Height: ${iheight}"
-		fi
+		addconfig "  Width: ${iwidth}"
+		addconfig "  Height: ${iheight}"
 	fi
 
 	addconfig 'end'
@@ -224,18 +207,8 @@
 	local dest
 	local rc
 
-	# which utility are we using idesk|xtdesk ?
-	if [ -x /usr/bin/idesk ]
-	then
-		utility="idesk"
-		dest="${ALX_UNPRIV_HOME}/.idesktop"
-		rc="${ALX_UNPRIV_HOME}/.ideskrc"
-	else
-		utility="xtdesk"
-		dest="${ALX_UNPRIV_HOME}/.xtdesktop"
-		rc="${ALX_UNPRIV_HOME}/.xtdeskrc"
-	fi
-
+	dest="${ALX_UNPRIV_HOME}/.idesktop"
+	rc="${ALX_UNPRIV_HOME}/.ideskrc"
 
 	# progsh path
 	progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
@@ -257,12 +230,6 @@
 	[ -f ${rc} ] && rm -f ${rc}
 	install -d ${dest}
 
-if [[ ${utility} = xtdesk ]]
-then
-	# basic config
-	cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdesktop/xtdeskrc
-fi
-
 	# default settings
 	declare -i x=30
 	declare -i y=30
@@ -403,11 +370,17 @@
 
 	# fluxbox autostart
 	CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"
+	# do not show decorations on messages generated with xmessage
+	if [ -x /usr/bin/xmessage ]
+	then
+		addconfig '[app] (xmessage)'
+		addconfig '	[Deco] {NONE}'
+		addconfig '[end]'
+	fi
 	# add icon utility
-	[ -x /usr/bin/idesk ] && addconfig '[startup]	{nohup idesk > /dev/null &}'
-	[ -x /usr/bin/xtdesk ] && addconfig '[startup]	{nohup xtdesk > /dev/null &}'
+	[ -x /usr/bin/idesk ] && addconfig '[startup] {nohup idesk > /dev/null &}'
 	# add numlock utility
-	[ -x /usr/bin/numlockx ] && addconfig '[startup]	{nohup numlockx on &}'
+	[ -x /usr/bin/numlockx ] && addconfig '[startup] {nohup numlockx on &}'
 
 	# add screensaver
 	if [[ ! -z ${cfg_screensaver_screensaver} ]] && [[ ! -z ${cfg_screensaver_screensaver_timeout} ]]
@@ -505,6 +478,6 @@
 	chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
 	chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
 	chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
-	chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop
-	chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc
+	chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop
+	chmod 0644 ${ALX_UNPRIV_HOME}/.ideskrc
 }