Changeset 17a6ee9 for protocols/jabber/jabber_util.c

Timestamp:

2010-04-11T14:37:06Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

a87e6ba

Parents:

1f92a58

Message:

Including DCC stuff again, with a wonderful extra layer of abstraction.
Some hooks are missing so sending files doesn't work yet. Receiving also
still seems to have some issues. On the plus side, at least the MSN/Jabber
modules work again.

File:

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

protocols/jabber/jabber_util.c

@@ -279 +279 @@
         presence_send_request( bla->ic, bla->handle, "subscribed" );
         
-        if( imcb_find_buddy( bla->ic, bla->handle ) == NULL )
-                imcb_ask_add( bla->ic, bla->handle, NULL );
+        imcb_ask_add( bla->ic, bla->handle, NULL );
         
         g_free( bla->handle );
@@ -462 +461 @@
                 
                 if( bud == NULL && ( flags & GET_BUDDY_CREAT ) &&
-                    ( bare_exists || imcb_find_buddy( ic, jid ) ) )
+                    ( bare_exists || bee_user_by_handle( ic->bee, ic, jid ) ) )
                 {
                         *s = '/';
@@ -483 +482 @@
                 if( bud == NULL )
                         /* No match. Create it now? */
-                        return ( ( flags & GET_BUDDY_CREAT ) && imcb_find_buddy( ic, jid_ ) ) ?
+                        return ( ( flags & GET_BUDDY_CREAT ) &&
+                                 bee_user_by_handle( ic->bee, ic, jid_ ) ) ?
                                    jabber_buddy_add( ic, jid_ ) : NULL;
                 else if( bud->resource && ( flags & GET_BUDDY_EXACT ) )