Changes in protocols/msn/msn.c [5e202b0:3dc9d46]

File:

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

protocols/msn/msn.c

@@ -183 +183 @@
 static GList *msn_away_states( struct gaim_connection *gc )
 {
-        static GList *l = NULL;
+        GList *l = NULL;
         int i;
         
-        if( l == NULL )
-                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;
+        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 );
 }
 
@@ -367 +366 @@
         struct gaim_connection *gc = acc->gc;
         struct msn_data *md;
-        char buf[1024], *fn, *s;
-        int i;
+        char buf[1024], *fn;
         
         /* Double-check. */
@@ -382 +380 @@
         }
         
-        /* 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;
-                }
+        fn = msn_http_encode( value );
         
         g_snprintf( buf, sizeof( buf ), "REA %d %s %s\r\n", ++md->trId, gc->username, fn );