--- alx-src/branches/alxconf_20060908/functions/config_sessions.sh	2010/12/28 12:46:26	1642
+++ alx-src/branches/alxconf-060/functions/config_sessions.sh	2011/05/09 14:51:55	2001
@@ -1,4 +1,4 @@
-# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/functions/config_sessions.sh,v 1.18 2006-01-26 19:55:53 niro Exp $
+# $Id$
 # configures ica-sessions on the host via mysql db settings
 
 get_sessions_settings()
@@ -56,6 +56,7 @@
 	local all_ids
 	local i
 	local x
+	local browser_address_num
 	local server
 	local ses_session
 	local ses_filename
@@ -97,17 +98,21 @@
 		for server in ${ses_browseradrs}
 		do
 			(( x++ ))
-			echo "TcpBrowserAddress${x}=${server}" >> ${ALX_ICA_SESSIONS}/${ses_filename}
+			browser_address_num="${x}"
+			# support newer ica-clients:
+			# the first address must be named TcpBrowserAddress, but not TcpBrowserAddress1 !!
+			[[ ${x} -eq 1 ]] && browser_address_num=""
+			echo "TcpBrowserAddress${browser_address_num}=${server}" >> ${ALX_ICA_SESSIONS}/${ses_filename}
 		done
 		IFS="${OLD_IFS}"
 		unset x
 		unset OLD_IFS
-		
+
 		echo 'ScreenPercent=0' >> ${ALX_ICA_SESSIONS}/${ses_filename}
 
 		echo '[ApplicationServers]' >> ${ALX_ICA_SESSIONS}/${ses_filename}
 		echo "${ses_session}=" >> ${ALX_ICA_SESSIONS}/${ses_filename}
-		
+
 		echo "[${ses_session}]" >> ${ALX_ICA_SESSIONS}/${ses_filename}
 		echo "Address=${ses_session}" >> ${ALX_ICA_SESSIONS}/${ses_filename}
 		echo "InitialProgram=#${ses_session}" >> ${ALX_ICA_SESSIONS}/${ses_filename}
@@ -334,7 +339,7 @@
 		basename_item="$(basename ${item} .ica)"
 		generate_icon \
 			--name "${basename_item}" \
-			--command "numlockx on && nice -n 19 wfica ${ALX_ICA_SESSIONS}/${item}" \
+			--command "nice -n 19 wfica ${ALX_ICA_SESSIONS}/${item}" \
 			--icon "${ALX_SESSIONS_ICONS}/${basename_item}.png" \
 			--dest "${ALX_UNPRIV_HOME}/.xtdesktop/${basename_item}.lnk" \
 			--xres "${x}" \
@@ -461,7 +466,7 @@
 	# add autostart session
 	if [[ ${ALX_AUTOSTART} != "" ]]
 	then
-		echo "[startup] {nice -n 19 wfica ${ALX_ICA_SESSIONS}/${ALX_AUTOSTART}}" \
+		echo "[startup] {nohup nice -n 19 wfica ${ALX_ICA_SESSIONS}/${ALX_AUTOSTART} &}" \
 			>> ${ALX_UNPRIV_HOME}/.fluxbox/apps
 	fi
 
@@ -485,7 +490,7 @@
 	for (( i=0; i < count; i++ ))
 	do
 		[ -n "${ALX_SESSIONS[${i}]}" ] && \
-			echo "[exec] ($(basename ${ALX_SESSIONS[${i}]} .ica)) {numlockx on && nice -n 19 wfica ${ALX_ICA_SESSIONS}/${ALX_SESSIONS[${i}]}}" \
+			echo "[exec] ($(basename ${ALX_SESSIONS[${i}]} .ica)) {nice -n 19 wfica ${ALX_ICA_SESSIONS}/${ALX_SESSIONS[${i}]}}" \
 				>> ${ALX_UNPRIV_HOME}/.fluxbox/menu
 	done