Changeset 69cb623 for protocols/msn

Timestamp:

2006-10-15T09:41:12Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2529faf

Parents:

695e392 (diff), e97827b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging with storage-xml. It seems to be working pretty well, so maybe
this way more people will test it. :-)

Location:

protocols/msn

Files:

• msn.c (modified) (5 diffs)
• ns.c (modified) (2 diffs)

protocols/msn/msn.c

@@ -27 +27 @@
 #include "msn.h"
 
-static void msn_login( struct aim_user *acct )
-{
-        struct gaim_connection *gc = new_gaim_conn( acct );
+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 );
         struct msn_data *md = g_new0( struct msn_data, 1 );
         
@@ -37 +47 @@
         md->fd = -1;
         
-        if( strchr( acct->username, '@' ) == NULL )
+        if( strchr( acc->user, '@' ) == NULL )
         {
                 hide_login_progress( gc, "Invalid account name" );
@@ -212 +222 @@
 static void msn_set_info( struct gaim_connection *gc, char *info )
 {
-        char buf[1024], *fn;
-        struct msn_data *md = gc->proto_data;
-        
-        if( strlen( info ) > 129 )
-        {
-                do_error_dialog( gc, "Maximum name length exceeded", "MSN" );
-                return;
-        }
-        
-        fn = msn_http_encode( info );
-        
-        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 );
+        msn_set_display_name( set_find( &gc->acc->set, "display_name" ), info );
 }
 
@@ -364 +361 @@
 }
 
+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;
+        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;
+        }
+        
+        fn = msn_http_encode( value );
+        
+        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;
@@ -388 +419 @@
         ret->rem_deny = msn_rem_deny;
         ret->send_typing = msn_send_typing;
-        ret->cmp_buddynames = g_strcasecmp;
+        ret->handle_cmp = g_strcasecmp;
 
         register_protocol(ret);

protocols/msn/ns.c

@@ -223 +223 @@
                 else if( num_parts == 7 && strcmp( cmd[2], "OK" ) == 0 )
                 {
+                        set_t *s;
+                        
                         http_decode( cmd[4] );
                         
                         strncpy( gc->displayname, cmd[4], sizeof( gc->displayname ) );
                         gc->displayname[sizeof(gc->displayname)-1] = 0;
+                        
+                        if( ( s = set_find( &gc->acc->set, "display_name" ) ) )
+                        {
+                                g_free( s->value );
+                                s->value = g_strdup( cmd[4] );
+                        }
                         
                         set_login_progress( gc, 1, "Authenticated, getting buddy list" );
@@ -517 +525 @@
                 if( g_strcasecmp( cmd[3], gc->username ) == 0 )
                 {
+                        set_t *s;
+                        
                         http_decode( cmd[4] );
                         strncpy( gc->displayname, cmd[4], sizeof( gc->displayname ) );
                         gc->displayname[sizeof(gc->displayname)-1] = 0;
+                        
+                        if( ( s = set_find( &gc->acc->set, "display_name" ) ) )
+                        {
+                                g_free( s->value );
+                                s->value = g_strdup( cmd[4] );
+                        }
                 }
                 else