X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=lib%2Fembrace%2Fimap.rb;h=0c545e32a3ada166341bfe36b0ae52561613bc9c;hb=276ab5edad1b440db6a7791a832794342ef94fda;hp=a315a81c2de0f9fbaaad6374572521d6ebd60b37;hpb=51ce043e8007319aae5b7eccffb85a060bb94bda;p=embrace.git

diff --git a/lib/embrace/imap.rb b/lib/embrace/imap.rb
index a315a81..0c545e3 100644
--- a/lib/embrace/imap.rb
+++ b/lib/embrace/imap.rb
@@ -41,7 +41,7 @@ module Embrace::IMAP
 			@login = config[:server][:login]
 			@password = config[:server][:password]
 
-			flags = 2
+			flags = 3
 			flags |= 16 if config[:server][:use_ssl]
 
 			@connection = Ecore::Con::Server.new(flags,
@@ -138,15 +138,23 @@ end
 		end
 
 		def handle_tagged_response(resp, req)
-			return unless req.is_a?(LoginRequest)
-
-			case resp.status
-			when :ok
-				@state = :logged_in
-
-				@mboxes.each { |mb| query_status(mb) }
-			else
-				raise(LoginError, "cannot login - #{resp.data}")
+			case req
+			when LoginRequest
+				case resp.status
+				when :ok
+					@state = :logged_in
+
+					@mboxes.each { |mb| query_status(mb) }
+				else
+					raise(LoginError, "cannot login - #{resp.data}")
+				end
+			when StatusRequest
+				@mboxes.delete(req.mailbox)
+
+				if @mboxes.empty?
+					@status = :done
+					logout
+				end
 			end
 		end
 
@@ -161,12 +169,6 @@ end
 			name, count = md.captures.first, md.captures.last.to_i
 
 			MailboxStatusEvent.raise(name, count)
-			@mboxes.delete(name)
-
-			if @mboxes.empty?
-				@status = :done
-				logout
-			end
 		end
 	end
 
@@ -208,6 +210,8 @@ end
 	end
 
 	class StatusRequest < Request
+		attr_reader :mailbox
+
 		def initialize(session, mailbox)
 			super(session)