aboutsummaryrefslogtreecommitdiffstats
path: root/lib/mail_handler/mail_handler.rb
diff options
context:
space:
mode:
authorHenare Degan <henare.degan@gmail.com>2013-02-27 14:17:16 +1100
committerHenare Degan <henare.degan@gmail.com>2013-02-27 14:17:16 +1100
commitf07444d80961fcd3e7bb9555f5ed4a4e0b65b5db (patch)
tree518417e41c3758d2e0e50f537cb617694e94f3a4 /lib/mail_handler/mail_handler.rb
parent65247a15ab8d876d7fd60ccf6ef91e2487c166e5 (diff)
Remove Tmail and use the Mail gem under Ruby 1.8.7 as well
Diffstat (limited to 'lib/mail_handler/mail_handler.rb')
-rw-r--r--lib/mail_handler/mail_handler.rb15
1 files changed, 4 insertions, 11 deletions
diff --git a/lib/mail_handler/mail_handler.rb b/lib/mail_handler/mail_handler.rb
index 8b227b9ca..d9ebee854 100644
--- a/lib/mail_handler/mail_handler.rb
+++ b/lib/mail_handler/mail_handler.rb
@@ -3,17 +3,10 @@ require 'tmpdir'
module MailHandler
- if RUBY_VERSION.to_f >= 1.9
- require 'mail'
- require 'backends/mail_extensions'
- require 'backends/mail_backend'
- include Backends::MailBackend
- else
- require 'action_mailer'
- require 'backends/tmail_extensions'
- require 'backends/tmail_backend'
- include Backends::TmailBackend
- end
+ require 'mail'
+ require 'backends/mail_extensions'
+ require 'backends/mail_backend'
+ include Backends::MailBackend
# Returns a set of attachments from the given TNEF contents
# The TNEF contents also contains the message body, but in general this is the