Changeset 72a53e9 for perl/lib

Timestamp:

Jan 21, 2007, 6:29:01 PM (18 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

585bdc3

Parents:

52891b5

Message:

Update to Roster.pm to not blow away presence information for a jid
on every roster update for that jid.

File:

• perl/lib/Net/XMPP/Roster.pm (modified) (2 diffs)

perl/lib/Net/XMPP/Roster.pm

@@ -270 +270 @@
 
     $jid = $jid->GetJID() if UNIVERSAL::isa($jid,"Net::XMPP::JID");
-
-    $self->{JIDS}->{$jid} = \%item;
-
+    if (exists $self->{JIDS}->{$jid})
+    {
+        foreach my $key (keys %item)
+        {
+            $self->{JIDS}->{$jid}->{$key} = $item{$key};
+        }
+    }
+    else
+    {
+        $self->{JIDS}->{$jid} = \%item;
+
+    }
     foreach my $group (@{$item{groups}})
     {
-        $self->{GROUPS}->{$group}->{$jid} = 1;
+        $self->{GROUPS}->{$group}->{$jid} = 1;
     }
 }
@@ -440 +449 @@
     foreach my $jid (keys(%{$roster}))
     {
-        $self->remove($jid);
-
         if ($roster->{$jid}->{subscription} ne "remove")
         {
             $self->add($jid, %{$roster->{$jid}});
+        }
+        else
+        {
+            $self->remove($jid);
         }
     }