Changeset 5ff830a

Timestamp:

Jan 18, 2008, 8:58:53 AM (17 years ago)

Author:

Geoffrey Thomas <geofft@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

10e3963

Parents:

eebef19

Message:

* minor changes to IRC
* run ./svkversion only once rather than at every cc
* fix one-line style to format logouts, not just logins

Files:

• Makefile.in (modified) (1 diff)
• perl/modules/IRC/lib/BarnOwl/Module/IRC.pm (modified) (1 diff)
• perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm (modified) (1 diff)
• perlwrap.pm (modified) (1 diff)

Makefile.in

@@ -11 +11 @@
 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@

perl/modules/IRC/lib/BarnOwl/Module/IRC.pm

@@ -162 +162 @@
        );
 
-    $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;
 }

perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm

@@ -46 +46 @@
     $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',

perlwrap.pm

@@ -847 +847 @@
 #    return format_zephyr($m);
 #  }
-  if ( $m->is_login ) {
+  if ( $m->is_loginout ) {
     return format_login($m);
   }