@@ -233,11 +233,6 @@ def self.default_charset; @@default_charset; end
233233 def self . default_charset = ( charset ) ; @@default_charset = charset ; end
234234 self . default_charset = 'UTF-8'
235235
236- def register_for_delivery_notification ( observer )
237- warn ( "Message#register_for_delivery_notification is deprecated, please call Mail.register_observer instead" )
238- Mail . register_observer ( observer )
239- end
240-
241236 def inform_observers
242237 Mail . inform_observers ( self )
243238 end
@@ -1434,11 +1429,6 @@ def has_content_transfer_encoding?
14341429 header [ :content_transfer_encoding ] && Utilities . blank? ( header [ :content_transfer_encoding ] . errors )
14351430 end
14361431
1437- def has_transfer_encoding? # :nodoc:
1438- warn ( ":has_transfer_encoding? is deprecated in Mail 1.4.3. Please use has_content_transfer_encoding?\n #{ caller } " )
1439- has_content_transfer_encoding?
1440- end
1441-
14421432 # Creates a new empty Message-ID field and inserts it in the correct order
14431433 # into the Header. The MessageIdField object will automatically generate
14441434 # a unique message ID if you try and encode it or output it to_s without
@@ -1496,26 +1486,11 @@ def add_content_transfer_encoding
14961486 header [ :content_transfer_encoding ] ||= body . default_encoding
14971487 end
14981488
1499- def add_transfer_encoding # :nodoc:
1500- warn ( ":add_transfer_encoding is deprecated in Mail 1.4.3. Please use add_content_transfer_encoding\n #{ caller } " )
1501- add_content_transfer_encoding
1502- end
1503-
1504- def transfer_encoding # :nodoc:
1505- warn ( ":transfer_encoding is deprecated in Mail 1.4.3. Please use content_transfer_encoding\n #{ caller } " )
1506- content_transfer_encoding
1507- end
1508-
15091489 # Returns the MIME media type of part we are on, this is taken from the content-type header
15101490 def mime_type
15111491 has_content_type? ? header [ :content_type ] . string : nil rescue nil
15121492 end
15131493
1514- def message_content_type
1515- warn ( ":message_content_type is deprecated in Mail 1.4.3. Please use mime_type\n #{ caller } " )
1516- mime_type
1517- end
1518-
15191494 # Returns the character set defined in the content type field
15201495 def charset
15211496 if @header
@@ -1542,12 +1517,6 @@ def sub_type
15421517 has_content_type? ? header [ :content_type ] . sub_type : nil rescue nil
15431518 end
15441519
1545- # Returns the content type parameters
1546- def mime_parameters
1547- warn ( ':mime_parameters is deprecated in Mail 1.4.3, please use :content_type_parameters instead' )
1548- content_type_parameters
1549- end
1550-
15511520 # Returns the content type parameters
15521521 def content_type_parameters
15531522 has_content_type? ? header [ :content_type ] . parameters : nil rescue nil
@@ -1816,11 +1785,6 @@ def ready_to_send!
18161785 add_required_fields
18171786 end
18181787
1819- def encode!
1820- warn ( "Deprecated in 1.1.0 in favour of :ready_to_send! as it is less confusing with encoding and decoding." )
1821- ready_to_send!
1822- end
1823-
18241788 # Outputs an encoded string representation of the mail message including
18251789 # all headers, attachments, etc. This is an encoded email in US-ASCII,
18261790 # so it is able to be directly sent to an email server.
0 commit comments