Changes in protocols/msn/msn.c [36577aa:9bf2481]

File:

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

protocols/msn/msn.c

@@ -31 +31 @@
 GSList *msn_switchboards;
 
-static char *set_eval_display_name( set_t *set, char *value );
+static char *msn_set_display_name( set_t *set, char *value );
 
 static void msn_init( account_t *acc )
 {
-        set_add( &acc->set, "display_name", NULL, set_eval_display_name, acc );
-        set_add( &acc->set, "local_display_name", "false", set_eval_bool, acc );
-        set_add( &acc->set, "mail_notifications", "false", set_eval_bool, acc );
-        set_add( &acc->set, "switchboard_keepalives", "false", set_eval_bool, 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;
+
+        s = set_add( &acc->set, "mail_notifications", "false", set_eval_bool, acc );
+        
+        s = set_add( &acc->set, "switchboard_keepalives", "false", set_eval_bool, acc );
 }
 
@@ -79 +83 @@
         if( md )
         {
-                /** Disabling MSN ft support for now.
-                while( md->filetransfers ) {
-                        imcb_file_canceled( md->filetransfers->data, "Closing connection" );
-                }
-                */
-                
                 if( md->fd >= 0 )
                         closesocket( md->fd );
@@ -171 +169 @@
 static void msn_set_my_name( struct im_connection *ic, char *info )
 {
-        msn_set_display_name( ic, info );
+        msn_set_display_name( set_find( &ic->acc->set, "display_name" ), info );
 }
 
@@ -223 +221 @@
 {
         struct msn_switchboard *sb;
-        struct groupchat *c = imcb_chat_new( ic, who );
         
         if( ( sb = msn_sb_by_handle( ic, who ) ) )
@@ -241 +238 @@
                 msn_sb_write_msg( ic, m );
 
-                return c;
-        }
+                return NULL;
+        }
+        
+        return NULL;
 }
 
@@ -286 +285 @@
 }
 
-static char *set_eval_display_name( set_t *set, char *value )
+static char *msn_set_display_name( set_t *set, char *value )
 {
         account_t *acc = set->data;
         struct im_connection *ic = acc->ic;
-        
-        /* Allow any name if we're offline. */
+        struct msn_data *md;
+        char buf[1024], *fn;
+        
+        /* Double-check. */
         if( ic == NULL )
-                return value;
+                return NULL;
+        
+        md = ic->proto_data;
         
         if( strlen( value ) > 129 )
@@ -300 +303 @@
                 return NULL;
         }
+        
+        fn = msn_http_encode( value );
+        
+        g_snprintf( buf, sizeof( buf ), "REA %d %s %s\r\n", ++md->trId, ic->acc->user, fn );
+        msn_write( ic, 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 msn_set_display_name( ic, value ) ? value : NULL;
+        return value;
 }
 
@@ -333 +342 @@
         ret->send_typing = msn_send_typing;
         ret->handle_cmp = g_strcasecmp;
-        //ret->transfer_request = msn_ftp_transfer_request;
 
         register_protocol(ret);