Changes in protocols/jabber/presence.c [1baaef8:1bf1ae6]

File:

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

protocols/jabber/presence.c

@@ -31 +31 @@
         struct xt_node *c;
         struct jabber_buddy *bud;
-        int is_chat = 0, is_away = 0;
         char *s;
         
@@ -37 +36 @@
                 return XT_HANDLED;
         
-        if( ( s = strchr( from, '/' ) ) )
-        {
-                *s = 0;
-                if( jabber_chat_by_name( ic, from ) )
-                        is_chat = 1;
-                *s = '/';
-        }
-        
         if( type == NULL )
         {
+                int is_away = 0;
+                
                 if( !( bud = jabber_buddy_by_jid( ic, from, GET_BUDDY_EXACT | GET_BUDDY_CREAT ) ) )
                 {
@@ -79 +72 @@
                         bud->priority = 0;
                 
-                if( is_chat )
-                        jabber_chat_pkt_presence( ic, bud, node );
-                else if( bud == jabber_buddy_by_jid( ic, bud->bare_jid, 0 ) )
+                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,
@@ -88 +79 @@
         else if( strcmp( type, "unavailable" ) == 0 )
         {
-                if( ( bud = jabber_buddy_by_jid( ic, from, GET_BUDDY_EXACT ) ) == NULL )
+                if( jabber_buddy_by_jid( ic, from, GET_BUDDY_EXACT ) == NULL )
                 {
                         if( set_getbool( &ic->irc->set, "debug" ) )
@@ -95 +86 @@
                 }
                 
-                /* Handle this before we delete the JID. */
-                if( is_chat )
-                {
-                        jabber_chat_pkt_presence( ic, bud, node );
-                }
-                
                 jabber_buddy_remove( ic, from );
                 
-                if( is_chat )
-                {
-                        /* Nothing else to do for now? */
-                }
-                else if( ( s = strchr( from, '/' ) ) )
+                if( ( s = strchr( from, '/' ) ) )
                 {
                         *s = 0;
                 
-                        /* 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. */
+                        /* Only count this as offline if there's no other resource
+                           available anymore. */
+                        if( jabber_buddy_by_jid( ic, from, 0 ) == NULL )
                                 imcb_buddy_status( ic, from, 0, NULL, NULL );
-                        }
                         
                         *s = '/';
@@ -158 +126 @@
         else if( strcmp( type, "error" ) == 0 )
         {
-                struct jabber_error *err;
-                
-                if( ( c = xt_find_node( node->children, "error" ) ) )
-                {
-                        err = jabber_error_parse( c, XMLNS_STANZA_ERROR );
-                        imcb_error( ic, "Stanza (%s) error: %s%s%s", node->name,
-                                    err->code, err->text ? ": " : "",
-                                    err->text ? err->text : "" );
-                        jabber_error_free( err );
-                }
-                /* What else to do with it? */
-        }
-        else
-        {
-                printf( "Received PRES from %s:\n", from );
-                xt_print( node );
+                /* What to do with it? */
         }
         
@@ -187 +140 @@
         char *show = jd->away_state->code;
         char *status = jd->away_message;
-        struct groupchat *c;
         int st;
         
@@ -198 +150 @@
         
         st = jabber_write_packet( ic, node );
-        
-        /* Have to send this update to all groupchats too, the server won't
-           do this automatically. */
-        for( c = ic->groupchats; c && st; c = c->next )
-        {
-                struct jabber_chat *jc = c->data;
-                
-                xt_add_attr( node, "to", jc->my_full_jid );
-                st = jabber_write_packet( ic, node );
-        }
         
         xt_free_node( node );