Changes in protocols/msn/msn.c [e3413cc:a830512]

File:

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

protocols/msn/msn.c

@@ -27 +27 @@
 #include "msn.h"
 
-int msn_chat_id;
-GSList *msn_connections;
-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_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 );
 }
 
@@ -140 +139 @@
         
         if( l == NULL )
-                for( i = 0; *msn_away_state_list[i].code; i ++ )
-                        if( *msn_away_state_list[i].name )
-                                l = g_list_append( l, (void*) msn_away_state_list[i].name );
+                for( i = 0; msn_away_state_list[i].number > -1; i ++ )
+                        l = g_list_append( l, (void*) msn_away_state_list[i].name );
         
         return l;
@@ -151 +149 @@
         char buf[1024];
         struct msn_data *md = ic->proto_data;
-        
-        if( state )
-                md->away_state = msn_away_state_by_name( state ) ? :
-                                 msn_away_state_list + 1;
+        const struct msn_away_state *st;
+        
+        if( strcmp( state, GAIM_AWAY_CUSTOM ) == 0 )
+                st = msn_away_state_by_name( "Away" );
         else
-                md->away_state = msn_away_state_list;
-        
-        g_snprintf( buf, sizeof( buf ), "CHG %d %s\r\n", ++md->trId, md->away_state->code );
+                st = msn_away_state_by_name( state );
+        
+        if( !st ) st = msn_away_state_list;
+        md->away_state = st;
+        
+        g_snprintf( buf, sizeof( buf ), "CHG %d %s\r\n", ++md->trId, st->code );
         msn_write( ic, buf, strlen( buf ) );
 }
@@ -164 +165 @@
 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 );
 }
 
@@ -280 +281 @@
 }
 
-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 )
@@ -294 +299 @@
                 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;
 }