--- trunk/include/xdg.sminc	2012/06/06 20:39:04	12531
+++ trunk/include/xdg.sminc	2012/06/06 20:46:19	12532
@@ -171,13 +171,13 @@
 
 	if [[ ${modify} = 1 ]]
 	then
-		[[ ! -z ${name} ]] && cmdline+=" --set-name=${name}"
-		[[ ! -z ${comment} ]] && cmdline+=" --set-comment=${comment}"
+		[[ ! -z ${name} ]] && cmdline+=" --set-name=\"${name}\""
+		[[ ! -z ${comment} ]] && cmdline+=" --set-comment=\"${comment}\""
 		[[ ! -z ${exec} ]] && cmdline+=" --set-key=Exec --set-value=\"${exec}\""
-		[[ ! -z ${icon} ]] && cmdline+=" --set-icon=${icon}"
+		[[ ! -z ${icon} ]] && cmdline+=" --set-icon=\"${icon}\""
 		[[ ! -z ${terminal} ]] && cmdline+=" --set-key=Terminal --set-value=false"
 		[[ ! -z ${notify} ]] && cmdline+=" --set-key=StartupNotify --set-value=false"
-		[[ ! -z ${vendor} ]] && cmdline+=" --vendor ${vendor}"
+		[[ ! -z ${vendor} ]] && cmdline+=" --vendor \"${vendor}\""
 
 		if [[ ! -z ${categories} ]]
 		then