X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=lib%2Fredact%2Fredact.rb;h=7b9a802461c644048235570b3a8482df409f505d;hb=bf303d7901b8d8105571f66c1fa4fb7f0907bed4;hp=6b505f28cee7daf61c92aa53a9362b2a10bb38e4;hpb=eb3e06dccf913ce26dd7c002eccbe12a44c32600;p=redact.git

diff --git a/lib/redact/redact.rb b/lib/redact/redact.rb
index 6b505f2..7b9a802 100644
--- a/lib/redact/redact.rb
+++ b/lib/redact/redact.rb
@@ -1,5 +1,5 @@
 #--
-# $Id: redact.rb 45 2005-06-08 18:02:12Z tilman $
+# $Id: redact.rb 48 2005-06-08 21:38:34Z tilman $
 #
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
@@ -142,10 +142,12 @@ module Redact
 	end
 
 	class FontDirectoryEntry # :nodoc:
-		attr_reader :filename
+		attr_reader :filename, :alias
 
 		def initialize(filename)
 			@filename = filename.to_str.dup.freeze
+			@alias = "Edje." + File.basename(@filename).
+			         sub(/.[^.]+$/, "").freeze
 		end
 
 		protected
@@ -154,7 +156,7 @@ module Redact
 		end
 
 		def to_eet_properties
-			{"entry" => [@filename]}
+			{"entry" => [@alias]}
 		end
 	end
 
@@ -179,7 +181,7 @@ module Redact
 		attr_reader :filename, :image, :id
 
 		def initialize(filename)
-			@filename = find_image(filename.to_str).freeze
+			@filename = filename.to_str.dup.freeze
 			@image = Imlib2::Image.load(@filename)
 			@id = -1
 			@source_type = 1 # COMP
@@ -207,16 +209,6 @@ module Redact
 			 "source_param" => [@source_param],
 			 "id" => [@id]}
 		end
-
-		private
-		def find_image(file)
-			[".", OPTIONS.image_dir].each do |d|
-				f2 = File.join(d, file)
-				return f2 if File.file?(f2)
-			end
-
-			nil
-		end
 	end
 
 	class CollectionDirectory < Array # :nodoc: