SVN: vfmg/trunk/VFMG/e17-eap_out.pm

[sparky]

Author: sparky
Date: Sun Dec  3 00:06:49 2006
New Revision: 8049

Modified:
   vfmg/trunk/VFMG/e17-eap_out.pm
Log:
- use VFMG::Icons


Modified: vfmg/trunk/VFMG/e17-eap_out.pm
==============================================================================
--- vfmg/trunk/VFMG/e17-eap_out.pm	(original)
+++ vfmg/trunk/VFMG/e17-eap_out.pm	Sun Dec  3 00:06:49 2006
@@ -3,6 +3,7 @@
 use strict;
 use warnings;
 use File::Path qw(mkpath);
+use VFMG::Icons;
 
 sub decode_tags() {
 	return qw(GenericName Comment);
@@ -90,7 +91,7 @@
 				system($exe);
 			} else {
 				$icon = $DR{tmp}."/blank.xpm" unless -r $icon;
-				main::scale_icon($icon);
+				&$VFMG::Icons::scale_icon($icon);
 			}
 			die "No icon $DR{icon}\n" unless -r $DR{icon};
 			print ".." if $main::o_verbose;
@@ -173,8 +174,8 @@
 sub do_menu() {
 	die "Enlightenment DR17 requires icon scaling\n"
 		unless $main::opt{icons_scale};
-	die "Enlightenment DR17 conflicts with icons fork\n"
-		if $main::opt{icons_fork};
+	$main::opt{icons_fork} = 1;
+	VFMG::Icons::init();
 	
 	$| = 1;
 	print "Generating DR17 menu, this may take a long time\n";
@@ -287,8 +288,6 @@
 		}
 	}
 	close F_OUT;
-	
-	exit;
 }
 
 1;