ports/119569: [patch] x11-wm/e16utils quote icon path in file menus

[Pietro Cerutti]

>Number:         119569
>Category:       ports
>Synopsis:       [patch] x11-wm/e16utils quote icon path in file menus
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 11 17:20:04 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Pietro Cerutti
>Release:        FreeBSD 8.0-CURRENT i386
>Organization:
>Environment:


System: FreeBSD 8.0-CURRENT #20: Tue Jan  8 15:03:14 CET 2008
    root at gahrtop.localhost:/usr/obj/usr/src/sys/MSI1034



>Description:


Icon paths are not quoted in menu entries generated by e16menuedit.
This leads to problems when a path containing spaces is used.


>How-To-Repeat:





>Fix:


--- _e16utils.diff begins here ---
--- files/patch-e16menuedit-0.1.orig	2008-01-11 18:08:30.000000000 +0100
+++ files/patch-e16menuedit-0.1	2008-01-11 18:09:18.000000000 +0100
@@ -45,8 +45,8 @@
  #MAKEDEP = makedepend -f- -s'\# CUT' -- -Y $(CFLAGS) $(EXTRA_CFLAGS) $(INCLUDES) $(EXTRA_INCLUDES) --
  
  # piece together variables
---- viewer_new.c        Mon Aug  7 23:29:16 2006
-+++ viewer.c    Mon Aug  7 23:34:38 2006
+--- viewer.c.orig	2000-04-16 22:40:03.000000000 +0200
++++ viewer.c	2008-01-11 18:08:53.000000000 +0100
 @@ -34,7 +34,7 @@
    if (!file_to_load)
      return;
@@ -83,3 +83,21 @@
      }
    else
      realfile = g_strdup (file);
+@@ -717,7 +717,7 @@
+   if (G_NODE_IS_LEAF (node))
+     {
+       /* It's an entry */
+-      fprintf (fp, "\"%s\"\t%s\texec\t\"%s\"\n",
++      fprintf (fp, "\"%s\"\t\"%s\"\texec\t\"%s\"\n",
+ 	       dat->desc[0] == '\0' ? "NULL" : dat->desc,
+ 	       dat->icon[0] == '\0' ? "NULL" : dat->icon,
+ 	       dat->params[0] == '\0' ? "" : dat->params);
+@@ -725,7 +725,7 @@
+   else
+     {
+       /* It's a submenu */
+-      fprintf (fp, "\"%s\"\t%s\tmenu\t\"%s\"\n",
++      fprintf (fp, "\"%s\"\t\"%s\"\tmenu\t\"%s\"\n",
+ 	       dat->desc[0] == '\0' ? "NULL" : dat->desc,
+ 	       dat->icon[0] == '\0' ? "NULL" : dat->icon,
+ 	       dat->params[0] == '\0' ? "" : dat->params);
--- _e16utils.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: