[986] in BarnOwl Developers
[D-O-H] r972 - in branches/barnowl_unicode: . owl owl/perl/modules/IRC/lib/BarnOwl/Module/IRC
daemon@ATHENA.MIT.EDU (asedeno@MIT.EDU)
Thu Oct 29 18:11:52 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: asedeno@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Thu, 28 Feb 2008 18:18:35 -0500 (EST)
Author: asedeno
Date: 2008-02-28 18:18:34 -0500 (Thu, 28 Feb 2008)
New Revision: 972
Modified:
branches/barnowl_unicode/
branches/barnowl_unicode/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm
branches/barnowl_unicode/owl/text.c
Log:
Merged revisions 964-971 via svnmerge from
file:///afs/sipb.mit.edu/project/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
........
Property changes on: branches/barnowl_unicode
___________________________________________________________________
Name: svnmerge-integrated
- /trunk:1-963
+ /trunk:1-971
Modified: branches/barnowl_unicode/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm
===================================================================
--- branches/barnowl_unicode/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm 2008-02-28 23:13:45 UTC (rev 971)
+++ branches/barnowl_unicode/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm 2008-02-28 23:18:34 UTC (rev 972)
@@ -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', cdr($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_unicode/owl/text.c
===================================================================
--- branches/barnowl_unicode/owl/text.c 2008-02-28 23:13:45 UTC (rev 971)
+++ branches/barnowl_unicode/owl/text.c 2008-02-28 23:18:34 UTC (rev 972)
@@ -193,7 +193,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) ||
