Changeset 17a6ee9 for protocols/jabber

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.

Location:

protocols/jabber

Files:

• iq.c (modified) (2 diffs)
• jabber.c (modified) (1 diff)
• jabber_util.c (modified) (3 diffs)
• s5bytestream.c (modified) (7 diffs)
• si.c (modified) (3 diffs)

protocols/jabber/iq.c

@@ -392 +392 @@
                         if( ( strcmp( sub, "both" ) == 0 || strcmp( sub, "to" ) == 0 ) )
                         {
-                                if( initial || imcb_find_buddy( ic, jid ) == NULL )
+                                if( initial || bee_user_by_handle( ic->bee, ic, jid ) == NULL )
                                         imcb_add_buddy( ic, jid, ( group && group->text_len ) ?
                                                                    group->text : NULL );
@@ -590 +590 @@
             strcmp( s, "result" ) == 0 )
         {
-                if( imcb_find_buddy( ic, jid ) == NULL )
+                if( bee_user_by_handle( ic->bee, ic, jid ) == NULL )
                         imcb_add_buddy( ic, jid, NULL );
         }

protocols/jabber/jabber.c

@@ -267 +267 @@
         
         while( jd->filetransfers )
-                imcb_file_canceled( ( ( struct jabber_transfer *) jd->filetransfers->data )->ft, "Logging out" );
+                imcb_file_canceled( ic, ( ( struct jabber_transfer *) jd->filetransfers->data )->ft, "Logging out" );
 
         while( jd->streamhosts )

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 ) )

protocols/jabber/s5bytestream.c

@@ -566 +566 @@
         xt_free_node( reply );
 
-        imcb_file_canceled( tf->ft, "couldn't connect to any streamhosts" );
+        imcb_file_canceled( tf->ic, tf->ft, "couldn't connect to any streamhosts" );
 
         bt->tf->watch_in = 0;
@@ -603 +603 @@
                 
         if( !jabber_write_packet( tf->ic, reply ) )
-                imcb_file_canceled( tf->ft, "Error transmitting bytestream response" );
+                imcb_file_canceled( tf->ic, tf->ft, "Error transmitting bytestream response" );
         xt_free_node( reply );
 }
@@ -643 +643 @@
 
         if( tf->bytesread >= tf->ft->file_size )
-                imcb_file_finished( tf->ft );
+                imcb_file_finished( tf->ic, tf->ft );
 
         tf->ft->write( tf->ft, tf->ft->buffer, ret );   
@@ -659 +659 @@
         if( tf->watch_in )
         {
-                imcb_file_canceled( ft, "BUG in jabber file transfer: write_request called when already watching for input" );
+                imcb_file_canceled( tf->ic, ft, "BUG in jabber file transfer: write_request called when already watching for input" );
                 return FALSE;
         }
@@ -705 +705 @@
 
         if( tf->byteswritten >= ft->file_size )
-                imcb_file_finished( ft );
+                imcb_file_finished( tf->ic, ft );
         else
                 bt->tf->watch_out = b_input_add( tf->fd, GAIM_INPUT_WRITE, jabber_bs_send_can_write, bt );
@@ -1005 +1005 @@
 
         if( !jabber_write_packet( tf->ic, iq ) )
-                imcb_file_canceled( tf->ft, "Error transmitting bytestream request" );
+                imcb_file_canceled( tf->ic, tf->ft, "Error transmitting bytestream request" );
         return TRUE;
 }
@@ -1020 +1020 @@
 
         if( jd->streamhosts==NULL ) /* we're done here unless we have a proxy to try */
-                imcb_file_canceled( tf->ft, error );
+                imcb_file_canceled( tf->ic, tf->ft, error );
 
         /* MUST always return FALSE! */

protocols/jabber/si.c

@@ -91 +91 @@
 
         if( !foundft )
-                imcb_file_canceled( tf->ft, "Buddy's client doesn't feature file transfers" );
+                imcb_file_canceled( tf->ic, tf->ft, "Buddy's client doesn't feature file transfers" );
         else if( !foundbt )
-                imcb_file_canceled( tf->ft, "Buddy's client doesn't feature byte streams (required)" );
+                imcb_file_canceled( tf->ic, tf->ft, "Buddy's client doesn't feature byte streams (required)" );
         else if( !foundsi )
-                imcb_file_canceled( tf->ft, "Buddy's client doesn't feature stream initiation (required)" );
+                imcb_file_canceled( tf->ic, tf->ft, "Buddy's client doesn't feature stream initiation (required)" );
                 
         return foundft && foundbt && foundsi;
@@ -109 +109 @@
 
         /* and start the receive logic */
-        imcb_file_recv_start( tf->ft );
+        imcb_file_recv_start( tf->ic, tf->ft );
 
 }
@@ -156 +156 @@
         if( bud == NULL )
         {
-                imcb_file_canceled( ft, "Couldn't find buddy (BUG?)" );
+                imcb_file_canceled( ic, ft, "Couldn't find buddy (BUG?)" );
                 return;
         }