Changes in protocols/msn/msn_util.c [70ac477:e3413cc]

File:

• protocols/msn/msn_util.c (modified) (3 diffs)

protocols/msn/msn_util.c

@@ -51 +51 @@
 }
 
-int msn_buddy_list_add( struct im_connection *ic, const char *list, const char *who, const char *realname_, const char *group )
+int msn_buddy_list_add( struct im_connection *ic, char *list, char *who, char *realname_ )
 {
         struct msn_data *md = ic->proto_data;
-        char buf[1024], *realname, groupid[8];
-        
-        *groupid = '\0';
-        if( group )
-        {
-                int i;
-                for( i = 0; i < md->groupcount; i ++ )
-                        if( g_strcasecmp( md->grouplist[i], group ) == 0 )
-                        {
-                                g_snprintf( groupid, sizeof( groupid ), " %d", i );
-                                break;
-                        }
-                
-                if( *groupid == '\0' )
-                {
-                        /* Have to create this group, it doesn't exist yet. */
-                        struct msn_groupadd *ga;
-                        GSList *l;
-                        
-                        for( l = md->grpq; l; l = l->next )
-                        {
-                                ga = l->data;
-                                if( g_strcasecmp( ga->group, group ) == 0 )
-                                        break;
-                        }
-                        
-                        ga = g_new0( struct msn_groupadd, 1 );
-                        ga->who = g_strdup( who );
-                        ga->group = g_strdup( group );
-                        md->grpq = g_slist_prepend( md->grpq, ga );
-                        
-                        if( l == NULL )
-                        {
-                                char *groupname = msn_http_encode( group );
-                                g_snprintf( buf, sizeof( buf ), "ADG %d %s %d\r\n", ++md->trId, groupname, 0 );
-                                g_free( groupname );
-                                return msn_write( ic, buf, strlen( buf ) );
-                        }
-                        else
-                        {
-                                /* This can happen if the user's doing lots of adds to a
-                                   new group at once; we're still waiting for the server
-                                   to confirm group creation. */
-                                return 1;
-                        }
-                }
-        }
+        char buf[1024], *realname;
         
         realname = msn_http_encode( realname_ );
-        g_snprintf( buf, sizeof( buf ), "ADD %d %s %s %s%s\r\n", ++md->trId, list, who, realname, groupid );
+        
+        g_snprintf( buf, sizeof( buf ), "ADD %d %s %s %s\r\n", ++md->trId, list, who, realname );
+        if( msn_write( ic, buf, strlen( buf ) ) )
+        {
+                g_free( realname );
+                
+                return( 1 );
+        }
+        
         g_free( realname );
         
-        return msn_write( ic, buf, strlen( buf ) );
+        return( 0 );
 }
 
@@ -132 +94 @@
         struct msn_buddy_ask_data *bla = data;
         
-        msn_buddy_list_add( bla->ic, "AL", bla->handle, bla->realname, NULL );
-        
-        imcb_ask_add( bla->ic, bla->handle, NULL );
+        msn_buddy_list_add( bla->ic, "AL", bla->handle, bla->realname );
+        
+        if( imcb_find_buddy( bla->ic, bla->handle ) == NULL )
+                imcb_ask_add( bla->ic, bla->handle, NULL );
         
         g_free( bla->handle );
@@ -145 +108 @@
         struct msn_buddy_ask_data *bla = data;
         
-        msn_buddy_list_add( bla->ic, "BL", bla->handle, bla->realname, NULL );
+        msn_buddy_list_add( bla->ic, "BL", bla->handle, bla->realname );
         
         g_free( bla->handle );