Changeset 2758cfe

Timestamp:

2007-07-01T15:22:42Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

b9f8b87

Parents:

40ef702

Message:

Properly updating away state info if one resource goes down while another
one's still there. Not sending offline notifications is great, but updating
the away state info is even better. :-)

File:

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

protocols/jabber/presence.c

@@ -31 +31 @@
         struct xt_node *c;
         struct jabber_buddy *bud;
-        int is_chat = 0;
+        int is_chat = 0, is_away = 0;
         char *s;
         
@@ -47 +47 @@
         if( type == NULL )
         {
-                int is_away = 0;
-                
                 if( !( bud = jabber_buddy_by_jid( ic, from, GET_BUDDY_EXACT | GET_BUDDY_CREAT ) ) )
                 {
@@ -113 +111 @@
                         *s = 0;
                 
-                        /* Only count this as offline if there's no other resource
-                           available anymore. */
-                        if( jabber_buddy_by_jid( ic, from, 0 ) == NULL )
+                        /* If another resource is still available, send its presence
+                           information. */
+                        if( ( bud = jabber_buddy_by_jid( ic, from, 0 ) ) )
+                        {
+                                if( bud->away_state && ( *bud->away_state->code == 0 ||
+                                    strcmp( bud->away_state->code, "chat" ) == 0 ) )
+                                        is_away = OPT_AWAY;
+                                
+                                imcb_buddy_status( ic, bud->bare_jid, OPT_LOGGED_IN | is_away,
+                                                   ( is_away && bud->away_state ) ? bud->away_state->full_name : NULL,
+                                                   bud->away_message );
+                        }
+                        else
+                        {
+                                /* Otherwise, count him/her as offline now. */
                                 imcb_buddy_status( ic, from, 0, NULL, NULL );
-                        /* FIXME: If this resource was not away and another resource is,
-                           we should definitely send an update here. */
+                        }
                         
                         *s = '/';