X Strike Force SVN commit: rev 462 - trunk/debian
Author: branden
Date: 2003-08-30 20:30:11 -0500 (Sat, 30 Aug 2003)
New Revision: 462
Modified:
trunk/debian/changelog
trunk/debian/twm.menu-method
Log:
debian/twm.menu-method: correctly escape doublequote characters in menu
entry titles (thanks, Bill Allombert) (Closes: #193759)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-08-31 01:21:41 UTC (rev 461)
+++ trunk/debian/changelog 2003-08-31 01:30:11 UTC (rev 462)
@@ -1,3 +1,10 @@
+xfree86 (4.2.1-12) unstable; urgency=low
+
+ * debian/twm.menu-method: correctly escape doublequote characters in menu
+ entry titles (thanks, Bill Allombert) (Closes: #193759)
+
+ -- Branden Robinson <branden@debian.org> Sat, 30 Aug 2003 20:28:21 -0500
+
xfree86 (4.2.1-11) unstable; urgency=medium
* urgency set to medium because bug #206790 bites a lot of people (but,
Modified: trunk/debian/twm.menu-method
===================================================================
--- trunk/debian/twm.menu-method 2003-08-31 01:21:41 UTC (rev 461)
+++ trunk/debian/twm.menu-method 2003-08-31 01:30:11 UTC (rev 462)
@@ -14,7 +14,8 @@
compat="menu-2"
-function f($com)=" \"" title() "\" f.exec \"" esc($com,"\"") " &\"\n";
+function q($com)=esc($com,"\"");
+function f($com)=" \"" q(title()) "\" f.exec \"" q($com) " &\"\n";
#This doesn't seem to be possible with twm: wm="f.restart \"${title}\"\\n"
supported;
@@ -24,9 +25,9 @@
# text= " \"" $title "\" f.exec \"xterm -title \\\""
# $title "\\\" -e " esc($command,"\"") " &\"\n";
endsupported;
-startmenu= "menu \"" $section "\"\n{\n";
+startmenu= "menu \"" q($section) "\"\n{\n";
endmenu= "}\n";
-submenutitle=" \"" title() "\" f.menu \"" $section "\"\n";
+submenutitle=" \"" q(title()) "\" f.menu \"" q($section) "\"\n";
genmenu= "menudefs.hook";
rcfile= "system.twmrc";
examplercfile="system.twmrc-menu";
Reply to: