[992] in BarnOwl Developers
[D-O-H] r977 - in branches/barnowl_sqlite: . owl owl/perl/lib/BarnOwl owl/perl/modules/IRC/lib/BarnOwl/Module/IRC owl/perl/modules/Jabber/lib/Net/XMPP
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:11:56 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
X-Original-To: nelhage@nelhage.com
To: dirty-owl-hackers@MIT.EDU
From: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Sat, 1 Mar 2008 18:44:05 -0500 (EST)
Author: nelhage
Date: 2008-03-01 18:44:04 -0500 (Sat, 01 Mar 2008)
New Revision: 977
Modified:
branches/barnowl_sqlite/
branches/barnowl_sqlite/owl/perl/lib/BarnOwl/ModuleLoader.pm
branches/barnowl_sqlite/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm
branches/barnowl_sqlite/owl/perl/modules/Jabber/lib/Net/XMPP/Connection.pm
branches/barnowl_sqlite/owl/text.c
Log:
Merged revisions 965-976 via svnmerge from
svn+ssh://lunatique.mit.edu/mit/barnowl/src/svn/trunk
........
r966 | austein | 2008-02-24 03:39:48 -0500 (Sun, 24 Feb 2008) | 1 line
HTML Filtering fix for BODY tag
........
r971 | nelhage | 2008-02-28 18:13:45 -0500 (Thu, 28 Feb 2008) | 2 lines
Add parenthesis to fix a perl error in IRC
........
r973 | nelhage | 2008-02-28 18:18:54 -0500 (Thu, 28 Feb 2008) | 2 lines
Make IRC admin messages actually display their content
........
r974 | asedeno | 2008-02-28 19:27:35 -0500 (Thu, 28 Feb 2008) | 1 line
Fix a file descriptor leak.
........
r976 | nelhage | 2008-03-01 18:41:46 -0500 (Sat, 01 Mar 2008) | 2 lines
Fix loading PAR modules that weren't present at startup
........
Property changes on: branches/barnowl_sqlite
___________________________________________________________________
Name: svnmerge-integrated
- /trunk:1-964
+ /trunk:1-976
Modified: branches/barnowl_sqlite/owl/perl/lib/BarnOwl/ModuleLoader.pm
===================================================================
--- branches/barnowl_sqlite/owl/perl/lib/BarnOwl/ModuleLoader.pm 2008-03-01 23:41:46 UTC (rev 976)
+++ branches/barnowl_sqlite/owl/perl/lib/BarnOwl/ModuleLoader.pm 2008-03-01 23:44:04 UTC (rev 977)
@@ -9,6 +9,8 @@
sub load_all {
PAR::reload_libs();
+ PAR->import(BarnOwl::get_data_dir() . "/modules/*.par");
+ PAR->import(BarnOwl::get_config_dir() . "/modules/*.par");
my %modules;
my @modules;
Modified: branches/barnowl_sqlite/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm
===================================================================
--- branches/barnowl_sqlite/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm 2008-03-01 23:41:46 UTC (rev 976)
+++ branches/barnowl_sqlite/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm 2008-03-01 23:44:04 UTC (rev 977)
@@ -125,22 +125,22 @@
BarnOwl::admin_message("IRC",
BarnOwl::Style::boldify('IRC ' . $evt->type . ' message from '
. $self->alias) . "\n"
- . strip_irc_formatting(join '\n', cdr $evt->args));
+ . strip_irc_formatting(join '\n', $evt->args));
}
sub on_motdstart {
my ($self, $evt) = @_;
- $self->motd(join "\n", cdr $evt->args);
+ $self->motd(join "\n", cdr($evt->args));
}
sub on_motd {
my ($self, $evt) = @_;
- $self->motd(join "\n", $self->motd, cdr $evt->args);
+ $self->motd(join "\n", $self->motd, cdr($evt->args));
}
sub on_endofmotd {
my ($self, $evt) = @_;
- $self->motd(join "\n", $self->motd, cdr $evt->args);
+ $self->motd(join "\n", $self->motd, cdr($evt->args));
if(!$self->connected) {
BarnOwl::admin_message("IRC", "Connected to " .
$self->server . " (" . $self->alias . ")");
Modified: branches/barnowl_sqlite/owl/perl/modules/Jabber/lib/Net/XMPP/Connection.pm
===================================================================
--- branches/barnowl_sqlite/owl/perl/modules/Jabber/lib/Net/XMPP/Connection.pm 2008-03-01 23:41:46 UTC (rev 976)
+++ branches/barnowl_sqlite/owl/perl/modules/Jabber/lib/Net/XMPP/Connection.pm 2008-03-01 23:44:04 UTC (rev 977)
@@ -213,6 +213,7 @@
$self->{CONNECTED} = 0;
$self->{DISCONNECTED} = 1;
$self->{DEBUG}->Log1("Disconnect: bye bye");
+ $self->{DEBUG}->GetHandle()->close();
}
Modified: branches/barnowl_sqlite/owl/text.c
===================================================================
--- branches/barnowl_sqlite/owl/text.c 2008-03-01 23:41:46 UTC (rev 976)
+++ branches/barnowl_sqlite/owl/text.c 2008-03-01 23:44:04 UTC (rev 977)
@@ -166,7 +166,7 @@
}
/* look for things we know */
- if (!strncasecmp(ptr2, "<BODY ", 6) ||
+ if (!strncasecmp(ptr2, "<BODY", 5) ||
!strncasecmp(ptr2, "<FONT", 5) ||
!strncasecmp(ptr2, "<HTML", 5) ||
!strncasecmp(ptr2, "</FONT", 6) ||
