Changeset 3a80471

Timestamp:

2007-11-24T01:13:15Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

608f8cf

Parents:

77bfd07

Message:

(Hopefully) fixing one case where the Jabber module doesn't understand a
<presence type=unavailable> tag properly and keeps showing the buddy as
on-line. (When the tag comes from a bare JID.)

File:

• protocols/jabber/presence.c (modified) (2 diffs)

protocols/jabber/presence.c

@@ -88 +88 @@
         else if( strcmp( type, "unavailable" ) == 0 )
         {
-                if( ( bud = jabber_buddy_by_jid( ic, from, GET_BUDDY_EXACT ) ) == NULL )
+                if( ( bud = jabber_buddy_by_jid( ic, from, 0 ) ) == NULL )
                 {
                         if( set_getbool( &ic->irc->set, "debug" ) )
@@ -101 +101 @@
                 }
                 
-                jabber_buddy_remove( ic, from );
+                if( strchr( from, '/' ) == NULL )
+                        /* Sometimes servers send a type="unavailable" from a
+                           bare JID, which should mean that suddenly all
+                           resources for this JID disappeared. */
+                        jabber_buddy_remove_bare( ic, from );
+                else
+                        jabber_buddy_remove( ic, from );
                 
                 if( is_chat )