[394] in BarnOwl Developers
[D-O-H] r532 - in trunk: . owl/perl/modules
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:05:40 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
Date: Tue, 16 Jan 2007 12:39:05 -0500
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-To: dirty-owl-hackers@MIT.EDU
Author: nelhage
Date: 2007-01-16 12:39:05 -0500 (Tue, 16 Jan 2007)
New Revision: 532
Modified:
trunk/
trunk/owl/perl/modules/jabber.pl
Log:
r18008@phanatique: nelhage | 2007-01-16 12:38:58 -0500
Some jmuc presence bugfixes
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:18006
+ bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:18008
Modified: trunk/owl/perl/modules/jabber.pl
===================================================================
--- trunk/owl/perl/modules/jabber.pl 2007-01-16 17:14:33 UTC (rev 531)
+++ trunk/owl/perl/modules/jabber.pl 2007-01-16 17:39:05 UTC (rev 532)
@@ -73,7 +73,7 @@
$muc->Leave();
- $self->{_BARNOWL_MUCS} = grep {$_ != $muc} $self->MUCs;
+ $self->{_BARNOWL_MUCS} = [grep {$_->BaseJID ne $muc->BaseJID} $self->MUCs];
}
=head2 FindMUC ARGS
@@ -689,12 +689,15 @@
sub jmuc_presence {
my ( $jid, $muc, @args ) = @_;
+ $muc = shift @args if scalar @args;
+ die("Usage: jmuc presence MUC") unless $muc;
+
my $m = $conn->getConnectionFromJidStr($jid)->FindMUC(jid => $muc);
die("No such muc: $muc") unless $m;
my @jids = $m->Presence();
BarnOwl::popless_ztext("JIDs present in " . $m->BaseJID . "\n\t" .
- join("\n\t", map {$_->GetResource}@jids));
+ join("\n\t", map {$_->GetResource}@jids) . "\n");
}
