--- branches/magellan-next/include/xdg.sminc	2012/01/05 21:29:18	9715
+++ branches/magellan-next/include/xdg.sminc	2012/01/05 21:42:46	9716
@@ -153,26 +153,17 @@
 			--categories|-c) shift; categories="$1"; modify="1" ;;
 			--vendor|-v) shift; vendor="$1"; modify="1" ;;
 			--mimetypes|-x) shift; mimetypes="$1"; modify="1" ;;
+			--file|-f) shift; file="$1" ;;
+			--destination-file|-df) shift; destfile="$1" ;;
+			--destination-dir|-d) shift; destdir="$1" ;;
 		esac
 		shift
 	done
 
-	file="${prefix}$1"
-
-	if [[ -n "$2" ]]
-	then
-		destfile="$2"
-	else
-		destfile="$(basename ${file})"
-	fi
-
-	if [[ -n "$3" ]]
-	then
-		destdir="$3"
-	else
-		destdir="/usr/share/applications"
-	fi
+	[[ ! -z ${prefix} ]] && file="${prefix}${file}"
 
+	[[ -z ${destfile} ]] && destfile="$(basename ${file})"
+	[[ -z ${destdir} ]] && destdir="/usr/share/applications"
 	[[ -z ${file} ]] && die "No xdg desktop file given"
 
 	# needed directory