Changeset f0cb961 for protocols/jabber

Timestamp:

2007-04-19T06:03:43Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d323394c

Parents:

33dc261

Message:

More API changes: buddy list management. imcb_add_buddy() is now a *real*
callback, it's only called from inside IM-modules. This makes sure a buddy
only gets added to the BitlBee structures if the add was successful. This
gets rid of the weirdness described in #55. Unfortunately for now this
change breaks A) automatic renaming of ICQ contacts (if there are names
stored in the contact list) B) add -tmp.

Location:

protocols/jabber

Files:

• iq.c (modified) (1 diff)
• jabber_util.c (modified) (3 diffs)

protocols/jabber/iq.c

@@ -360 +360 @@
         while( ( c = xt_find_node( c, "item" ) ) )
         {
+                struct xt_node *group = xt_find_node( node->children, "group" );
                 char *jid = xt_find_attr( c, "jid" );
                 char *name = xt_find_attr( c, "name" );
                 char *sub = xt_find_attr( c, "subscription" );
                 
-                if( !jid || !sub )
-                {
-                        /* Maybe warn. But how likely is this to happen in the first place? */
-                }
-                else if( initial )
-                {
-                        if( ( strcmp( sub, "both" ) == 0 || strcmp( sub, "to" ) == 0 ) )
-                                add_buddy( ic, NULL, jid, name );
-                }
-                else
-                {
-                        /* This is a roster push item. Find out what changed exactly. */
+                if( jid && sub )
+                {
                         if( ( strcmp( sub, "both" ) == 0 || strcmp( sub, "to" ) == 0 ) )
                         {
-                                if( find_buddy( ic, jid ) == NULL )
-                                        add_buddy( ic, NULL, jid, name );
-                                else if( name )
-                                        serv_buddy_rename( ic, jid, name );
+                                if( initial || imcb_find_buddy( ic, jid ) == NULL )
+                                        imcb_add_buddy( ic, jid, ( group && group->text_len ) ?
+                                                                   group->text : NULL );
+                                
+                                imcb_rename_buddy( ic, jid, name );
                         }
                         else if( strcmp( sub, "remove" ) == 0 )

protocols/jabber/jabber_util.c

@@ -223 +223 @@
         presence_send_request( bla->ic, bla->handle, "subscribed" );
         
-        if( find_buddy( bla->ic, bla->handle ) == NULL )
+        if( imcb_find_buddy( bla->ic, bla->handle ) == NULL )
                 imcb_ask_add( bla->ic, bla->handle, NULL );
         
@@ -371 +371 @@
                 }
                 
-                if( bud == NULL && ( flags & GET_BUDDY_CREAT ) && find_buddy( ic, jid ) )
+                if( bud == NULL && ( flags & GET_BUDDY_CREAT ) && imcb_find_buddy( ic, jid ) )
                 {
                         *s = '/';
@@ -391 +391 @@
                 if( bud == NULL )
                         /* No match. Create it now? */
-                        return ( ( flags & GET_BUDDY_CREAT ) && find_buddy( 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 ) )