""

plugins/Tk-Convo/Milkbone/Convo.pm

@@ -6,10 +6,12 @@ use Milkbone;
 
 our $VERSION = '1.0';
 
-use Tk(Ev);
+use Tk qw(Ev);
-use base qw(Tk::Toplevel);
+use Tk::widgets qw(Frame);
+use base qw(Tk::Frame);
 use strict;
 use warnings;
+use Tk::BrowseEdit;
 
 Construct Tk::Widget 'MBConvo';
 
@@ -175,36 +177,24 @@ sub init
 {
     my ($self, $mw, $buddy) = @_;
 
-	$self->withdraw();
-
-	$self->title("$buddy - Conversation");
     $self->update;
     
     # WIDGET CREATION BEGIN
 
-	$self->{menu} = $self->Menu;
-
-	$self->{menu_file} = $self->{menu}->cascade(-label => "File", -tearoff => 0);
-	$self->{menu_file}->command(-label => "Close", -command => [$self, "destroy"]);
-
-	$self->configure(-menu => $self->{menu});
-
-	$self->{frame} = $self->Frame(-borderwidth => 0)->pack(-expand => 1, -fill => 'both');
-
     $self->{off} = 0;
     $self->{hide_stamps} = 1;
 
-	$self->{top} = $self->{frame}->Scrolled("Browser", 
+    $self->{top} = $self->Scrolled("Browser", 
                                    -height => 6, -font => "times 12", -scrollbars => 'oe', -wrap => 'word', -takefocus => 0)->
                                        pack(-side => 'top', -expand => 1, -fill => 'both', -padx => 5);
-	$self->{bottom} = $self->{frame}->Scrolled("BrowseEdit",
+    $self->{bottom} = $self->Scrolled("BrowseEdit",
                                       -height => 6, -font => "times 12", -scrollbars => 'oe', -wrap => 'word',
                                       -spacing1 => 0, -spacing2 => 0, -spacing3 => 0)->
                                           pack(-expand => 1, -fill => 'both', -padx => 5);
-	$self->{typing} = $self->{frame}->Label->pack(-anchor => 'w');
+    $self->{typing} = $self->Label->pack(-anchor => 'w');
-	$self->{frame}->Button(-text => "Send", -command => [$self, "on_send"])->
+    $self->Button(-text => "Send", -command => [$self, "on_send"])->
         pack(-pady => 3, -side => 'right', -anchor => 'center');
-	$self->{frame}->Button(-text => "Get Profile", -command => [$self, "on_prof"])->
+    $self->Button(-text => "Get Profile", -command => [$self, "on_prof"])->
         pack(-pady => 3, -side => 'left', -anchor => 'center');
 
     # WIDGET CREATION END
@@ -216,7 +206,6 @@ sub init
 
     $self->{bottom}->bind("<Return>", [$self, "on_send"]);
     $self->{bottom}->bind("<Control-Return>", [sub { $self->{bottom}->insert('insert', "\r\n")}, $self]);
-	$self->{bottom}->bind("<Escape>", [$self, "destroy"]);	
     $self->{bottom}->bind("<KeyPress>", [$self, "on_key"]);
     $self->bind("<F2>", [$self, "toggle_stamps"]);
 
@@ -235,11 +224,6 @@ sub init
     $self->{last_typed} = time;
     $self->{typing_status} = 0;
 
-	$self->update;
-	$self->geometry("480x320");
-	$self->deiconify;
-	hook("tk_seticon", -wnd => $self);
-	$self->OnDestroy([$self, "on_destroy"]);
     $self->{bottom}->focus;
     $self->{rep_id} = $self->repeat(1000, [$self, "update_status"]);
 }

plugins/Tk-Convo/Milkbone/ConvoTL.pm

@@ -0,0 +1,68 @@
+# milkbone - conversation window
+
+package Milkbone::ConvoTL;
+
+use Milkbone;
+use Milkbone::Convo;
+
+our $VERSION = '1.0';
+
+use Tk(Ev);
+use base qw(Tk::Toplevel);
+use strict;
+use warnings;
+
+Construct Tk::Widget 'MBConvoTL';
+
+sub ClassInit
+{
+    my ($class, $mw) = @_;
+    $class->SUPER::ClassInit($mw);
+}
+
+sub Populate
+{
+    my ($self, $args) = @_;
+    $self->SUPER::Populate($args);
+
+    $self->ConfigSpecs('DEFAULT' => ['SELF']);
+}
+
+sub on_destroy
+{
+    my ($self) = @_;
+    hook("remove_convo", -user => shift->{buddy});
+    hook("protocol_set_typing_status", -user => $self->{buddy}, -status => 0);
+}
+
+sub init
+{
+    my ($self, $mw, $buddy) = @_;
+    $self->{buddy} = $buddy;
+    
+    $self->withdraw();
+
+    $self->title("$buddy - Conversation");
+    $self->update;
+    
+    # WIDGET CREATION BEGIN
+
+    $self->{menu} = $self->Menu;
+
+    $self->{menu_file} = $self->{menu}->cascade(-label => "File", -tearoff => 0);
+    $self->{menu_file}->command(-label => "Close", -command => [$self, "destroy"]);
+
+    $self->configure(-menu => $self->{menu});
+
+    $self->{convo} = $self->MBConvo->pack(-expand => 1, -fill => 'both');
+    $self->bind("<Escape>", [$self, "destroy"]);
+    $self->{convo}->init($mw, $buddy);
+
+    $self->update;
+    $self->geometry("480x320");
+    $self->deiconify;
+    hook("tk_seticon", -wnd => $self);
+    $self->OnDestroy([$self, "on_destroy"]);
+}
+
+1;

plugins/Tk-Convo/Tk-Convo.pl

@@ -1,6 +1,6 @@
 package TkConvo;
 
-use Milkbone::Convo;
+use Milkbone::ConvoTL;
 use Tk::Browser;
 use Tk::BrowseEdit;
 use Milkbone;
@@ -18,8 +18,8 @@ register_hook("create_convo", sub {
     return if(exists $convos{$buddy});
     $convos{$buddy} = 1;
 
-	$convo = $mw->MBConvo;
+    $convo = $mw->MBConvoTL;
-	$convo->init($mw, hook("protocol_get_realname", -user => $buddy) || $buddy);
+    $convo->init($mw, $buddy);
 
     $convos{$buddy} = $convo;
 
@@ -28,28 +28,27 @@ register_hook("create_convo", sub {
         {
             hook("create_convo", -user => hook("protocol_get_realname", -user => $ARGS{-user}));
         }
-		$convos{$ARGS{-user}}->on_receive(@ARGS{-from, -msg, -away});
+        $convos{$ARGS{-user}}->{convo}->on_receive(@ARGS{-from, -msg, -away});
         hook("flash_window", -wnd => $convo);
     });
 
     register_hook("protocol_typing_status_changed_$buddy", sub {
-		$ARGS{-self}->typing_status($ARGS{-status});
+        $ARGS{-self}->{convo}->typing_status($ARGS{-status});
     }, {-self => $convo});
 
-	register_hook("msg_sent_$buddy", sub {
+    register_hook("protocol_send_im", sub {
-		$ARGS{-self}->msg_sent(@ARGS{-msg, -away});
+        $ARGS{-self}->{convo}->msg_sent(@ARGS{-msg, -away});
     }, {-self => $convo});
 
     register_hook("buddy_in_$buddy", sub {
-		$ARGS{-self}->on_buddy_in();
+        $ARGS{-self}->{convo}->on_buddy_in();
     }, {-self => $convo});
 
     register_hook("buddy_out_$buddy", sub {
-		$ARGS{-self}->on_buddy_out();
+        $ARGS{-self}->{convo}->on_buddy_out();
     }, {-self => $convo});
 
     $convo->focus;
-	$convo->{bottom}->focus;
 
     $convo->withdraw if hook("protocol_away_status") != 0;
     $convo->update;