Removed RCS-style IDs.

[redact.git] / lib / redact / program.rb

diff --git a/lib/redact/program.rb b/lib/redact/program.rb
index bde0c030b43fc8b4682ad559382d463e8d67842a..abcc79e8a9bb7572415ec3fce8ebf83974b17196 100644 (file)
--- a/lib/redact/program.rb
+++ b/lib/redact/program.rb
@@ -1,6 +1,4 @@
 #--
-# $Id: program.rb 25 2005-04-14 19:42:06Z tilman $
-#
 # Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
 #
 # Permission is hereby granted, free of charge, to any person obtaining
@@ -84,6 +82,7 @@ module Redact
                        @in_range = v
                end
 
+               protected
                def to_eet_name
                        "Edje_Program"
                end
@@ -139,6 +138,7 @@ module Redact
                        @time = v
                end
 
+               protected
                def to_eet_properties
                        mode = case @mode
                        when :linear: 1
@@ -166,6 +166,7 @@ module Redact
                        @targets = ProgramArgs.new(collection)
                end
 
+               protected
                def to_eet_properties
                        super.merge!({"targets" => [@targets]})
                end
@@ -178,8 +179,8 @@ module Redact
                        super
 
                        @type = TYPE_EMIT_SIGNAL
-                       @emission_signal = nil
-                       @emission_source = nil
+                       @emission_signal = ""
+                       @emission_source = ""
                end
 
                def emission_signal=(v)
@@ -190,6 +191,7 @@ module Redact
                        @emission_source = v.to_str.dup
                end
 
+               protected
                def to_eet_properties
                        super.merge!(
                        {"state" => [@emission_signal],
@@ -208,7 +210,8 @@ module Redact
                end
 
                def script=(v)
-                       @script = v.to_str.dup
+                       v = v.to_str
+                       @script = (File.exist?(v) ? File.read(v) : v).dup
                end
        end
 
@@ -236,18 +239,21 @@ module Redact
                        @id = v.id
                end
 
+               protected
                def to_eet_properties
                        {"id" => [@id]}
                end
        end
 
        class ProgramAfter < ProgramArg
+               protected
                def to_eet_name
                        "Edje_Program_After"
                end
        end
 
        class ProgramTarget < ProgramArg
+               protected
                def to_eet_name
                        "Edje_Program_Target"
                end