Changeset f0cb961 for protocols/msn

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/msn

Files:

• msn_util.c (modified) (1 diff)
• ns.c (modified) (5 diffs)

protocols/msn/msn_util.c

@@ -94 +94 @@
         msn_buddy_list_add( bla->ic, "AL", bla->handle, bla->realname );
         
-        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 );
         

protocols/msn/ns.c

@@ -305 +305 @@
                         int num;
                         
-                        if( cmd[4] != NULL && sscanf( cmd[4], "%d", &num ) == 1 )
+                        if( cmd[4] != NULL && sscanf( cmd[4], "%d", &num ) == 1 && num < md->groupcount )
                                 group = md->grouplist[num];
                         
-                        add_buddy( ic, group, cmd[1], cmd[2] );
+                        imcb_add_buddy( ic, cmd[1], group );
+                        imcb_rename_buddy( ic, cmd[1], cmd[2] );
                 }
                 if( list & 2 ) /* AL */
@@ -391 +392 @@
                 
                 http_decode( cmd[4] );
-                serv_buddy_rename( ic, cmd[3], cmd[4] );
+                imcb_rename_buddy( ic, cmd[3], cmd[4] );
                 
                 st = msn_away_state_by_code( cmd[2] );
@@ -420 +421 @@
                 
                 http_decode( cmd[3] );
-                serv_buddy_rename( ic, cmd[2], cmd[3] );
+                imcb_rename_buddy( ic, cmd[2], cmd[3] );
                 
                 st = msn_away_state_by_code( cmd[1] );
@@ -482 +483 @@
                                 imcb_error( ic, "Syntax error" );
                                 imc_logout( ic, TRUE );
-                                return( 0 );
-                        }
-                        
-                        /* We got added by someone. If we don't have this person in permit/deny yet, inform the user. */
+                                return 0;
+                        }
+                        
+                        /* We got added by someone. If we don't have this
+                           person in permit/deny yet, inform the user. */
                         for( l = ic->permit; l; l = l->next )
                                 if( g_strcasecmp( l->data, cmd[4] ) == 0 )
-                                        return( 1 );
+                                        return 1;
                         
                         for( l = ic->deny; l; l = l->next )
                                 if( g_strcasecmp( l->data, cmd[4] ) == 0 )
-                                        return( 1 );
+                                        return 1;
                         
                         msn_buddy_ask( ic, cmd[4], cmd[5] );
+                }
+                else if( num_parts >= 6 && strcmp( cmd[2], "FL" ) == 0 )
+                {
+                        http_decode( cmd[5] );
+                        imcb_add_buddy( ic, cmd[4], NULL );
+                        imcb_rename_buddy( ic, cmd[4], cmd[5] );
                 }
         }
@@ -545 +553 @@
                         /* This is not supposed to happen, but let's handle it anyway... */
                         http_decode( cmd[4] );
-                        serv_buddy_rename( ic, cmd[3], cmd[4] );
+                        imcb_rename_buddy( ic, cmd[3], cmd[4] );
                 }
         }