[359] in BarnOwl Developers
[D-O-H] r501 - in trunk: . owl/perl/lib/Net/XMPP
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:05:18 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Mon, 8 Jan 2007 21:40:28 -0500 (EST)
Author: nelhage
Date: 2007-01-08 21:40:27 -0500 (Mon, 08 Jan 2007)
New Revision: 501
Modified:
trunk/
trunk/owl/perl/lib/Net/XMPP/Roster.pm
Log:
r17882@phanatique: nelhage | 2007-01-08 21:39:53 -0500
Fixing Net::Jabber bugs. $jid->isa() doesn't do what you want if $jid
is a bare string.
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:17881
+ bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:17882
Modified: trunk/owl/perl/lib/Net/XMPP/Roster.pm
===================================================================
--- trunk/owl/perl/lib/Net/XMPP/Roster.pm 2007-01-09 02:40:11 UTC (rev 500)
+++ trunk/owl/perl/lib/Net/XMPP/Roster.pm 2007-01-09 02:40:27 UTC (rev 501)
@@ -268,7 +268,7 @@
my $self = shift;
my ($jid,%item) = @_;
- $jid = $jid->GetJID() if $jid->isa("Net::XMPP::JID");
+ $jid = $jid->GetJID() if ref($jid) && $jid->isa("Net::XMPP::JID");
$self->{JIDS}->{$jid} = \%item;
@@ -292,7 +292,7 @@
my $resource = shift;
my (%item) = @_;
- $jid = $jid->GetJID() if $jid->isa("Net::XMPP::JID");
+ $jid = $jid->GetJID() if ref($jid) && $jid->isa("Net::XMPP::JID");
my $priority = $item{priority};
$priority = 0 unless defined($priority);
@@ -346,7 +346,7 @@
my $self = shift;
my ($jid) = @_;
- $jid = $jid->GetJID() if $jid->isa("Net::XMPP::JID");
+ $jid = $jid->GetJID() if ref($jid) && $jid->isa("Net::XMPP::JID");
return unless exists($self->{JIDS});
return unless exists($self->{JIDS}->{$jid});
@@ -554,7 +554,7 @@
my $self = shift;
my $jid = shift;
- $jid = $jid->GetJID() if $jid->isa("Net::XMPP::JID");
+ $jid = $jid->GetJID() if ref($jid) && $jid->isa("Net::XMPP::JID");
return unless $self->exists($jid);
@@ -576,7 +576,7 @@
my $jid = shift;
my $resource = shift;
- $jid = $jid->GetJID() if $jid->isa("Net::XMPP::JID");
+ $jid = $jid->GetJID() if ref($jid) && $jid->isa("Net::XMPP::JID");
if (defined($resource))
{
@@ -602,7 +602,7 @@
my $jid = shift;
my $key = shift;
- $jid = $jid->GetJID() if $jid->isa("Net::XMPP::JID");
+ $jid = $jid->GetJID() if ref($jid) && $jid->isa("Net::XMPP::JID");
return unless $self->exists($jid);
if (defined($key))
@@ -624,7 +624,7 @@
my $self = shift;
my $jid = shift;
- $jid = $jid->GetJID() if $jid->isa("Net::XMPP::JID");
+ $jid = $jid->GetJID() if ref($jid) && $jid->isa("Net::XMPP::JID");
if ($self->exists($jid))
{
@@ -659,7 +659,7 @@
my $jid = shift;
my $resource = shift;
- $jid = $jid->GetJID() if $jid->isa("Net::XMPP::JID");
+ $jid = $jid->GetJID() if ref($jid) && $jid->isa("Net::XMPP::JID");
if ($self->resourceExists($jid,$resource))
{
@@ -700,7 +700,7 @@
my $self = shift;
my $jid = shift;
- $jid = $jid->GetJID() if $jid->isa("Net::XMPP::JID");
+ $jid = $jid->GetJID() if ref($jid) && $jid->isa("Net::XMPP::JID");
return unless $self->exists($jid);
@@ -723,7 +723,7 @@
my $jid = shift;
my $resource = shift;
- $jid = $jid->GetJID() if $jid->isa("Net::XMPP::JID");
+ $jid = $jid->GetJID() if ref($jid) && $jid->isa("Net::XMPP::JID");
return unless $self->exists($jid);
return unless exists($self->{JIDS}->{$jid}->{resources});
@@ -744,7 +744,7 @@
my $resource = shift;
my $key = shift;
- $jid = $jid->GetJID() if $jid->isa("Net::XMPP::JID");
+ $jid = $jid->GetJID() if ref($jid) && $jid->isa("Net::XMPP::JID");
return unless $self->resourceExists($jid,$resource);
if (defined($key))
@@ -766,7 +766,7 @@
my $self = shift;
my $jid = shift;
- $jid = $jid->GetJID() if $jid->isa("Net::XMPP::JID");
+ $jid = $jid->GetJID() if ref($jid) && $jid->isa("Net::XMPP::JID");
return () unless $self->exists($jid);
@@ -799,7 +799,7 @@
my $key = shift;
my $value = shift;
- $jid = $jid->GetJID() if $jid->isa("Net::XMPP::JID");
+ $jid = $jid->GetJID() if ref($jid) && $jid->isa("Net::XMPP::JID");
return unless defined($key);
return unless defined($value);
@@ -823,7 +823,7 @@
my $key = shift;
my $value = shift;
- $jid = $jid->GetJID() if $jid->isa("Net::XMPP::JID");
+ $jid = $jid->GetJID() if ref($jid) && $jid->isa("Net::XMPP::JID");
return unless defined($key);
return unless defined($value);
