Changes in protocols/jabber/jabber_util.c [17a6ee9:842cd8d]

File:

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

protocols/jabber/jabber_util.c

@@ -99 +99 @@
 }
 
-struct xt_node *jabber_make_error_packet( struct xt_node *orig, char *err_cond, char *err_type, char *err_code )
+struct xt_node *jabber_make_error_packet( struct xt_node *orig, char *err_cond, char *err_type )
 {
         struct xt_node *node, *c;
@@ -111 +111 @@
         c = xt_new_node( "error", NULL, c );
         xt_add_attr( c, "type", err_type );
-        
-        /* Add the error code, if present */
-        if (err_code)
-                xt_add_attr( c, "code", err_code );
         
         /* To make the actual error packet, we copy the original packet and
@@ -279 +275 @@
         presence_send_request( bla->ic, bla->handle, "subscribed" );
         
-        imcb_ask_add( bla->ic, bla->handle, NULL );
+        if( imcb_find_buddy( bla->ic, bla->handle ) == NULL )
+                imcb_ask_add( bla->ic, bla->handle, NULL );
         
         g_free( bla->handle );
@@ -461 +458 @@
                 
                 if( bud == NULL && ( flags & GET_BUDDY_CREAT ) &&
-                    ( bare_exists || bee_user_by_handle( ic->bee, ic, jid ) ) )
+                    ( bare_exists || imcb_find_buddy( ic, jid ) ) )
                 {
                         *s = '/';
@@ -482 +479 @@
                 if( bud == NULL )
                         /* No match. Create it now? */
-                        return ( ( flags & GET_BUDDY_CREAT ) &&
-                                 bee_user_by_handle( ic->bee, ic, jid_ ) ) ?
+                        return ( ( flags & GET_BUDDY_CREAT ) && imcb_find_buddy( ic, jid_ ) ) ?
                                    jabber_buddy_add( ic, jid_ ) : NULL;
                 else if( bud->resource && ( flags & GET_BUDDY_EXACT ) )