[patch] eutils.eclass.diff

eutils.eclass.diff (text/plain), 1.22 KB, created by Carsten Lohrke (RETIRED) on 2008-02-29 21:09:31 UTC

--- /usr/local/cvsroot/gentoo-x86/eclass/eutils.eclass	2008-02-24 16:37:23.000000000 +0100
+++ eutils.eclass	2008-02-29 21:58:49.000000000 +0100
@@ -847,6 +847,7 @@
 					news)	type=News;;
 					nntp)	type=News;;
 					p2p)	type=FileTransfer;;
+					voip)	type=Telephony;;
 					*)		type=;;
 				esac
 				type="Network;${type}"
@@ -893,6 +894,21 @@
 	local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
 	#local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
 
+	# Don't append another ; when actually a valid category value is provided.
+	if [[ -n "${type}" ]] && [[ "${type:0-1}" != ";" ]] ; then
+		type="${type};"
+	fi
+
+	if [[ -n "${icon}" ]] && [[ "${icon:0:1}" != "/" ]] ; then
+		if [[ "${icon:0-4}" == ".xpm" ]] || \
+			[[ "${icon:0-4}" == ".png" ]] || \
+			[[ "${icon:0-4}" == ".svg" ]]
+		then
+			ewarn "As described in the Icon Theme Specification, icon file extensions are not"
+			ewarn "allowed, if the value is not an absolute path."
+		fi
+	fi
+
 	cat <<-EOF > "${desktop}"
 	[Desktop Entry]
 	Version=1.0
@@ -902,7 +918,7 @@
 	Exec=${exec}
 	TryExec=${exec%% *}
 	Icon=${icon}
-	Categories=${type};
+	Categories=${type}
 	EOF
 
 	[[ ${path} ]] && echo "Path=${path}" >> "${desktop}"