Changeset 6bbb939 for protocols/jabber

Timestamp:

2007-04-16T04:01:13Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

cfc8d58

Parents:

84b045d

Message:

Split serv_got_update() into imcb_buddy_(status|times). (Well, the second
one isn't implemented yet, but I'll do that later.) At last I got rid of
the hack called get_status_string(). And now Yahoo seems to mess up away
messages...

Location:

protocols/jabber

Files:

• iq.c (modified) (1 diff)
• presence.c (modified) (5 diffs)

protocols/jabber/iq.c

@@ -388 +388 @@
                                    just try to handle this as well as we can. */
                                 jabber_buddy_remove_bare( ic, jid );
-                                serv_got_update( ic, jid, 0, 0, 0, 0, 0, 0 );
+                                imcb_buddy_status( ic, jid, 0, NULL, NULL );
                                 /* FIXME! */
                         }

protocols/jabber/presence.c

@@ -38 +38 @@
         if( type == NULL )
         {
+                int is_away = 0;
+                
                 if( !( bud = jabber_buddy_by_jid( ic, from, GET_BUDDY_EXACT | GET_BUDDY_CREAT ) ) )
                 {
@@ -52 +54 @@
                 
                 if( ( c = xt_find_node( node->children, "show" ) ) && c->text_len > 0 )
+                {
                         bud->away_state = (void*) jabber_away_state_by_code( c->text );
+                        if( strcmp( c->text, "chat" ) != 0 )
+                                is_away = OPT_AWAY;
+                }
                 else
                 {
@@ -66 +72 @@
                         bud->priority = 0;
                 
-                serv_got_update( ic, bud->bare_jid, 1, 0, 0, 0,
-                                 bud->away_state ? UC_UNAVAILABLE : 0, 0 );
+                /* FIXME: What to send if there are other resources??? */
+                imcb_buddy_status( ic, bud->bare_jid, OPT_LOGGED_IN | is_away,
+                                   bud->away_state->full_name, bud->away_message );
         }
         else if( strcmp( type, "unavailable" ) == 0 )
@@ -87 +94 @@
                            available anymore. */
                         if( jabber_buddy_by_jid( ic, from, 0 ) == NULL )
-                                serv_got_update( ic, from, 0, 0, 0, 0, 0, 0 );
+                                imcb_buddy_status( ic, from, 0, NULL, NULL );
                         
                         *s = '/';
@@ -93 +100 @@
                 else
                 {
-                        serv_got_update( ic, from, 0, 0, 0, 0, 0, 0 );
+                        imcb_buddy_status( ic, from, 0, NULL, NULL );
                 }
         }