[911] in BarnOwl Developers
[D-O-H] r898 - in trunk/owl: . perl/modules/IRC/lib/BarnOwl/Module perl/modules/IRC/lib/BarnOwl/Module/IRC
daemon@ATHENA.MIT.EDU (geofft@MIT.EDU)
Thu Oct 29 18:11:02 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
Date: Fri, 18 Jan 2008 08:58:54 -0500 (EST)
To: dirty-owl-hackers@mit.edu
From: geofft@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Author: geofft
Date: 2008-01-18 08:58:53 -0500 (Fri, 18 Jan 2008)
New Revision: 898
Modified:
trunk/owl/Makefile.in
trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC.pm
trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm
trunk/owl/perlwrap.pm
Log:
* minor changes to IRC
* run ./svkversion only once rather than at every cc
* fix one-line style to format logouts, not just logins
Modified: trunk/owl/Makefile.in
===================================================================
--- trunk/owl/Makefile.in 2008-01-18 01:24:57 UTC (rev 897)
+++ trunk/owl/Makefile.in 2008-01-18 13:58:53 UTC (rev 898)
@@ -10,7 +10,7 @@
CC=@CC@
LIBS=@LIBS@ -L./libfaim -lfaim
-CFLAGS=@CFLAGS@ -I. -I./libfaim -DDATADIR=\"${datadir}\" -DOWL_SVN_REVNO=`./svkversion`
+CFLAGS=@CFLAGS@ -I. -I./libfaim -DDATADIR=\"${datadir}\" -DOWL_SVN_REVNO=$(shell ./svkversion)
LDFLAGS=@LDFLAGS@
XSUBPPDIR=@XSUBPPDIR@
XSUBPPFLAGS=@XSUBPPFLAGS@
Modified: trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm
===================================================================
--- trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm 2008-01-18 01:24:57 UTC (rev 897)
+++ trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm 2008-01-18 13:58:53 UTC (rev 898)
@@ -45,11 +45,13 @@
$self->motd("");
$self->connected(0);
+ $self->conn->add_handler(376 => sub { shift; $self->on_connect(@_) });
$self->conn->add_default_handler(sub { shift; $self->on_event(@_) });
$self->conn->add_handler(['msg', 'notice', 'public', 'caction'],
sub { shift; $self->on_msg(@_) });
$self->conn->add_handler(['welcome', 'yourhost', 'created',
- 'luserclient', 'luserop', 'luserchannels', 'luserme'],
+ 'luserclient', 'luserop', 'luserchannels', 'luserme',
+ 'notice', 'error'],
sub { shift; $self->on_admin_msg(@_) });
$self->conn->add_handler(['myinfo', 'map', 'n_local', 'n_global',
'luserconns'],
Modified: trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC.pm
===================================================================
--- trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC.pm 2008-01-18 01:24:57 UTC (rev 897)
+++ trunk/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC.pm 2008-01-18 13:58:53 UTC (rev 898)
@@ -161,7 +161,13 @@
SSL => $ssl
);
- $ircnets{$alias} = $conn;
+ if ($conn->connected) {
+ BarnOwl::admin_message("IRC", "Connected to $alias as $nick");
+ $ircnets{$alias} = $conn;
+ } else {
+ die("IRC::Connection->connect failed: $!");
+ }
+
return;
}
Modified: trunk/owl/perlwrap.pm
===================================================================
--- trunk/owl/perlwrap.pm 2008-01-18 01:24:57 UTC (rev 897)
+++ trunk/owl/perlwrap.pm 2008-01-18 13:58:53 UTC (rev 898)
@@ -846,7 +846,7 @@
# if ( $m->is_zephyr ) {
# return format_zephyr($m);
# }
- if ( $m->is_login ) {
+ if ( $m->is_loginout ) {
return format_login($m);
}
elsif ( $m->is_ping) {
