Changes in protocols/jabber/jabber_util.c [17a6ee9:842cd8d]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/jabber/jabber_util.c
r17a6ee9 r842cd8d 99 99 } 100 100 101 struct xt_node *jabber_make_error_packet( struct xt_node *orig, char *err_cond, char *err_type , char *err_code)101 struct xt_node *jabber_make_error_packet( struct xt_node *orig, char *err_cond, char *err_type ) 102 102 { 103 103 struct xt_node *node, *c; … … 111 111 c = xt_new_node( "error", NULL, c ); 112 112 xt_add_attr( c, "type", err_type ); 113 114 /* Add the error code, if present */115 if (err_code)116 xt_add_attr( c, "code", err_code );117 113 118 114 /* To make the actual error packet, we copy the original packet and … … 279 275 presence_send_request( bla->ic, bla->handle, "subscribed" ); 280 276 281 imcb_ask_add( bla->ic, bla->handle, NULL ); 277 if( imcb_find_buddy( bla->ic, bla->handle ) == NULL ) 278 imcb_ask_add( bla->ic, bla->handle, NULL ); 282 279 283 280 g_free( bla->handle ); … … 461 458 462 459 if( bud == NULL && ( flags & GET_BUDDY_CREAT ) && 463 ( bare_exists || bee_user_by_handle( ic->bee,ic, jid ) ) )460 ( bare_exists || imcb_find_buddy( ic, jid ) ) ) 464 461 { 465 462 *s = '/'; … … 482 479 if( bud == NULL ) 483 480 /* No match. Create it now? */ 484 return ( ( flags & GET_BUDDY_CREAT ) && 485 bee_user_by_handle( ic->bee, ic, jid_ ) ) ? 481 return ( ( flags & GET_BUDDY_CREAT ) && imcb_find_buddy( ic, jid_ ) ) ? 486 482 jabber_buddy_add( ic, jid_ ) : NULL; 487 483 else if( bud->resource && ( flags & GET_BUDDY_EXACT ) )
Note: See TracChangeset
for help on using the changeset viewer.