[988] in BarnOwl Developers
[D-O-H] r975 - in branches/barnowl_unicode: . owl/perl/modules/IRC/lib/BarnOwl/Module/IRC owl/perl/modules/Jabber/lib/Net/XMPP
daemon@ATHENA.MIT.EDU (asedeno@MIT.EDU)
Thu Oct 29 18:11:53 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 19:29:04 -0500 (EST)
Author: asedeno
Date: 2008-02-28 19:29:03 -0500 (Thu, 28 Feb 2008)
New Revision: 975
Modified:
branches/barnowl_unicode/
branches/barnowl_unicode/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm
branches/barnowl_unicode/owl/perl/modules/Jabber/lib/Net/XMPP/Connection.pm
Log:
Merged revisions 972-974 via svnmerge from
file:///afs/sipb.mit.edu/project/barnowl/src/svn/trunk
........
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.
........
Property changes on: branches/barnowl_unicode
___________________________________________________________________
Name: svnmerge-integrated
- /trunk:1-971
+ /trunk:1-974
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-29 00:27:35 UTC (rev 974)
+++ branches/barnowl_unicode/owl/perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm 2008-02-29 00:29:03 UTC (rev 975)
@@ -125,7 +125,7 @@
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 {
Modified: branches/barnowl_unicode/owl/perl/modules/Jabber/lib/Net/XMPP/Connection.pm
===================================================================
--- branches/barnowl_unicode/owl/perl/modules/Jabber/lib/Net/XMPP/Connection.pm 2008-02-29 00:27:35 UTC (rev 974)
+++ branches/barnowl_unicode/owl/perl/modules/Jabber/lib/Net/XMPP/Connection.pm 2008-02-29 00:29:03 UTC (rev 975)
@@ -213,6 +213,7 @@
$self->{CONNECTED} = 0;
$self->{DISCONNECTED} = 1;
$self->{DEBUG}->Log1("Disconnect: bye bye");
+ $self->{DEBUG}->GetHandle()->close();
}
