vfmg (DEVEL): vfmg - fixed icons support in fvwm2

[sparky]

Author: sparky                       Date: Sat Nov  5 20:06:05 2005 GMT
Module: vfmg                          Tag: DEVEL
---- Log message:
- fixed icons support in fvwm2

---- Files affected:
vfmg:
   vfmg (1.73.2.32 -> 1.73.2.33) 

---- Diffs:

================================================================
Index: vfmg/vfmg
diff -u vfmg/vfmg:1.73.2.32 vfmg/vfmg:1.73.2.33
--- vfmg/vfmg:1.73.2.32	Sat Nov  5 19:25:52 2005
+++ vfmg/vfmg	Sat Nov  5 21:06:00 2005
@@ -1008,17 +1008,17 @@
 	foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
 		my $d = $desktop{$entry};
 		( my $name = $$d[LOCALENAME] ) =~ s/\"/\\\"/g;
+		my $icon = "";
+		$icon = scale_icon($$d[ICON]) if $opt{icons};
+		$icon = "\%$icon\%" if length $icon;
 		if($menu[$no]{$entry}<0) {
-			my $icon = "";
-			$icon = scale_icon($$d[ICON]) if $opt{icons};
-			$apps .= qq(AddToMenu $level	"$name"	Exec $$d[EXEC] &\n);
-			$apps .= qq(Style "$name"	Icon $icon\n) if length $icon;
+			$apps .= qq(AddToMenu $level	"$icon$name"	Exec $$d[EXEC] &\n);
 		} else {
 			my $file = $$d[FILENAME];
 			$file =~ s/\s+/_/g;
-			print qq(AddToMenu $level.$file	"$name"	Popup $level.$file\n);
+			print qq(AddToMenu $level	"$icon$name"	Popup $level.$file\n);
 			print "DestroyMenu recreate $level.$file\n\n";
-			print qq(AddToMenu $level.$file	"$name"	Title\n);
+			print qq(AddToMenu $level.$file	"$icon$name"	Title\n);
 			fvwm2($menu[$no]{$entry},"$level.$file");
 		}
 	}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/vfmg/vfmg?r1=1.73.2.32&r2=1.73.2.33&f=u