Merge lp:~phw/earcandy/fixes into lp:earcandy

[Philipp Wolfer]

[KillerKiwi (killerkiwi2005)]

review: Approve (looks good)

[Philipp Wolfer (phw)]

Hi,

thanks for approving the fix. Unfortunately the merge request and review system on Launchpad is not really good and does not automatically perform the merges. Someone with write access to the lp:earcandy branch must perform the merge :(

Thanks,
Philipp

Unmerged revisions

81. By Philipp Wolfer on 2010-06-16

Fixed parsing of commands separated by semicolon from desktop files

=== modified file 'ear_candy/Freedesktop.py'
--- ear_candy/Freedesktop.py	2009-06-03 20:26:47 +0000
+++ ear_candy/Freedesktop.py	2010-06-16 19:20:41 +0000
@@ -85,7 +85,10 @@
 	def get_exec_array(self):
 		command = []
 		p = re.compile("('[^']+')|(\"[^\"]+\")|([^\s]+)")
-		for r in re.finditer(p, self.get("Exec")):
+		cmd = self.get("Exec")
+		if isinstance(cmd, list):
+			cmd = "; ".join(cmd)
+		for r in re.finditer(p, cmd):
 			command.append( str(r.group(0)) )
 		return command