vfmg: vfmg - enlightenment sometimes tries to regenerate cache bef...

[sparky]

Author: sparky                       Date: Fri Jul  7 19:23:25 2006 GMT
Module: vfmg                          Tag: HEAD
---- Log message:
- enlightenment sometimes tries to regenerate cache before icon is finished:
  create icon in temp and them move it

---- Files affected:
vfmg:
   vfmg (1.95 -> 1.96) 

---- Diffs:

================================================================
Index: vfmg/vfmg
diff -u vfmg/vfmg:1.95 vfmg/vfmg:1.96
--- vfmg/vfmg:1.95	Fri Jul  7 21:03:37 2006
+++ vfmg/vfmg	Fri Jul  7 21:23:20 2006
@@ -920,7 +920,7 @@
 	my ($no, $dir, $tab, $dr)=@_;
 	my $dirs = "";
 	my $apps = "";
-	my @edje = qw(edje_cc -id . -fd . icon.edc);
+	my @edje = qw(edje_cc -id . -fd . icon.edc icon.eap);
 	foreach my $entry (sort cmpdname keys %{$menu[$no]}) {
 		my $icon_exists = 0;
 		my $d = $desktop[$entry];
@@ -1001,10 +1001,10 @@
 			}
 			my $file = "$opt{icons_dir}/$$d{file}.eap";
 
-			system(@edje,$file);
+			unlink "icon.eap";
+			system(@edje);
 			print ".." if $o_verbose;
-			my @eapp = qw(enlightenment_eapp);
-			push @eapp, $file;
+			my @eapp = qw(enlightenment_eapp icon.eap);
 			push @eapp, "-set-name",$name;
 			push @eapp, "-set-generic",$$d{GenericName}
 				if $$d{GenericName};
@@ -1036,6 +1036,7 @@
 				}
 			}
 			system(@eapp);
+			rename "icon.eap", $file;
 			
 			print "..DONE\n" if $o_verbose;
 			$apps .= $$d{file} . ".eap\n";
@@ -1046,12 +1047,15 @@
 			mkpath($subdir,0,0700);
 			print ".." if $o_verbose;
 			unless ( $icon_exists ) {
-				system(@edje, $file2);
+				unlink "icon.eap";
+				system(@edje);
 				print ".." if $o_verbose;
-				system("enlightenment_eapp",$file2,
+				system("enlightenment_eapp","icon.eap",
 					"-set-name",$name);
 			}
+			rename "icon.eap", $file2;
 			symlink ($file2, $file);
+
 			print "..DONE\n" if $o_verbose;
 			DR17($menu[$no]{$entry},$subdir,$tab.step,$dr);
 			$dirs .= $$d{file}."\n";
@@ -1567,6 +1571,7 @@
 	DR17($opt{strip},$opt{destdir},"",\%DR);
 	unlink "blank.xpm";
 	unlink "icon.edc";
+	unlink "icon.eap";
 	unlink $DR{icon};
 	unlink "$opt{icons_dir}/.eap.cache.cfg"
 		if -r "$opt{icons_dir}/.eap.cache.cfg";
================================================================

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