Changes in protocols/msn/msn.c [5b52a48:bf25fa3]

File:

• protocols/msn/msn.c (modified) (6 diffs)

protocols/msn/msn.c

@@ -27 +27 @@
 #include "msn.h"
 
-static char *msn_set_display_name( set_t *set, char *value );
-
-static void msn_acc_init( account_t *acc )
-{
-        set_t *s;
-        
-        s = set_add( &acc->set, "display_name", NULL, msn_set_display_name, acc );
-        s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY;
-}
-
-static void msn_login( account_t *acc )
-{
-        struct gaim_connection *gc = new_gaim_conn( acc );
+static void msn_login( struct aim_user *acct )
+{
+        struct gaim_connection *gc = new_gaim_conn( acct );
         struct msn_data *md = g_new0( struct msn_data, 1 );
         
@@ -47 +37 @@
         md->fd = -1;
         
-        if( strchr( acc->user, '@' ) == NULL )
+        if( strchr( acct->username, '@' ) == NULL )
         {
                 hide_login_progress( gc, "Invalid account name" );
@@ -105 +95 @@
                 }
                 
+                while( md->groupcount > 0 )
+                        g_free( md->grouplist[--md->groupcount] );
                 g_free( md->grouplist );
                 
@@ -220 +212 @@
 static void msn_set_info( struct gaim_connection *gc, char *info )
 {
-        msn_set_display_name( set_find( &gc->acc->set, "display_name" ), info );
+        int i;
+        char buf[1024], *fn, *s;
+        struct msn_data *md = gc->proto_data;
+        
+        if( strlen( info ) > 129 )
+        {
+                do_error_dialog( gc, "Maximum name length exceeded", "MSN" );
+                return;
+        }
+        
+        /* Of course we could use http_encode() here, but when we encode
+           every character, the server is less likely to complain about the
+           chosen name. However, the MSN server doesn't seem to like escaped
+           non-ASCII chars, so we keep those unescaped. */
+        s = fn = g_new0( char, strlen( info ) * 3 + 1 );
+        for( i = 0; info[i]; i ++ )
+                if( info[i] & 128 )
+                {
+                        *s = info[i];
+                        s ++;
+                }
+                else
+                {
+                        g_snprintf( s, 4, "%%%02X", info[i] );
+                        s += 3;
+                }
+        
+        g_snprintf( buf, sizeof( buf ), "REA %d %s %s\r\n", ++md->trId, gc->username, fn );
+        msn_write( gc, buf, strlen( buf ) );
+        g_free( fn );
 }
 
@@ -359 +380 @@
 }
 
-static char *msn_set_display_name( set_t *set, char *value )
-{
-        account_t *acc = set->data;
-        struct gaim_connection *gc = acc->gc;
-        struct msn_data *md;
-        char buf[1024], *fn, *s;
-        int i;
-        
-        /* Double-check. */
-        if( gc == NULL )
-                return NULL;
-        
-        md = gc->proto_data;
-        
-        if( strlen( value ) > 129 )
-        {
-                serv_got_crap( gc, "Maximum name length exceeded" );
-                return NULL;
-        }
-        
-        /* Of course we could use http_encode() here, but when we encode
-           every character, the server is less likely to complain about the
-           chosen name. However, the MSN server doesn't seem to like escaped
-           non-ASCII chars, so we keep those unescaped. */
-        s = fn = g_new0( char, strlen( value ) * 3 + 1 );
-        for( i = 0; value[i]; i ++ )
-                if( value[i] & 128 )
-                {
-                        *s = value[i];
-                        s ++;
-                }
-                else
-                {
-                        g_snprintf( s, 4, "%%%02X", value[i] );
-                        s += 3;
-                }
-        
-        g_snprintf( buf, sizeof( buf ), "REA %d %s %s\r\n", ++md->trId, gc->username, fn );
-        msn_write( gc, buf, strlen( buf ) );
-        g_free( fn );
-        
-        /* Returning NULL would be better, because the server still has to
-           confirm the name change. However, it looks a bit confusing to the
-           user. */
-        return value;
-}
-
 void msn_init()
 {
         struct prpl *ret = g_new0(struct prpl, 1);
-        
         ret->name = "msn";
         ret->login = msn_login;
-        ret->acc_init = msn_acc_init;
         ret->close = msn_close;
         ret->send_im = msn_send_im;
@@ -432 +404 @@
         ret->rem_deny = msn_rem_deny;
         ret->send_typing = msn_send_typing;
-        ret->handle_cmp = g_strcasecmp;
+        ret->cmp_buddynames = g_strcasecmp;
 
         register_protocol(ret);