Changes in protocols/msn/ns.c [bb839e8:70ac477]

File:

• protocols/msn/ns.c (modified) (8 diffs)

protocols/msn/ns.c

@@ -35 +35 @@
 
 static void msn_auth_got_passport_token( struct msn_auth_data *mad );
+static gboolean msn_ns_got_display_name( struct im_connection *ic, char *name );
 
 gboolean msn_ns_connected( gpointer data, gint source, b_input_condition cond )
@@ -75 +76 @@
         if( msn_write( ic, s, strlen( s ) ) )
         {
-                ic->inpa = b_input_add( md->fd, GAIM_INPUT_READ, msn_ns_callback, ic );
+                ic->inpa = b_input_add( md->fd, B_EV_IO_READ, msn_ns_callback, ic );
                 imcb_log( ic, "Connected to server, waiting for reply" );
         }
@@ -231 +232 @@
                 else if( num_parts >= 7 && strcmp( cmd[2], "OK" ) == 0 )
                 {
-                        set_t *s;
-                        
                         if( num_parts == 7 )
-                        {
-                                http_decode( cmd[4] );
-                                
-                                strncpy( ic->displayname, cmd[4], sizeof( ic->displayname ) );
-                                ic->displayname[sizeof(ic->displayname)-1] = 0;
-                                
-                                if( ( s = set_find( &ic->acc->set, "display_name" ) ) )
-                                {
-                                        g_free( s->value );
-                                        s->value = g_strdup( cmd[4] );
-                                }
-                        }
+                                msn_ns_got_display_name( ic, cmd[4] );
                         else
-                        {
                                 imcb_log( ic, "Warning: Friendly name in server response was corrupted" );
-                        }
                         
                         imcb_log( ic, "Authenticated, getting buddy list" );
@@ -547 +533 @@
                 else if( num_parts >= 6 && strcmp( cmd[2], "FL" ) == 0 )
                 {
+                        const char *group = NULL;
+                        int num;
+                        
+                        if( cmd[6] != NULL && sscanf( cmd[6], "%d", &num ) == 1 && num < md->groupcount )
+                                group = md->grouplist[num];
+                        
                         http_decode( cmd[5] );
-                        imcb_add_buddy( ic, cmd[4], NULL );
+                        imcb_add_buddy( ic, cmd[4], group );
                         imcb_rename_buddy( ic, cmd[4], cmd[5] );
                 }
@@ -573 +565 @@
                 return( 0 );
         }
+#if 0
+        /* Discard this one completely for now since I don't care about the ack
+           and since MSN servers can apparently screw up the formatting. */
         else if( strcmp( cmd[0], "REA" ) == 0 )
         {
@@ -603 +598 @@
                 }
         }
+#endif
         else if( strcmp( cmd[0], "IPG" ) == 0 )
         {
@@ -614 +610 @@
                         imc_logout( ic, TRUE );
                         return( 0 );
+                }
+        }
+        else if( strcmp( cmd[0], "ADG" ) == 0 )
+        {
+                char *group = g_strdup( cmd[3] );
+                int groupnum, i;
+                GSList *l, *next;
+                
+                http_decode( group );
+                if( sscanf( cmd[4], "%d", &groupnum ) == 1 )
+                {
+                        if( groupnum >= md->groupcount )
+                        {
+                                md->grouplist = g_renew( char *, md->grouplist, groupnum + 1 );
+                                for( i = md->groupcount; i <= groupnum; i ++ )
+                                        md->grouplist[i] = NULL;
+                                md->groupcount = groupnum + 1;
+                        }
+                        g_free( md->grouplist[groupnum] );
+                        md->grouplist[groupnum] = group;
+                }
+                else
+                {
+                        /* Shouldn't happen, but if it does, give up on the group. */
+                        g_free( group );
+                        imcb_error( ic, "Syntax error" );
+                        imc_logout( ic, TRUE );
+                        return 0;
+                }
+                
+                for( l = md->grpq; l; l = next )
+                {
+                        struct msn_groupadd *ga = l->data;
+                        next = l->next;
+                        if( g_strcasecmp( ga->group, group ) == 0 )
+                        {
+                                if( !msn_buddy_list_add( ic, "FL", ga->who, ga->who, group ) )
+                                        return 0;
+                                
+                                g_free( ga->group );
+                                g_free( ga->who );
+                                g_free( ga );
+                                md->grpq = g_slist_remove( md->grpq, ga );
+                        }
                 }
         }
@@ -752 +792 @@
         }
 }
+
+static gboolean msn_ns_got_display_name( struct im_connection *ic, char *name )
+{
+        set_t *s;
+        
+        if( ( s = set_find( &ic->acc->set, "display_name" ) ) == NULL )
+                return FALSE; /* Shouldn't happen.. */
+        
+        http_decode( name );
+        
+        if( s->value && strcmp( s->value, name ) == 0 )
+        {
+                return TRUE;
+                /* The names match, nothing to worry about. */
+        }
+        else if( s->value != NULL &&
+                 ( strcmp( name, ic->acc->user ) == 0 ||
+                   set_getbool( &ic->acc->set, "local_display_name" ) ) )
+        {
+                /* The server thinks our display name is our e-mail address
+                   which is probably wrong, or the user *wants* us to do this:
+                   Always use the locally set display_name. */
+                return msn_set_display_name( ic, s->value );
+        }
+        else
+        {
+                if( s->value && *s->value )
+                        imcb_log( ic, "BitlBee thinks your display name is `%s' but "
+                                      "the MSN server says it's `%s'. Using the MSN "
+                                      "server's name. Set local_display_name to true "
+                                      "to use the local name.", s->value, name );
+                
+                if( g_utf8_validate( name, -1, NULL ) )
+                {
+                        g_free( s->value );
+                        s->value = g_strdup( name );
+                }
+                else
+                {
+                        imcb_log( ic, "Warning: Friendly name in server response was corrupted" );
+                }
+                
+                return TRUE;
+        }
+}