X-Git-Url: http://git.code-monkey.de/?p=embrace.git;a=blobdiff_plain;f=bin%2Fembrace;h=5673f88c9a701cd72204b8cf822134d70c967e8a;hp=f9d00c047afd82af3d6c8d2d9b0a498c01fc61e1;hb=8810045367f1f47685b9a80932bd58581e80482b;hpb=76d5e549fcb9c0b316f81eb4a2a496d84f0313c7

diff --git a/bin/embrace b/bin/embrace
index f9d00c0..5673f88 100755
--- a/bin/embrace
+++ b/bin/embrace
@@ -117,9 +117,9 @@ module Embrace
 			@label = Evas::Text.new(evas)
 
 			@objects = [@img, @label]
+			@objects.each { |o| add_member(o) }
 
 			@img.set_color(255, 255, 255, 0)
-			@label.set_color(255, 255, 255, 0)
 			@label.set_color(255, 0, 0, 0)
 
 			@img.set_file(ICON_FILE)
@@ -159,18 +159,6 @@ module Embrace
 			@img = @label = @alpha_anim = nil
 		end
 
-		def on_layer_set(layer)
-			@objects.each { |o| o.layer = layer }
-		end
-
-		def on_stack_above(other)
-			@objects.each { |o| o.stack_above = other }
-		end
-
-		def on_stack_below(other)
-			@objects.each { |o| o.stack_below = other }
-		end
-
 		def on_move(x, y)
 			@objects.each { |o| o.move(x, y) }
 
@@ -217,6 +205,8 @@ module Embrace
 			@bg = Evas::Rectangle.new(evas)
 			@bg.set_color(0, 0, 0, 255)
 
+			add_member(@bg)
+
 			@icons = FixedSizeArray.new(MAX_ICONS)
 			@about_to_add = []
 			@animators = []
@@ -285,10 +275,6 @@ module Embrace
 			end
 		end
 
-		def length
-			@icons.nitems
-		end
-
 		# smart callbacks
 		def on_show
 			@bg.show
@@ -303,18 +289,6 @@ module Embrace
 			@bg = nil
 		end
 
-		def on_layer_set(layer)
-			@bg.layer = layer
-		end
-
-		def on_stack_above(other)
-			@bg.stack_above = other
-		end
-
-		def on_stack_below(other)
-			@bg.stack_below = other
-		end
-
 		def on_move(x, y)
 			@bg.move(x, y)
 		end
@@ -341,12 +315,12 @@ module Embrace
 		def initialize
 			super
 
-			self.title = "blah"
+			self.title = "Embrace"
 			self.borderless = true
 
 			@icon_dim = IO.read(ICON_FILE, 8, 16).unpack("NN")
 
-			self.on_resize { @container.resize(*geometry[2, 3]) }
+			on_resize { @container.resize(*geometry[2, 3]) }
 
 			@container = Container.new(evas)
 			@container.move(0, 0)
@@ -367,6 +341,9 @@ module Embrace
 				                        &method(:on_finished))
 			]
 
+			s = File.expand_path("~/.e/apps/embrace/config.yaml")
+			@config = YAML.load(File.read(s))
+
 			@server = nil
 			@timer = Ecore::Timer.new(30, &method(:on_timer))
 			on_timer
@@ -388,31 +365,7 @@ module Embrace
 		def on_timer
 			return unless @server.nil?
 
-			mboxes = %w{
-				INBOX
-				Lists.ba-2005
-				Lists.blackbox-devel
-				Lists.clc-devel
-				Lists.crux
-				Lists.cruxcon
-				Lists.dri-devel
-				Lists.dri-users
-				Lists.enlightenment-cvs
-				Lists.enlightenment-devel
-				Lists.hobix
-				Lists.mesa3d-dev
-				Lists.ruby-core
-				Lists.rubygems-devel
-				Lists.vim-ruby-devel
-				Lists.xmms2-devel
-				Lists.xorg
-			}
-
-			s = File.expand_path("~/.e/apps/embrace/config.yaml")
-
-			File.open(s) do |f|
-				@server = IMAP::Session.new(YAML.load(f), mboxes)
-			end
+			@server = IMAP::Session.new(@config)
 
 			true
 		end