change method: data() -> data_in_body_part()

4 files changed, 14 insertions, 14 deletions

diff --git a/fml/lib/FML/Filter/BodyCheck.pm b/fml/lib/FML/Filter/BodyCheck.pm
index 9fd5d228..254c2654 100644
--- a/fml/lib/FML/Filter/BodyCheck.pm
+++ b/fml/lib/FML/Filter/BodyCheck.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: BodyCheck.pm,v 1.7 2001/09/23 14:30:35 fukachan Exp $
+# $FML: BodyCheck.pm,v 1.8 2001/10/14 22:25:31 fukachan Exp $
 #
 
 package FML::Filter::BodyCheck;
@@ -272,7 +272,7 @@ sub reject_one_line_message
 sub reject_old_fml_command_syntax
 {
     my ($self, $msg, $args, $first_msg) = @_;
-    my $buf = $first_msg->data;
+    my $buf = $first_msg->data_in_body_part;
 
     if ($buf =~ /^[\s\n]*(\#\s*[\w\d\:\-\s]+)[\n\s]*$/) {
 	my $r = $1; 
@@ -286,7 +286,7 @@ sub reject_old_fml_command_syntax
 sub reject_invalid_fml_command_syntax
 {
     my ($self, $msg, $args, $first_msg) = @_;
-    my $buf = $first_msg->data;
+    my $buf = $first_msg->data_in_body_part;
 
     if ($buf =~ /^[\s\n]*\%\s*echo.*/i) {
 	croak "invalid command in the mail body";
@@ -308,7 +308,7 @@ sub reject_invalid_fml_command_syntax
 sub reject_japanese_command_syntax
 {
     my ($self, $msg, $args, $first_msg) = @_;
-    my $buf = $first_msg->data;
+    my $buf = $first_msg->data_in_body_part;
 
     if ($buf =~ /\033\044\102(\043[\101-\132\141-\172])/) {
 	# trap /JIS"2byte"[A-Za-z]+/
diff --git a/fml/lib/Mail/Bounce/DSN.pm b/fml/lib/Mail/Bounce/DSN.pm
index 298112a0..92f36b72 100644
--- a/fml/lib/Mail/Bounce/DSN.pm
+++ b/fml/lib/Mail/Bounce/DSN.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: DSN.pm,v 1.9 2001/07/31 12:56:21 fukachan Exp $
+# $FML: DSN.pm,v 1.10 2001/09/18 03:31:32 fukachan Exp $
 #
 
 
@@ -85,7 +85,7 @@ sub analyze
 
     if (defined $m) {
 	# data in the part
-	my $data = $m->data;
+	my $data = $m->data_in_body_part;
 	my $n    = $m->num_paragraph;
 
 	for (my $i = 0; $i < $n; $i++) {
diff --git a/fml/lib/Mail/HTML/Lite.pm b/fml/lib/Mail/HTML/Lite.pm
index ee5a926d..307c7d17 100644
--- a/fml/lib/Mail/HTML/Lite.pm
+++ b/fml/lib/Mail/HTML/Lite.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself. 
 #
-# $FML: Lite.pm,v 1.19 2001/10/22 16:09:12 fukachan Exp $
+# $FML: Lite.pm,v 1.20 2001/10/23 07:41:57 fukachan Exp $
 #
 
 package Mail::HTML::Lite;
@@ -15,7 +15,7 @@ use Carp;
 my $debug = $ENV{'debug'} ? 1 : 0;
 my $URL   = "<A HREF=\"http://www.fml.org/software/\">Mail::HTML::Lite</A>";
 
-my $version = q$FML: Lite.pm,v 1.19 2001/10/22 16:09:12 fukachan Exp $;
+my $version = q$FML: Lite.pm,v 1.20 2001/10/23 07:41:57 fukachan Exp $;
 if ($version =~ /,v\s+([\d\.]+)\s+/) {
     $version = "$URL $1";
 }
@@ -184,7 +184,7 @@ sub htmlfy_rfc822_message
 	elsif ($type eq 'text/plain') {
 	    $self->_text_print({ 
 		fh   => $wh,
-		data => $m->data,
+		data => $m->data_in_body_part(),
 	    });
 	}
 	# message/rfc822 case
diff --git a/fml/lib/Mail/Message.pm b/fml/lib/Mail/Message.pm
index eb823d5f..371a344e 100644
--- a/fml/lib/Mail/Message.pm
+++ b/fml/lib/Mail/Message.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: Message.pm,v 1.31 2001/10/21 15:08:50 fukachan Exp $
+# $FML: Message.pm,v 1.32 2001/10/21 15:29:20 fukachan Exp $
 #
 
 package Mail::Message;
@@ -1713,9 +1713,9 @@ sub _evaluate_pmap
 
 alias of C<header_in_body_part()>.
 
-=head2 C<data()>
+=head2 C<data( ... )>
 
-alias of C<body_in_body_part()>.
+alias of C<body_in_body_part( ... )>.
 
 =cut
 
@@ -1729,8 +1729,8 @@ sub header
 
 sub data
 {
-    my ($self) = @_;
-    $self->data_in_body_part(@_[1 .. $#_]);
+    my ($self, @args) = @_;
+    $self->data_in_body_part(@args);
 }