--- mcore-src/trunk/mcore-tools/src/modules/idesk/idesk.client.class.in	2014/01/10 13:32:59	2146
+++ mcore-src/trunk/mcore-tools/src/modules/idesk/idesk.client.class.in	2014/01/10 13:34:55	2147
@@ -39,7 +39,7 @@
 	[[ -z ${name} ]] && return 1
 	[[ -z ${command} ]] && return 1
 
-	[[ -z ${dest} ]] && dest="${ALX_UNPRIV_HOME}/.idesktop/${name}.lnk"
+	[[ -z ${dest} ]] && dest="${MCORE_UNPRIV_HOME}/.idesktop/${name}.lnk"
 
 	# use some defaults for icon, dest, {x,y}res
 	[[ -z ${xres} ]] && xres=50
@@ -48,7 +48,7 @@
 	then
 		# if no default icon is given use default.png
 		[[ -z ${deficon} ]] && deficon="default.png"
-		icon="${ALX_SESSIONS_ICONS}/${deficon}"
+		icon="@@PIXMAPSDIR@@/${deficon}"
 	fi
 
 	CONFIG="${dest}"
@@ -88,14 +88,14 @@
 	local dest
 	local rc
 
-	dest="${ALX_UNPRIV_HOME}/.idesktop"
-	rc="${ALX_UNPRIV_HOME}/.ideskrc"
+	dest="${MCORE_UNPRIV_HOME}/.idesktop"
+	rc="${MCORE_UNPRIV_HOME}/.ideskrc"
 
-	# progsh path
-	progsh_path="${ALX_UNPRIV_HOME}/.alxprogs"
+	# progs path
+	progsh_path="${MCORE_UNPRIV_HOME}/.progs"
 
 	# get the resolution
-	res=$(mysqldo "select resolution from cfg_graphic where serial='${ALX_SERIAL}'")
+	res=$(mysqldo "select resolution from cfg_graphic where serial='${MCORE_SERIAL}'")
 
 	# split res to x & y
 	xres="${res%x*}"
@@ -122,7 +122,7 @@
 		[[ -z ${i} ]] && continue
 
 		# get database information
-		evaluate_table cfg_sessions "where serial='${ALX_SERIAL}' and id='${i}'"
+		evaluate_table cfg_sessions "where serial='${MCORE_SERIAL}' and id='${i}'"
 
 		# new line if x > xres
 		if [ ${x} -ge ${xres} ]