rpms/openbox/F-9 xdg-menu,1.2,1.3

[Miroslav Lichvar (mlichvar)]

Author: mlichvar

Update of /cvs/pkgs/rpms/openbox/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17730

Modified Files:
	xdg-menu 
Log Message:
- Remove field codes from commands in xdg-menu (#452403)
- Add support for launching applications in xterm to xdg-menu



Index: xdg-menu
===================================================================
RCS file: /cvs/pkgs/rpms/openbox/F-9/xdg-menu,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xdg-menu	10 Jun 2008 17:45:27 -0000	1.2
+++ xdg-menu	1 Aug 2008 12:10:36 -0000	1.3
@@ -19,7 +19,7 @@
 #            Miroslav Lichvar <mlichvar at redhat.com>
 
 
-import gmenu, sys
+import gmenu, re, sys
 from xml.sax.saxutils import escape
 
 def walk_menu(entry):
@@ -29,10 +29,14 @@
 		map(walk_menu, entry.get_contents())
 		print '</menu>'
 	elif entry.get_type() == gmenu.TYPE_ENTRY and not entry.is_excluded:
-		print """
-	<item label="%s">
-		<action name="Execute"><command>%s</command></action>
-	</item>	""" % (escape(entry.get_name()), escape(entry.get_exec()))
+		print '	<item label="%s">' % escape(entry.get_name())
+		command = re.sub(' [^ ]*%[fFuUdDnNickvm]', '', entry.get_exec())
+		if entry.launch_in_terminal:
+			command = 'xterm -title "%s" -e %s' % \
+				(entry.get_name(), command)
+		print '		<action name="Execute">' + \
+			'<command>%s</command></action>' % escape(command)
+		print '	</item>'
 
 if len(sys.argv) > 1:
 	menu = sys.argv[1] + '.menu'