fixed the talk problem

diff --git a/Changes b/Changes
index 2e0246e1cfb369894afa75a410ba6ce6a8215984..fbe3c8f658211bbd01978c63841e5f80bd82a482 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,5 @@
+15Aug01=======================================================================
+1. fix problem with talks not coming out anymore
 13Aug01=======================================================================
 1. fixed problem of dxspots not being echoed back to spotter (announces too)
 02Aug01=======================================================================

diff --git a/gtkconsole/gtkconsole b/gtkconsole/gtkconsole
index e545824407873ad2515aead2654d7412697d894d..3b65d0e6ec76672edb26d9bb1bf01727d701a8e3 100755 (executable)
--- a/gtkconsole/gtkconsole
+++ b/gtkconsole/gtkconsole
@@ -114,7 +114,6 @@ $bot->set_editable(1);
 $bot->signal_connect('activate', \&bothandler);
 $bot->can_default(1);
 $bot->grab_default;
-$bot->grab_focus;
 $bot->show;
 
 # a horizontal box
@@ -142,6 +141,7 @@ $vbox->pack_start($bot, 0, 1, 0);
 
 # the main loop
 $main->show_all;
+$bot->grab_focus;
 Gtk->main;
 
 #
@@ -174,6 +174,7 @@ sub bothandler
        my $msg = $self->get_text;
        $msg =~ s/\r?\n$//;
        $self->set_text('');
+       $self->grab_focus;
        senddata($msg);
 }
 
@@ -212,9 +213,11 @@ sub handlemsg
        my $msg = shift;
        my ($sort, $call, $line) = $msg =~ /^(\w)([^\|]+)\|(.*)$/;
        if ($sort eq 'D') {
-               $toplist->insert($toplist->{font}, undef, undef, "$line\n");
+               $toplist->insert($toplist->{font}, undef, undef, "$line\n");    
        } elsif ($sort eq 'X') {
                $toplist->insert($toplist->{font}, undef, undef, "$line\n");
+       } elsif ($sort eq 'T') {
+               $toplist->insert($toplist->{font}, undef, undef, "$line\n");
        } elsif ($sort eq 'Y') {
                $toplist->insert($toplist->{font}, undef, undef, "$line\n");
        } elsif ($sort eq 'V') {

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index eef342bc7dbd718b40ad203f80c5e0f61d6883ee..2f3d85f23b95492424846bb05acbe4381106deca 100644 (file)
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -649,7 +649,7 @@ sub talk
 {
        my ($self, $from, $to, $via, $line) = @_;
        $line =~ s/\\5E/\^/g;
-       $self->send_later('T', "$to de $from: $line") if $self->{talk};
+       $self->local_send('T', "$to de $from: $line") if $self->{talk};
        Log('talk', $to, $from, $main::mycall, $line);
        # send a 'not here' message if required
        unless ($self->{here} && $from ne $to) {