*** empty log message ***

docs/CREDIT.txt

@@ -6,9 +6,7 @@ greg blair				Special characters
 dave mcpherson				Profile Change Alert
 matthew sachs				Wrote the Net::OSCAR module
 paul christian				Automatic sarcasm
-aj kappe				history of sent messages
 aj kappe				wishbone instead of wishlist
 dan chokola				remote command line
-marc dashevsky				the spiffy BrowseEntry control (not yet used)
 eric thul and bill atkins		plugin/MOS separation
 rob mccool				for documenting httpd.conf and not noticing that we stole his words :)

docs/README.txt

@@ -1,8 +1,10 @@
 milkbone 0.13 README
 -------------------------------------
 
-milkbone is a rewrite of the AOL Instant Messenger client program for the Win32 operating system.  milkbone is 
+milkbone is a rewrite of the AOL Instant Messenger client program for *NIX- 
-written entirely in perl (well, there's a BIT of C) and is open-source freeware.  milkbone may be freely 
+and Win32-based operating systems.  milkbone is 
+written entirely in perl (well, there's a BIT of C) and is open-source 
+freeware.  milkbone may be freely 
 redistributed under the GPL as long as this file remains intact and any modifications to the core are noted.
 
 USE

docs/VERSION.txt

@@ -1,6 +1,8 @@
 0.355
 --
 
+* Notification when your rate limit expires
+* Dropdown in AddBuddy works
 * New interface
 * Your typing status is cleared when you close a convo box
 * Newlines can be sent with Ctrl-Return; also, pasted newlines are sent properly
@@ -35,8 +37,7 @@
 * < and > work in profiles and convos (you can send them as &lt and &gt for now)
 * Splash screen
 * Mouse wheel works in Linux
-* No more boxes in focused widgets on Linux        warn "$ARGS{-user} has been warned";
+* No more boxes in focused widgets on Linux     
-
 * Sounds now play asynchronously on Linux (without starting too many play processes)
 * Fixed weirdness with context menu on Linux
 * Fancier buttons and menus on Linux (a LOT fancier)

mb.conf

@@ -2,10 +2,10 @@
 
 Goodbye sorry, gotta, go
 Modules Tk-PluginsConf, Net-OSCAR, Tk-GUI, Tk-Logon, Tk-BList, Tk-Profile, Tk-File, Tk-About, Tk-AddBuddy, Tk-Convo
-Plugins Sound, XAMP, Templog, Monitor, Counterstrike, hooktest
+Plugins Sound, XAMP, Templog, Monitor, Counterstrike
 Port 5190
 HeavyLogging 0
 SoundsWhileAway 0
-Timeout 60
+AwayTimeout 60
 TrayIcon 1
 HideBListLogo 0

mos.pl

@@ -1,14 +1,14 @@
 #!/usr/bin/perl
 
-# -----------------------------------------------------------------------------
+# ----------------------------------------------------------------------
-# Author(s)	:	Bill Atkins and Eric Thul
+# Author(s)	:	Bill Atkins
 # Title		:	MOS Core
 # Date		:	12.21.02
 # Desc		:	the core for Milkbone
 # QoTP		:	got milkbone?
 # Notes		:	for more information see the plugin documentation	
 # License	:	it's on our TODO list...
-# -----------------------------------------------------------------------------
+# -----------------------------------------------------------------------
 
 use 5.006;
 

plugins/Counterstrike.pl

@@ -1,16 +1,22 @@
 package Counterattack;
 
 use Milkbone;
+use Milkbone::AllHooks;
+use base 'Milkbone::AllHooks';
 
 register_hook("protocol_eviled", sub {
-        warn "$ARGS{-user} has warned you.  Counterstrike initiated.";
+        error(-short => "$ARGS{-user} has warned you.  Counterstrike initiated.");
-        hook("protocol_evil", -user => $ARGS{-user});
+        protocol_evil(-user => $ARGS{-user});
         
         register_hook("msg_in_$ARGS{-user}", sub {
             warn "Counterstrike completed";
-            hook("protocol_evil", -user => $ARGS{-user});
+            protocol_evil(-user => $ARGS{-user});
             deregister_hook("msg_in_$ARGS{-user}");
+        }, {-user => $ARGS{-user}});
 });
+
+register_hook("msg_in", sub {
+    deregister_hook("protocol_eviled");
 });
 
 1;

plugins/Monitor.pl

@@ -8,6 +8,7 @@ sub sendmail
 {
     print "sending message";;
     my ($sub, $text, $user) = @_;
+    $user =~ s/ /_/g;
     my $smtp = Net::SMTP->new('smtpauth.earthlink.net', 
                               Hello => 'milkbone.org', Debug => 1);
 

plugins/Net-OSCAR/Net-OSCAR.pl

@@ -133,10 +133,15 @@ sub signon
 
 	$oscar->set_callback_rate_alert(
 	sub {
+                if($_[1] == RATE_LIMIT)
+                {
                     hook("error", 
-			-short => "You've exceeded one of AOL's rate limits.  Profiles and outgoing IM's may not work for a few seconds")
+                         -short => "You've exceeded one of AOL's rate limits.  You will be alerted when the rate limit ends.");
-			if $_[1] == RATE_LIMIT;
+                    hook("rate_alert");
-		hook("rate_alert") if $_[1] == RATE_LIMIT;
+                    hook("tk_getmain")->after(10 * 1000, sub { 
+                        hook("error", -short => "Rate limit has expired.");
+                    });
+                }
 	} );
 
 	$oscar->set_callback_buddy_info(
@@ -229,7 +234,7 @@ sub request_away
 sub send_away
 {
 	my $user = shift;
-        my $timeout = option("AwayTimeout") || 60;
+        my $timeout = option("AwayTimeout");
 	$away_sent{$user} ||= 1;
 	if (time - $away_sent{$user} > option("AwayTimeout"))
 	{

plugins/Tk-AddBuddy/Milkbone/AddBuddy.pm

@@ -53,7 +53,7 @@ sub init
 
 	$self->Label(-text => 'Group:', -anchor=>'w')->pack();
 	$self->{list} = $self->JBrowseEntry(-width => 16, -takefocus => 1, -variable => \$self->{group},
-		-choices => $groups)->pack(-expand => 1, -fill => 'both');
+		-choices => [sort @$groups])->pack(-expand => 1, -fill => 'both');
 	
 	$self->{buttons}->Button(-text => "Cancel", -command => [ $self, "destroy"])->pack(-pady => 6,  -padx=>6, -side=>'right');
 	$self->{buttons}->Button(-text => "Add", -command => [ $self, "on_add"])->pack(-pady => 6,  -padx=>6, -side=>'right');

plugins/Tk-Convo/Tk-Convo.pl

@@ -27,6 +27,7 @@ register_hook("create_convo", sub {
 	$convos{$buddy} = $convo;
 
 	register_hook("msg_in_$buddy", sub {
+            print "message $ARGS{-msg} received \n\n";
 		if(!$convos{$ARGS{-user}})
 		{
 			hook("create_convo", -user => hook("protocol_get_realname", -user => $ARGS{-user}));