[425] in BarnOwl Developers
[D-O-H] r556 - in trunk: . owl/perl/modules
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:06:01 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
Date: Tue, 23 Jan 2007 21:56:58 -0500
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-To: dirty-owl-hackers@MIT.EDU
Author: nelhage
Date: 2007-01-23 21:56:58 -0500 (Tue, 23 Jan 2007)
New Revision: 556
Modified:
trunk/
trunk/owl/perl/modules/jabber.pl
Log:
r18175@phanatique: nelhage | 2007-01-23 21:56:55 -0500
removeConnection should actually remove the connection, even if it's
undef.
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:18171
+ bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:18175
Modified: trunk/owl/perl/modules/jabber.pl
===================================================================
--- trunk/owl/perl/modules/jabber.pl 2007-01-23 23:36:41 UTC (rev 555)
+++ trunk/owl/perl/modules/jabber.pl 2007-01-24 02:56:58 UTC (rev 556)
@@ -140,9 +140,10 @@
sub removeConnection {
my $self = shift;
my $jidStr = shift;
- return 0 unless exists $self->{$jidStr}->{Client};
+ return 0 unless exists $self->{$jidStr};
- $self->{$jidStr}->{Client}->Disconnect();
+ $self->{$jidStr}->{Client}->Disconnect()
+ if $self->{$jidStr}->{Client};
delete $self->{$jidStr};
return 1;