--- mcore-src/trunk/mcore-tools/daemon/client/include/fluxbox.client.class	2012/08/13 10:00:31	2013
+++ mcore-src/trunk/mcore-tools/daemon/client/include/fluxbox.client.class	2012/08/13 10:05:03	2015
@@ -14,8 +14,7 @@
 	MMINCLUDE="${MCORE_CONFIG_PATH}/fluxbox/mcore-menu-include"
 	CONFIG="${MROOT}/${MMINCLUDE}"
 	clearconfig
-
-	for file in ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu/*
+	for file in $(find ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu -type f)
 	do
 		[[ ! -z ${MROOT} ]] && file=$(echo ${file} | sed "s:${MROOT}::")
 		addconfig "[include] (${file})"
@@ -56,7 +55,7 @@
 
 	CONFIG="${MROOT}/${MCORE_UNPRIV_HOME}/.fluxbox/apps"
 	clearconfig
-	for file in ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/autostart/*
+	for file in $(find ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/autostart -type f)
 	do
 		addconfig "$(< ${file})"
 	done
@@ -126,15 +125,7 @@
 # get_fluxbox_menuitem
 get_fluxbox_menuitem()
 {
-	local i
-	local item
-
-	for i in $(find ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu -type f | sort)
-	do
-		item="${item} $(basename ${i})"
-	done
-
-	rvecho "${item}"
+	list_files_in_directory ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu
 }
 
 help_fluxbox_theme()
@@ -176,11 +167,7 @@
 
 	case "${method}" in
 		system)
-			for i in $(find ${MROOT}/${stylesdir} -mindepth 1 -maxdepth 1 | sort)
-			do
-				value="${value} $(basename ${i})"
-			done
-			rvecho "${value}"
+			list_files_in_directory -type d -mindepth 1 -maxdepth 1 ${MROOT}/${stylesdir}
 			;;
 
 		current)