From: Dirk Koopman <djk@tobit.co.uk>
Date: Wed, 27 Oct 2010 17:02:15 +0000 (+0100)
Subject: fix chat problem introdcued last update
X-Git-Tag: 1.56~20
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=67e8ed5e4e28a5af4cec3bc1b43ce97ef51c90be;p=spider.git

fix chat problem introdcued last update
---

diff --git a/Changes b/Changes
index ec702acd..0ab94e06 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+27Oct10=======================================================================
+1. fix chat problem introduced in the last update
 25Oct10=======================================================================
 1. Drop PC12s purporting to originate at nodes that do PC9x (suggestion from
 Lee VE1CC).
diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 92a36d1e..494b4348 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -795,20 +795,15 @@ sub send_chat
 	# send it if it isn't the except list and isn't isolated and still has a hop count
 	# taking into account filtering and so on
 	foreach $dxchan (@dxchan) {
-		my $is_ak1a = $dxchan->is_ak1a;
-
 		if ($dxchan->is_node) {
 			next if $dxchan == $main::me;
 			next if $dxchan == $self;
-			next if $from_pc9x && $dxchan->{do_pc9x};
-			next unless $dxchan->is_spider || $is_ak1a;
+			next if $from_pc9x && $dxchan->do_pc9x;
+			next unless $dxchan->is_spider && $dxchan->do_pc9x;
 			next if $target eq 'LOCAL';
-			if (!$ak1a_line && $is_ak1a) {
-				$ak1a_line = pc12($_[0], $text, $_[1], "$target.LST");
-			}
 		}
 
-		$dxchan->chat($is_ak1a ? $ak1a_line : $line, $self->{isolate}, $target, $_[1],
+		$dxchan->chat($line, $self->{isolate}, $target, $_[1],
 					  $text, @_, $self->{call}, @a[0..2], @b[0..2]);
 	}
 }
diff --git a/perl/DXProtHandle.pm b/perl/DXProtHandle.pm
index 80e8194e..213e9b40 100644
--- a/perl/DXProtHandle.pm
+++ b/perl/DXProtHandle.pm
@@ -1994,9 +1994,7 @@ sub handle_93
 		return if $via eq 'LOCAL';
 	} elsif (!is_callsign($to) && $text =~ /^#\d+ /) {
 		# chat messages to non-pc9x nodes
-		# don't do this anymore. It is too disruptive 'cos other software does not
-		# understand PC12 groups.
-#		$self->send_chat(1, pc12($from, $text, undef, $to, undef, $pcall), $from, '*', $text, $to, $pcall, '0');
+		$self->send_chat(1, pc12($from, $text, undef, $to, undef, $pcall), $from, '*', $text, $to, $pcall, '0');
 	}
 
 	# broadcast this chat sentence everywhere unless it is targetted to 'LOCAL'
diff --git a/perl/Version.pm b/perl/Version.pm
index 73164109..7da8dbd0 100644
--- a/perl/Version.pm
+++ b/perl/Version.pm
@@ -11,7 +11,7 @@ use vars qw($version $subversion $build $gitversion);
 
 $version = '1.55';
 $subversion = '0';
-$build = '79';
-$gitversion = '450f32d';
+$build = '80';
+$gitversion = 'fc55b5f';
 
 1;