[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force SVN commit: rev 40 - people/branden/debian



Author: branden
Date: 2003-05-25 03:13:02 -0500 (Sun, 25 May 2003)
New Revision: 40

Modified:
   people/branden/debian/changelog
   people/branden/debian/twm.menu-method
Log:
fix escaping of double-quote characters in Debian menu entries (thanks, Bill Allombert) (Closes: #193759)

Modified: people/branden/debian/twm.menu-method
==============================================================================
--- people/branden/debian/twm.menu-method	2003-05-25 08:11:04 UTC (rev 39)
+++ people/branden/debian/twm.menu-method	2003-05-25 08:13:02 UTC (rev 40)
@@ -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";

Modified: people/branden/debian/changelog
==============================================================================
--- people/branden/debian/changelog	2003-05-25 08:11:04 UTC (rev 39)
+++ people/branden/debian/changelog	2003-05-25 08:13:02 UTC (rev 40)
@@ -17,8 +17,10 @@
     - (cosmetic) Clean up, correct, expand, and otherwise improve the package
       descriptions for xlibmesa-drm-src, xlibmesa-gl, xlibs, xlibs-dbg,
       xlibs-data, xprt, xserver-xfree86.
+  * debian/twm.menu-method: fix escaping of double-quote characters in Debian
+    menu entries (thanks, Bill Allombert) (Closes: #193759)
 
- -- Branden Robinson <branden@debian.org>  Sat, 26 Apr 2003 15:26:38 -0500
+ -- Branden Robinson <branden@debian.org>  Sun, 25 May 2003 03:11:36 -0500
 
 xfree86 (4.3.0-0pre1v1) unstable; urgency=low
 



Reply to: