Changeset e7f8838 for protocols/jabber

Timestamp:

2008-01-11T13:17:11Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e64de00

Parents:

e731120

Message:

Fixing bug #344, now away states should always be correct, even when people
do complicated things with multiple resources. (There were two bugs and
some duplicated code, so I moved things around a bit.)

File:

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

protocols/jabber/presence.c

@@ -30 +30 @@
         char *type = xt_find_attr( node, "type" );      /* NULL should mean the person is online. */
         struct xt_node *c;
-        struct jabber_buddy *bud;
-        int is_chat = 0, is_away = 0;
+        struct jabber_buddy *bud, *send_presence = NULL;
+        int is_chat = 0;
         char *s;
         
@@ -63 +63 @@
                 {
                         bud->away_state = (void*) jabber_away_state_by_code( c->text );
-                        if( strcmp( c->text, "chat" ) != 0 )
-                                is_away = OPT_AWAY;
                 }
                 else
@@ -81 +79 @@
                 if( is_chat )
                         jabber_chat_pkt_presence( ic, bud, node );
-                else if( bud == jabber_buddy_by_jid( ic, bud->bare_jid, 0 ) )
-                        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
+                        send_presence = jabber_buddy_by_jid( ic, bud->bare_jid, 0 );
         }
         else if( strcmp( type, "unavailable" ) == 0 )
@@ -119 +115 @@
                         /* 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
+                        if( ( send_presence = jabber_buddy_by_jid( ic, from, 0 ) ) == NULL )
                         {
                                 /* Otherwise, count him/her as offline now. */
@@ -176 +162 @@
                         jabber_error_free( err );
                 } */
+        }
+
+        if( send_presence )
+        {
+                int is_away;
+
+                if( send_presence->away_state && !( *send_presence->away_state->code == 0 ||
+                    strcmp( send_presence->away_state->code, "chat" ) == 0 ) )
+                        is_away = OPT_AWAY;
+
+                imcb_buddy_status( ic, send_presence->bare_jid, OPT_LOGGED_IN | is_away,
+                                   ( is_away && send_presence->away_state ) ?
+                                   send_presence->away_state->full_name : NULL,
+                                   send_presence->away_message );
         }